diff --git a/.github/workflows/miqt.yml b/.github/workflows/miqt.yml index 64920fa8..262fdfc7 100644 --- a/.github/workflows/miqt.yml +++ b/.github/workflows/miqt.yml @@ -116,7 +116,7 @@ jobs: run: docker build -t miqt/win32:qt5 -f docker/win32-cross-go1.23-qt5.15-static.Dockerfile . - name: Win32 bindings compile - run: docker run -v ~/.cache/go-build:/root/.cache/go-build -v $PWD:/src -w /src miqt/win32:qt5 /bin/bash -c 'cd qt && go build' + run: docker run -v ~/.cache/go-build:/root/.cache/go-build -v $PWD:/src -w /src miqt/win32:qt5 /bin/bash -c 'cd qt && go build && cd ../examples/helloworld && go build' miqt_win64_qt5: runs-on: ubuntu-24.04 @@ -135,7 +135,7 @@ jobs: run: docker build -t miqt/win64:qt5 -f docker/win64-cross-go1.23-qt5.15-static.Dockerfile . - name: Win64 bindings compile - run: docker run -v ~/.cache/go-build:/root/.cache/go-build -v $PWD:/src -w /src miqt/win64:qt5 /bin/bash -c 'cd qt && go build' + run: docker run -v ~/.cache/go-build:/root/.cache/go-build -v $PWD:/src -w /src miqt/win64:qt5 /bin/bash -c 'cd qt && go build && cd ../examples/helloworld && go build' miqt_win64_qt68: runs-on: ubuntu-24.04 @@ -154,7 +154,7 @@ jobs: run: docker build -t miqt/win64:qt68 -f docker/win64-cross-go1.23-qt6.8-dynamic.Dockerfile . - name: Win64 bindings compile - run: docker run -v ~/.cache/go-build:/root/.cache/go-build -v $PWD:/src -w /src miqt/win64:qt68 /bin/bash -c 'cd qt6 && go build' + run: docker run -v ~/.cache/go-build:/root/.cache/go-build -v $PWD:/src -w /src miqt/win64:qt68 /bin/bash -c 'cd qt6 && go build && cd ../examples/helloworld6 && go build' miqt_android_qt5: runs-on: ubuntu-24.04 diff --git a/cmd/genbindings/clang2il.go b/cmd/genbindings/clang2il.go index 377058e4..bad7a96f 100644 --- a/cmd/genbindings/clang2il.go +++ b/cmd/genbindings/clang2il.go @@ -491,8 +491,6 @@ nextMethod: return CppClass{}, err } - ApplyQuirks(ret.ClassName, &mm) - ret.Methods = append(ret.Methods, mm) default: diff --git a/cmd/genbindings/config-allowlist.go b/cmd/genbindings/config-allowlist.go index 92bf5fdd..fb47fab8 100644 --- a/cmd/genbindings/config-allowlist.go +++ b/cmd/genbindings/config-allowlist.go @@ -413,7 +413,7 @@ func AllowType(p CppParameter, isReturnType bool) error { return err } } - if t, ok := p.QListOf(); ok { + if t, _, ok := p.QListOf(); ok { if err := AllowType(t, isReturnType); err != nil { // e.g. QGradientStops is a QVector<> (OK) of QGradientStop (not OK) return err } @@ -424,7 +424,7 @@ func AllowType(p CppParameter, isReturnType bool) error { return ErrTooComplex } } - if kType, vType, ok := p.QMapOf(); ok { + if kType, vType, _, ok := p.QMapOf(); ok { if err := AllowType(kType, isReturnType); err != nil { return err } @@ -576,7 +576,6 @@ func AllowType(p CppParameter, isReturnType bool) error { switch p.ParameterType { case - "QList", // e.g. QVariant constructor - this has a deleted copy-constructor so we can't get it over the CABI boundary by value "QPolygon", "QPolygonF", // QPolygon extends a template type "QGenericMatrix", "QMatrix3x3", // extends a template type "QLatin1String", "QStringView", // e.g. QColor constructors and QColor::SetNamedColor() overloads. These are usually optional alternatives to QString @@ -632,30 +631,30 @@ func AllowType(p CppParameter, isReturnType bool) error { return nil } -// LinuxWindowsCompatCheck checks if the parameter is incompatible between the -// generated headers (generated on Linux) with other OSes such as Windows. -// These methods will be blocked on non-Linux OSes. -func LinuxWindowsCompatCheck(p CppParameter) bool { - if p.GetQtCppType().ParameterType == "Q_PID" { - return true // int64 on Linux, _PROCESS_INFORMATION* on Windows +// ApplyQuirks adds flags to methods that require special handling. +// This is evaluated early, before optional arguments are expanded. +func ApplyQuirks(packageName, className string, mm *CppMethod) { + + if mm.ReturnType.GetQtCppType().ParameterType == "Q_PID" { + // int64 on Linux, _PROCESS_INFORMATION* on Windows + mm.LinuxOnly = true } - if p.GetQtCppType().ParameterType == "QSocketDescriptor::DescriptorType" { - return true // uintptr_t-compatible on Linux, void* on Windows + if mm.ReturnType.GetQtCppType().ParameterType == "QSocketDescriptor::DescriptorType" || + (len(mm.Parameters) > 0 && mm.Parameters[0].GetQtCppType().ParameterType == "QSocketDescriptor::DescriptorType") { + // uintptr_t-compatible on Linux, void* on Windows + mm.LinuxOnly = true } - return false -} -func ApplyQuirks(className string, mm *CppMethod) { if className == "QArrayData" && mm.MethodName == "needsDetach" && mm.IsConst { mm.BecomesNonConstInVersion = addr("6.7") } - if className == "QObjectData" && mm.MethodName == "dynamicMetaObject" { + if packageName == "qt6" && className == "QObjectData" && mm.MethodName == "dynamicMetaObject" { mm.ReturnType.BecomesConstInVersion = addr("6.9") } - if className == "QFileDialog" && mm.MethodName == "saveFileContent" && mm.IsStatic { + if className == "QFileDialog" && mm.MethodName == "saveFileContent" && mm.IsStatic && len(mm.Parameters) > 1 { // The prototype was changed from // [Qt 5 - 6.6] void QFileDialog::saveFileContent(const QByteArray &fileContent, const QString &fileNameHint = QString()) // [Qt 6.7] void QFileDialog::saveFileContent(const QByteArray &fileContent, const QString &fileNameHint, QWidget *parent = nullptr) diff --git a/cmd/genbindings/config-libraries.go b/cmd/genbindings/config-libraries.go index 60510267..fc26d94f 100644 --- a/cmd/genbindings/config-libraries.go +++ b/cmd/genbindings/config-libraries.go @@ -238,7 +238,7 @@ func ProcessLibraries(clangBin, outDir, extraLibsDir string) { generate( "qt6/qml", []string{ - "/usr/include/x86_64-linux-gnu/qt6/QtQml", + "/usr/include/x86_64-linux-gnu/qt6/QtQml", }, AllowAllHeaders, clangBin, diff --git a/cmd/genbindings/emitcabi.go b/cmd/genbindings/emitcabi.go index 98b1921e..76cf494a 100644 --- a/cmd/genbindings/emitcabi.go +++ b/cmd/genbindings/emitcabi.go @@ -82,13 +82,13 @@ func (p CppParameter) RenderTypeCabi() string { } else if p.ParameterType == "QByteArray" { return "struct miqt_string" - } else if inner, ok := p.QListOf(); ok { + } else if inner, _, ok := p.QListOf(); ok { return "struct miqt_array " + cppComment("of "+inner.RenderTypeCabi()) } else if inner, ok := p.QSetOf(); ok { return "struct miqt_array " + cppComment("set of "+inner.RenderTypeCabi()) - } else if inner1, inner2, ok := p.QMapOf(); ok { + } else if inner1, inner2, _, ok := p.QMapOf(); ok { return "struct miqt_map " + cppComment("of "+inner1.RenderTypeCabi()+" to "+inner2.RenderTypeCabi()) } else if inner1, inner2, ok := p.QPairOf(); ok { @@ -105,10 +105,14 @@ func (p CppParameter) RenderTypeCabi() string { return cabiClassName(p.ParameterType) + "*" } + // https://github.com/qt/qtbase/blob/v5.15.16-lts-lgpl/src/corelib/global/qglobal.h#L233 + // https://github.com/qt/qtbase/blob/v6.9.0/src/corelib/global/qtypes.h#L50 ret := p.ParameterType switch p.ParameterType { case "uchar": ret = "unsigned char" + case "ushort": + ret = "unsigned short" case "uint": ret = "unsigned int" case "ulong": @@ -117,18 +121,22 @@ func (p CppParameter) RenderTypeCabi() string { ret = "int8_t" case "quint8": ret = "uint8_t" - case "qint16", "short": + case "qint16": ret = "int16_t" - case "quint16", "ushort", "unsigned short": + case "quint16": ret = "uint16_t" case "qint32": ret = "int32_t" case "quint32": ret = "uint32_t" - case "qlonglong", "qint64": + case "qlonglong": + ret = "long long" + case "qint64": ret = "int64_t" - case "qulonglong", "quint64": + case "quint64": ret = "uint64_t" + case "qulonglong": + ret = "unsigned long long" case "qfloat16": ret = "_Float16" // No idea where this typedef comes from, but it exists case "qreal": @@ -274,7 +282,7 @@ func emitCABI2CppForwarding(p CppParameter, indent string) (preamble string, for preamble += indent + "QByteArray " + nameprefix + "_QByteArray(" + p.cParameterName() + ".data, " + p.cParameterName() + ".len);\n" return preamble, nameprefix + "_QByteArray" - } else if listType, ok := p.QListOf(); ok { + } else if listType, _, ok := p.QListOf(); ok { preamble += indent + p.GetQtCppType().ParameterType + " " + nameprefix + "_QList;\n" preamble += indent + nameprefix + "_QList.reserve(" + p.cParameterName() + ".len);\n" @@ -296,12 +304,12 @@ func emitCABI2CppForwarding(p CppParameter, indent string) (preamble string, for return preamble, nameprefix + "_QList" } - } else if kType, vType, ok := p.QMapOf(); ok { + } else if kType, vType, mapContainerType, ok := p.QMapOf(); ok { preamble += indent + p.GetQtCppType().ParameterType + " " + nameprefix + "_QMap;\n" // This container may be a QMap or a QHash // QHash supports .reserve(), but QMap doesn't - if strings.HasPrefix(p.ParameterType, "QHash<") { + if mapContainerType == "QHash" { preamble += indent + nameprefix + "_QMap.reserve(" + p.cParameterName() + ".len);\n" } @@ -353,11 +361,7 @@ func emitCABI2CppForwarding(p CppParameter, indent string) (preamble string, for return preamble, "static_cast<" + p.RenderTypeQtCpp() + ">(const_cast<" + p.RenderTypeIntermediateCpp() + ">(" + p.cParameterName() + "))" } - if p.ParameterType == "qint64" || - p.ParameterType == "quint64" || - p.ParameterType == "qlonglong" || - p.ParameterType == "qulonglong" || - p.GetQtCppType().ParameterType == "qintptr" || + if p.GetQtCppType().ParameterType == "qintptr" || p.GetQtCppType().ParameterType == "qsizetype" || // Qt 6 qversionnumber.h: invalid ‘static_cast’ from type ‘ptrdiff_t*’ {aka ‘long int*’} to type ‘qsizetype*’ {aka ‘long long int*’} p.ParameterType == "qint8" || (p.IsFlagType() && p.ByRef) || @@ -461,7 +465,7 @@ func emitAssignCppToCabi(assignExpression string, p CppParameter, rvalue string) afterCall += indent + assignExpression + namePrefix + "_ms;\n" return indent + shouldReturn + rvalue + ";\n" + afterCall - } else if t, ok := p.QListOf(); ok { + } else if t, _, ok := p.QListOf(); ok { // In some cases rvalue is a function call and the temporary // is necessary; in some cases it's a literal and the temporary is @@ -503,7 +507,7 @@ func emitAssignCppToCabi(assignExpression string, p CppParameter, rvalue string) afterCall += indent + assignExpression + "" + namePrefix + "_out;\n" return indent + shouldReturn + rvalue + ";\n" + afterCall - } else if kType, vType, ok := p.QMapOf(); ok { + } else if kType, vType, _, ok := p.QMapOf(); ok { // QMap shouldReturn = p.RenderTypeQtCpp() + " " + namePrefix + "_ret = " @@ -618,8 +622,9 @@ func getCppZeroValue(p CppParameter) string { func getCabiZeroValue(p CppParameter) string { // n.b. Identical to getCppZeroValue in most cases - if p.Pointer { + if p.Pointer && !(p.ParameterType == "QString") { return getCppZeroValue(p) + } else if ev, ok := KnownEnums[p.ParameterType]; ok { // In CABI the zero value may be the underlying type of an enum instead return "(" + ev.Enum.UnderlyingType.RenderTypeCabi() + ")(0)" @@ -635,13 +640,13 @@ func getCabiZeroValue(p CppParameter) string { } else if p.ParameterType == "QString" || p.ParameterType == "QByteArray" { return "(struct miqt_string){}" - } else if _, ok := p.QListOf(); ok { + } else if _, _, ok := p.QListOf(); ok { return "(struct miqt_array){}" } else if _, ok := p.QSetOf(); ok { return "(struct miqt_array){}" - } else if _, _, ok := p.QMapOf(); ok { + } else if _, _, _, ok := p.QMapOf(); ok { return "(struct miqt_map){}" } else if _, _, ok := p.QPairOf(); ok { @@ -666,12 +671,12 @@ func getReferencedTypes(src *CppParsedHeader) []string { if p.QtClassType() { foundTypes[p.ParameterType] = struct{}{} } - if t, ok := p.QListOf(); ok { - foundTypes["QList"] = struct{}{} // FIXME or QVector? + if t, containerType, ok := p.QListOf(); ok { + foundTypes[containerType] = struct{}{} // QList / QVector maybeAddType(t) } - if kType, vType, ok := p.QMapOf(); ok { - foundTypes["QMap"] = struct{}{} // FIXME or QHash? + if kType, vType, containerType, ok := p.QMapOf(); ok { + foundTypes[containerType] = struct{}{} // QMap / QHash maybeAddType(kType) maybeAddType(vType) } @@ -860,7 +865,7 @@ extern "C" { continue // Can't call directly, have to go through our wrapper } - if m.ReturnType.BecomesConstInVersion != nil && packageName == "qt6" { + if m.ReturnType.BecomesConstInVersion != nil { ret.WriteString(fmt.Sprintf("// This method's return type was changed from non-const to const in Qt "+*m.ReturnType.BecomesConstInVersion) + "\n" + "#if QT_VERSION >= QT_VERSION_CHECK(" + strings.Replace(*m.ReturnType.BecomesConstInVersion, `.`, `,`, -1) + ",0)\n" + fmt.Sprintf("%s %s(%s);\n", "const "+m.ReturnType.RenderTypeCabi(), cabiMethodName(c, m), emitParametersCabi(m, ifv(m.IsConst, "const ", "")+className+"*")) + @@ -1266,7 +1271,7 @@ extern "C" { "\n", ) - } else if m.ReturnType.BecomesConstInVersion != nil && strings.Contains(src.Filename, "qt6") { + } else if m.ReturnType.BecomesConstInVersion != nil { ret.WriteString("" + "// This method's return type was changed from non-const to const in Qt " + *m.ReturnType.BecomesConstInVersion + "\n" + diff --git a/cmd/genbindings/emitgo.go b/cmd/genbindings/emitgo.go index 57866b35..d69059f9 100644 --- a/cmd/genbindings/emitgo.go +++ b/cmd/genbindings/emitgo.go @@ -50,7 +50,7 @@ func (p CppParameter) RenderTypeGo(gfs *goFileState) string { return "[]byte" } - if t, ok := p.QListOf(); ok { + if t, _, ok := p.QListOf(); ok { return "[]" + t.RenderTypeGo(gfs) } @@ -58,7 +58,7 @@ func (p CppParameter) RenderTypeGo(gfs *goFileState) string { return "map[" + t.RenderTypeGo(gfs) + "]struct{}" } - if t1, t2, ok := p.QMapOf(); ok { + if t1, t2, _, ok := p.QMapOf(); ok { return "map[" + t1.RenderTypeGo(gfs) + "]" + t2.RenderTypeGo(gfs) } @@ -196,7 +196,7 @@ func (p CppParameter) parameterTypeCgo() string { return "C.struct_miqt_string" } - if _, ok := p.QListOf(); ok { + if _, _, ok := p.QListOf(); ok { return "C.struct_miqt_array" } @@ -204,7 +204,7 @@ func (p CppParameter) parameterTypeCgo() string { return "C.struct_miqt_array" } - if _, _, ok := p.QMapOf(); ok { + if _, _, _, ok := p.QMapOf(); ok { return "C.struct_miqt_map" } @@ -359,7 +359,7 @@ func (gfs *goFileState) emitParameterGo2CABIForwarding(p CppParameter) (preamble rvalue = nameprefix + "_alias" - } else if listType, ok := p.QListOf(); ok { + } else if listType, _, ok := p.QListOf(); ok { // QList // Go: convert T[] -> t* and len // CABI: create a real QList<> @@ -386,7 +386,7 @@ func (gfs *goFileState) emitParameterGo2CABIForwarding(p CppParameter) (preamble } else if _, ok := p.QSetOf(); ok { panic("QSet<> arguments are not yet implemented") // n.b. doesn't seem to exist in QtCore/QtGui/QtWidgets at all - } else if kType, vType, ok := p.QMapOf(); ok { + } else if kType, vType, _, ok := p.QMapOf(); ok { // QMap gfs.imports["unsafe"] = struct{}{} @@ -532,7 +532,7 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue afterword += assignExpr + namePrefix + "_ret" return shouldReturn + " " + rvalue + "\n" + afterword - } else if t, ok := rt.QListOf(); ok { + } else if t, _, ok := rt.QListOf(); ok { gfs.imports["unsafe"] = struct{}{} shouldReturn = "var " + namePrefix + "_ma C.struct_miqt_array = " @@ -565,7 +565,7 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue afterword += assignExpr + " " + namePrefix + "_ret\n" return shouldReturn + " " + rvalue + "\n" + afterword - } else if kType, vType, ok := rt.QMapOf(); ok { + } else if kType, vType, _, ok := rt.QMapOf(); ok { gfs.imports["unsafe"] = struct{}{} shouldReturn = "var " + namePrefix + "_mm C.struct_miqt_map = " diff --git a/cmd/genbindings/intermediate.go b/cmd/genbindings/intermediate.go index 6d8432d0..85073e26 100644 --- a/cmd/genbindings/intermediate.go +++ b/cmd/genbindings/intermediate.go @@ -112,23 +112,23 @@ func (p CppParameter) IsKnownEnum() bool { return ok } -func (p CppParameter) QListOf() (CppParameter, bool) { +func (p CppParameter) QListOf() (CppParameter, string, bool) { if strings.HasPrefix(p.ParameterType, "QList<") && strings.HasSuffix(p.ParameterType, `>`) { ret := parseSingleTypeString(p.ParameterType[6 : len(p.ParameterType)-1]) ret.ParameterName = p.ParameterName + "_lv" - return ret, true + return ret, "QList", true } if strings.HasPrefix(p.ParameterType, "QVector<") && strings.HasSuffix(p.ParameterType, `>`) { ret := parseSingleTypeString(p.ParameterType[8 : len(p.ParameterType)-1]) ret.ParameterName = p.ParameterName + "_vv" - return ret, true + return ret, "QVector", true } - return CppParameter{}, false + return CppParameter{}, "", false } -func (p CppParameter) QMapOf() (CppParameter, CppParameter, bool) { +func (p CppParameter) QMapOf() (CppParameter, CppParameter, string, bool) { // n.b. Need to block QMap::const_terator if strings.HasPrefix(p.ParameterType, `QMap<`) && strings.HasSuffix(p.ParameterType, `>`) { @@ -141,7 +141,7 @@ func (p CppParameter) QMapOf() (CppParameter, CppParameter, bool) { first.ParameterName = p.ParameterName + "_mapkey" second := parseSingleTypeString(interior[1]) second.ParameterName = p.ParameterName + "_mapval" - return first, second, true + return first, second, "QMap", true } if strings.HasPrefix(p.ParameterType, `QHash<`) && strings.HasSuffix(p.ParameterType, `>`) { @@ -154,10 +154,10 @@ func (p CppParameter) QMapOf() (CppParameter, CppParameter, bool) { first.ParameterName = p.ParameterName + "_hashkey" second := parseSingleTypeString(interior[1]) second.ParameterName = p.ParameterName + "_hashval" - return first, second, true + return first, second, "QHash", true } - return CppParameter{}, CppParameter{}, false + return CppParameter{}, CppParameter{}, "", false } func (p CppParameter) QPairOf() (CppParameter, CppParameter, bool) { diff --git a/cmd/genbindings/main.go b/cmd/genbindings/main.go index 7293355d..d37ab80f 100644 --- a/cmd/genbindings/main.go +++ b/cmd/genbindings/main.go @@ -86,6 +86,7 @@ func cleanGeneratedFilesInDir(dirpath string) { func pkgConfigCflags(packageName string) string { stdout, err := exec.Command(`pkg-config`, `--cflags`, packageName).Output() if err != nil { + log.Printf("pkg-config(%q): %v", packageName, string(err.(*exec.ExitError).Stderr)) panic(err) } @@ -157,7 +158,8 @@ func generate(packageName string, srcDirs []string, allowHeaderFn func(string) b parsed.Filename = inputHeader // Stash // AST transforms on our IL - astTransformChildClasses(parsed) // must be first + astTransformChildClasses(parsed) // must be first + astTransformApplyQuirks(packageName, parsed) // must be before optional/overload expansion astTransformOptional(parsed) astTransformOverloads(parsed) astTransformConstructorOrder(parsed) diff --git a/cmd/genbindings/transformctors.go b/cmd/genbindings/transformctors.go index 3860024b..984a090d 100644 --- a/cmd/genbindings/transformctors.go +++ b/cmd/genbindings/transformctors.go @@ -4,30 +4,56 @@ import ( "sort" ) -// astTransformConstructorOrder creates a canonical ordering for constructors -// where the 0th entry is any entry taking solely a QWidget* parameter. -// This is so that UIC can safely assume this for types. -// @ref https://github.com/mappu/miqt/issues/46 +// astTransformConstructorOrder creates a canonical ordering for constructors. func astTransformConstructorOrder(parsed *CppParsedHeader) { // QFoo(QWidget* parent); - checkIsDefaultCtor := func(candidate CppMethod) bool { + checkIsDefaultCtor := func(candidate *CppMethod) bool { return len(candidate.Parameters) == 1 && candidate.Parameters[0].ParameterType == "QWidget" && candidate.Parameters[0].Pointer } + // QFoo(QVariantList); + checkIsQVariantListCtor := func(candidate *CppMethod) bool { + if len(candidate.Parameters) != 1 { + return false + } + + if t, _, ok := candidate.Parameters[0].QListOf(); ok && t.ParameterType == "QVariant" { + return true + } + return false + } + // Iterate all classes for i, c := range parsed.Classes { // Sort sort.SliceStable(c.Ctors, func(i, j int) bool { - ic := checkIsDefaultCtor(c.Ctors[i]) - jc := checkIsDefaultCtor(c.Ctors[j]) + // Case 1: Default ctors are moved to front, + // so the 0th entry is any entry taking solely a QWidget* parameter. + // This is so that UIC can safely assume this for types. + // @ref https://github.com/mappu/miqt/issues/46 + ic := checkIsDefaultCtor(&c.Ctors[i]) + jc := checkIsDefaultCtor(&c.Ctors[j]) if ic && !jc { return true } + + // Case 2: QVariantList overload is moved to end + // This softens a compatibility break churning all the QVariant + // constructor ordinals when QVariantList was unblocked. + // @ref https://github.com/mappu/miqt/issues/188 + ic = checkIsQVariantListCtor(&c.Ctors[i]) + jc = checkIsQVariantListCtor(&c.Ctors[j]) + + if !ic && jc { + return true + } + + // Case 3: Normal return false }) diff --git a/cmd/genbindings/transformoptional.go b/cmd/genbindings/transformoptional.go index 2d150fc7..ab1f45f6 100644 --- a/cmd/genbindings/transformoptional.go +++ b/cmd/genbindings/transformoptional.go @@ -1,11 +1,8 @@ package main -import ( - "strconv" -) - // astTransformOptional expands all methods with optional parameters into // explicit additional versions. +// The duplicate method has a colliding name and needs name disambiguation later. func astTransformOptional(parsed *CppParsedHeader) { for i, c := range parsed.Classes { @@ -38,7 +35,7 @@ func astTransformOptional(parsed *CppParsedHeader) { // Add method copies for x := optionalStart; x < len(m.Parameters); x++ { dupMethod := m // shallow copy - dupMethod.Rename(m.MethodName + strconv.Itoa(x+1)) + // dupMethod.Rename(m.MethodName + strconv.Itoa(x+1)) // Don't rename the method - transformoverload() will handle naming conflicts dupMethod.Parameters = m.Parameters[0 : x+1] dupMethod.HiddenParams = m.Parameters[x+1:] diff --git a/cmd/genbindings/transformoverload.go b/cmd/genbindings/transformoverload.go index 55d9c92a..636362a7 100644 --- a/cmd/genbindings/transformoverload.go +++ b/cmd/genbindings/transformoverload.go @@ -29,39 +29,41 @@ func astTransformOverloads(parsed *CppParsedHeader) { // Collision - rename anyChange = true - ctr := 1 - for { + proposedName = (func() (proposedName string) { - if ctr == 1 { - // Fake special-case check - // If this is a 1-argument function, try and name it FooFrom{Type} - // e.g. NewVariantFromFloat - if len(m.Parameters) == 1 { - - // If the parameter has a proper name (i.e. not 'l' or 'param1') - // then go with that - if len(m.Parameters[0].ParameterName) > 1 && !strings.HasPrefix(m.Parameters[0].ParameterName, "param") { - proposedName = originalProposal + "With" + titleCase(m.Parameters[0].ParameterName) - } else { - // Try the type instead - proposedName = originalProposal + "With" + titleCase(m.Parameters[0].renderTypeForMethod()) - } - if _, ok := existing[proposedName]; !ok { - break - } + // Fake special-case check + // If this is a 1-argument function, try and name it FooFrom{Type} + // e.g. NewVariantFromFloat + if len(m.Parameters) == 1 { + // If the parameter has a proper name (i.e. not 'l' or 'param1') + // then go with that + if len(m.Parameters[0].ParameterName) > 1 && !strings.HasPrefix(m.Parameters[0].ParameterName, "param") { + proposedName = originalProposal + "With" + titleCase(m.Parameters[0].ParameterName) + } else { + // Try the type instead + proposedName = originalProposal + "With" + titleCase(m.Parameters[0].renderTypeForMethod()) } - - } else { - proposedName = fmt.Sprintf("%s%d", originalProposal, ctr) if _, ok := existing[proposedName]; !ok { - break + return proposedName } + } - ctr++ // Loop until we have a non-colliding name available - } + // No special naming, have to use a numeric overload + // Numbers start with 2 since the "original" is the first + ctr := 2 + for { + proposedName = fmt.Sprintf("%s%d", originalProposal, ctr) + if _, ok := existing[proposedName]; !ok { + return proposedName + } + ctr++ // Loop until we have a non-colliding name available + } + })() + + // We have identified a final replacement name existing[proposedName] = struct{}{} m.Rename(proposedName) c.Methods[j] = m diff --git a/cmd/genbindings/transformquirks.go b/cmd/genbindings/transformquirks.go new file mode 100644 index 00000000..80ce954b --- /dev/null +++ b/cmd/genbindings/transformquirks.go @@ -0,0 +1,21 @@ +package main + +// astTransformApplyQuirks applies quirk flags to the class/method. +func astTransformApplyQuirks(packageName string, parsed *CppParsedHeader) { + + for i, c := range parsed.Classes { + + // Constructors + + for j, _ := range c.Ctors { + ApplyQuirks(packageName, c.ClassName, &parsed.Classes[i].Ctors[j]) + } + + // Methods + + for j, _ := range c.Methods { + ApplyQuirks(packageName, c.ClassName, &parsed.Classes[i].Methods[j]) + } + + } +} diff --git a/cmd/genbindings/transformtypedefs.go b/cmd/genbindings/transformtypedefs.go index e65d2e9f..03302295 100644 --- a/cmd/genbindings/transformtypedefs.go +++ b/cmd/genbindings/transformtypedefs.go @@ -1,9 +1,5 @@ package main -import ( - "strings" -) - func applyTypedefs(p CppParameter) CppParameter { for { @@ -14,36 +10,30 @@ func applyTypedefs(p CppParameter) CppParameter { p.ApplyTypedef(td.Typedef.UnderlyingType) } - if t, ok := p.QListOf(); ok { + if t, containerType, ok := p.QListOf(); ok { t2 := applyTypedefs(t) // recursive // Wipe out so that RenderTypeQtCpp() does not see it t2.QtCppOriginalType = nil - // QListOf returns for either QList< or QVector< - // Patch it up to the first < position and last character - bpos := strings.Index(p.ParameterType, `<`) - if p.QtCppOriginalType == nil { tmp := p // copy p.QtCppOriginalType = &tmp } - p.ParameterType = p.ParameterType[0:bpos] + `<` + t2.RenderTypeQtCpp() + `>` + p.ParameterType = containerType + `<` + t2.RenderTypeQtCpp() + `>` - } else if kType, vType, ok := p.QMapOf(); ok { + } else if kType, vType, containerType, ok := p.QMapOf(); ok { kType2 := applyTypedefs(kType) kType2.QtCppOriginalType = nil vType2 := applyTypedefs(vType) vType2.QtCppOriginalType = nil - bpos := strings.Index(p.ParameterType, `<`) - if p.QtCppOriginalType == nil { tmp := p // copy p.QtCppOriginalType = &tmp } - p.ParameterType = p.ParameterType[0:bpos] + `<` + kType2.RenderTypeQtCpp() + `, ` + vType2.RenderTypeQtCpp() + `>` + p.ParameterType = containerType + `<` + kType2.RenderTypeQtCpp() + `, ` + vType2.RenderTypeQtCpp() + `>` } else if kType, vType, ok := p.QPairOf(); ok { kType2 := applyTypedefs(kType) @@ -68,18 +58,9 @@ func applyTypedefs_Method(m *CppMethod) { for k, p := range m.Parameters { transformed := applyTypedefs(p) m.Parameters[k] = transformed - - if LinuxWindowsCompatCheck(transformed) { - m.LinuxOnly = true - } } m.ReturnType = applyTypedefs(m.ReturnType) - - // Also apply OS compatibility rules - if LinuxWindowsCompatCheck(m.ReturnType) { - m.LinuxOnly = true - } } // astTransformTypedefs replaces the ParameterType with any known typedef value. diff --git a/examples/goroutine6/main.go b/examples/goroutine6/main.go index 69802223..2a57f3e3 100644 --- a/examples/goroutine6/main.go +++ b/examples/goroutine6/main.go @@ -33,7 +33,7 @@ func main() { } button := qt.NewQPushButton5("start!", window.QWidget) - button.OnClicked1(func(bool) { + button.OnClicked(func() { button.SetDisabled(true) for i, label := range labels { go func(index int, qlabel *qt.QLabel) { diff --git a/qt-extras/scintillaedit/gen_ScintillaEdit.cpp b/qt-extras/scintillaedit/gen_ScintillaEdit.cpp index 5dbd5296..8de17ac2 100644 --- a/qt-extras/scintillaedit/gen_ScintillaEdit.cpp +++ b/qt-extras/scintillaedit/gen_ScintillaEdit.cpp @@ -929,7 +929,7 @@ Scintilla__Internal__PRectangle* Scintilla__Internal__Window_GetMonitorRect(Scin return new Scintilla::Internal::PRectangle(self->GetMonitorRect(*pt)); } -void Scintilla__Internal__Window_Show1(Scintilla__Internal__Window* self, bool show) { +void Scintilla__Internal__Window_ShowWithShow(Scintilla__Internal__Window* self, bool show) { self->Show(show); } @@ -4224,7 +4224,7 @@ struct miqt_string ScintillaDocument_trUtf83(const char* s, const char* c, int n return _ms; } -void ScintillaDocument_beginUndoAction1(ScintillaDocument* self, bool coalesceWithPrior) { +void ScintillaDocument_beginUndoActionWithCoalesceWithPrior(ScintillaDocument* self, bool coalesceWithPrior) { self->begin_undo_action(coalesceWithPrior); } diff --git a/qt-extras/scintillaedit/gen_ScintillaEdit.go b/qt-extras/scintillaedit/gen_ScintillaEdit.go index 1444ebd4..6978cff4 100644 --- a/qt-extras/scintillaedit/gen_ScintillaEdit.go +++ b/qt-extras/scintillaedit/gen_ScintillaEdit.go @@ -3604,8 +3604,8 @@ func (this *Scintilla__Internal__Window) GetMonitorRect(pt Scintilla__Internal__ return _goptr } -func (this *Scintilla__Internal__Window) Show1(show bool) { - C.Scintilla__Internal__Window_Show1(this.h, (C.bool)(show)) +func (this *Scintilla__Internal__Window) ShowWithShow(show bool) { + C.Scintilla__Internal__Window_ShowWithShow(this.h, (C.bool)(show)) } // Delete this object from C++ memory. @@ -7449,8 +7449,8 @@ func ScintillaDocument_TrUtf83(s string, c string, n int) string { return _ret } -func (this *ScintillaDocument) BeginUndoAction1(coalesceWithPrior bool) { - C.ScintillaDocument_beginUndoAction1(this.h, (C.bool)(coalesceWithPrior)) +func (this *ScintillaDocument) BeginUndoActionWithCoalesceWithPrior(coalesceWithPrior bool) { + C.ScintillaDocument_beginUndoActionWithCoalesceWithPrior(this.h, (C.bool)(coalesceWithPrior)) } // Sender can only be called from a ScintillaDocument that was directly constructed. diff --git a/qt-extras/scintillaedit/gen_ScintillaEdit.h b/qt-extras/scintillaedit/gen_ScintillaEdit.h index 08432304..2f96cfb9 100644 --- a/qt-extras/scintillaedit/gen_ScintillaEdit.h +++ b/qt-extras/scintillaedit/gen_ScintillaEdit.h @@ -500,7 +500,7 @@ void Scintilla__Internal__Window_InvalidateAll(Scintilla__Internal__Window* self void Scintilla__Internal__Window_InvalidateRectangle(Scintilla__Internal__Window* self, Scintilla__Internal__PRectangle* rc); void Scintilla__Internal__Window_SetCursor(Scintilla__Internal__Window* self, int curs); Scintilla__Internal__PRectangle* Scintilla__Internal__Window_GetMonitorRect(Scintilla__Internal__Window* self, Scintilla__Internal__Point* pt); -void Scintilla__Internal__Window_Show1(Scintilla__Internal__Window* self, bool show); +void Scintilla__Internal__Window_ShowWithShow(Scintilla__Internal__Window* self, bool show); void Scintilla__Internal__Window_delete(Scintilla__Internal__Window* self); Scintilla__Internal__ListBoxEvent* Scintilla__Internal__ListBoxEvent_new(int event_); @@ -856,7 +856,7 @@ struct miqt_string ScintillaDocument_tr2(const char* s, const char* c); struct miqt_string ScintillaDocument_tr3(const char* s, const char* c, int n); struct miqt_string ScintillaDocument_trUtf82(const char* s, const char* c); struct miqt_string ScintillaDocument_trUtf83(const char* s, const char* c, int n); -void ScintillaDocument_beginUndoAction1(ScintillaDocument* self, bool coalesceWithPrior); +void ScintillaDocument_beginUndoActionWithCoalesceWithPrior(ScintillaDocument* self, bool coalesceWithPrior); bool ScintillaDocument_override_virtual_event(void* self, intptr_t slot); bool ScintillaDocument_virtualbase_event(void* self, QEvent* event); bool ScintillaDocument_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt-restricted-extras/charts6/gen_qabstractaxis.cpp b/qt-restricted-extras/charts6/gen_qabstractaxis.cpp index 43357d41..a9b356dc 100644 --- a/qt-restricted-extras/charts6/gen_qabstractaxis.cpp +++ b/qt-restricted-extras/charts6/gen_qabstractaxis.cpp @@ -695,43 +695,43 @@ struct miqt_string QAbstractAxis_tr3(const char* s, const char* c, int n) { return _ms; } -void QAbstractAxis_setVisible1(QAbstractAxis* self, bool visible) { +void QAbstractAxis_setVisibleWithVisible(QAbstractAxis* self, bool visible) { self->setVisible(visible); } -void QAbstractAxis_setLineVisible1(QAbstractAxis* self, bool visible) { +void QAbstractAxis_setLineVisibleWithVisible(QAbstractAxis* self, bool visible) { self->setLineVisible(visible); } -void QAbstractAxis_setGridLineVisible1(QAbstractAxis* self, bool visible) { +void QAbstractAxis_setGridLineVisibleWithVisible(QAbstractAxis* self, bool visible) { self->setGridLineVisible(visible); } -void QAbstractAxis_setMinorGridLineVisible1(QAbstractAxis* self, bool visible) { +void QAbstractAxis_setMinorGridLineVisibleWithVisible(QAbstractAxis* self, bool visible) { self->setMinorGridLineVisible(visible); } -void QAbstractAxis_setLabelsVisible1(QAbstractAxis* self, bool visible) { +void QAbstractAxis_setLabelsVisibleWithVisible(QAbstractAxis* self, bool visible) { self->setLabelsVisible(visible); } -void QAbstractAxis_setTitleVisible1(QAbstractAxis* self, bool visible) { +void QAbstractAxis_setTitleVisibleWithVisible(QAbstractAxis* self, bool visible) { self->setTitleVisible(visible); } -void QAbstractAxis_setShadesVisible1(QAbstractAxis* self, bool visible) { +void QAbstractAxis_setShadesVisibleWithVisible(QAbstractAxis* self, bool visible) { self->setShadesVisible(visible); } -void QAbstractAxis_setReverse1(QAbstractAxis* self, bool reverse) { +void QAbstractAxis_setReverseWithReverse(QAbstractAxis* self, bool reverse) { self->setReverse(reverse); } -void QAbstractAxis_setLabelsEditable1(QAbstractAxis* self, bool editable) { +void QAbstractAxis_setLabelsEditableWithEditable(QAbstractAxis* self, bool editable) { self->setLabelsEditable(editable); } -void QAbstractAxis_setTruncateLabels1(QAbstractAxis* self, bool truncateLabels) { +void QAbstractAxis_setTruncateLabelsWithTruncateLabels(QAbstractAxis* self, bool truncateLabels) { self->setTruncateLabels(truncateLabels); } diff --git a/qt-restricted-extras/charts6/gen_qabstractaxis.go b/qt-restricted-extras/charts6/gen_qabstractaxis.go index a02c5db4..78439c07 100644 --- a/qt-restricted-extras/charts6/gen_qabstractaxis.go +++ b/qt-restricted-extras/charts6/gen_qabstractaxis.go @@ -968,44 +968,44 @@ func QAbstractAxis_Tr3(s string, c string, n int) string { return _ret } -func (this *QAbstractAxis) SetVisible1(visible bool) { - C.QAbstractAxis_setVisible1(this.h, (C.bool)(visible)) +func (this *QAbstractAxis) SetVisibleWithVisible(visible bool) { + C.QAbstractAxis_setVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QAbstractAxis) SetLineVisible1(visible bool) { - C.QAbstractAxis_setLineVisible1(this.h, (C.bool)(visible)) +func (this *QAbstractAxis) SetLineVisibleWithVisible(visible bool) { + C.QAbstractAxis_setLineVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QAbstractAxis) SetGridLineVisible1(visible bool) { - C.QAbstractAxis_setGridLineVisible1(this.h, (C.bool)(visible)) +func (this *QAbstractAxis) SetGridLineVisibleWithVisible(visible bool) { + C.QAbstractAxis_setGridLineVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QAbstractAxis) SetMinorGridLineVisible1(visible bool) { - C.QAbstractAxis_setMinorGridLineVisible1(this.h, (C.bool)(visible)) +func (this *QAbstractAxis) SetMinorGridLineVisibleWithVisible(visible bool) { + C.QAbstractAxis_setMinorGridLineVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QAbstractAxis) SetLabelsVisible1(visible bool) { - C.QAbstractAxis_setLabelsVisible1(this.h, (C.bool)(visible)) +func (this *QAbstractAxis) SetLabelsVisibleWithVisible(visible bool) { + C.QAbstractAxis_setLabelsVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QAbstractAxis) SetTitleVisible1(visible bool) { - C.QAbstractAxis_setTitleVisible1(this.h, (C.bool)(visible)) +func (this *QAbstractAxis) SetTitleVisibleWithVisible(visible bool) { + C.QAbstractAxis_setTitleVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QAbstractAxis) SetShadesVisible1(visible bool) { - C.QAbstractAxis_setShadesVisible1(this.h, (C.bool)(visible)) +func (this *QAbstractAxis) SetShadesVisibleWithVisible(visible bool) { + C.QAbstractAxis_setShadesVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QAbstractAxis) SetReverse1(reverse bool) { - C.QAbstractAxis_setReverse1(this.h, (C.bool)(reverse)) +func (this *QAbstractAxis) SetReverseWithReverse(reverse bool) { + C.QAbstractAxis_setReverseWithReverse(this.h, (C.bool)(reverse)) } -func (this *QAbstractAxis) SetLabelsEditable1(editable bool) { - C.QAbstractAxis_setLabelsEditable1(this.h, (C.bool)(editable)) +func (this *QAbstractAxis) SetLabelsEditableWithEditable(editable bool) { + C.QAbstractAxis_setLabelsEditableWithEditable(this.h, (C.bool)(editable)) } -func (this *QAbstractAxis) SetTruncateLabels1(truncateLabels bool) { - C.QAbstractAxis_setTruncateLabels1(this.h, (C.bool)(truncateLabels)) +func (this *QAbstractAxis) SetTruncateLabelsWithTruncateLabels(truncateLabels bool) { + C.QAbstractAxis_setTruncateLabelsWithTruncateLabels(this.h, (C.bool)(truncateLabels)) } // Delete this object from C++ memory. diff --git a/qt-restricted-extras/charts6/gen_qabstractaxis.h b/qt-restricted-extras/charts6/gen_qabstractaxis.h index 63b0bbc8..3f263a16 100644 --- a/qt-restricted-extras/charts6/gen_qabstractaxis.h +++ b/qt-restricted-extras/charts6/gen_qabstractaxis.h @@ -161,16 +161,16 @@ void QAbstractAxis_truncateLabelsChanged(QAbstractAxis* self, bool truncateLabel void QAbstractAxis_connect_truncateLabelsChanged(QAbstractAxis* self, intptr_t slot); struct miqt_string QAbstractAxis_tr2(const char* s, const char* c); struct miqt_string QAbstractAxis_tr3(const char* s, const char* c, int n); -void QAbstractAxis_setVisible1(QAbstractAxis* self, bool visible); -void QAbstractAxis_setLineVisible1(QAbstractAxis* self, bool visible); -void QAbstractAxis_setGridLineVisible1(QAbstractAxis* self, bool visible); -void QAbstractAxis_setMinorGridLineVisible1(QAbstractAxis* self, bool visible); -void QAbstractAxis_setLabelsVisible1(QAbstractAxis* self, bool visible); -void QAbstractAxis_setTitleVisible1(QAbstractAxis* self, bool visible); -void QAbstractAxis_setShadesVisible1(QAbstractAxis* self, bool visible); -void QAbstractAxis_setReverse1(QAbstractAxis* self, bool reverse); -void QAbstractAxis_setLabelsEditable1(QAbstractAxis* self, bool editable); -void QAbstractAxis_setTruncateLabels1(QAbstractAxis* self, bool truncateLabels); +void QAbstractAxis_setVisibleWithVisible(QAbstractAxis* self, bool visible); +void QAbstractAxis_setLineVisibleWithVisible(QAbstractAxis* self, bool visible); +void QAbstractAxis_setGridLineVisibleWithVisible(QAbstractAxis* self, bool visible); +void QAbstractAxis_setMinorGridLineVisibleWithVisible(QAbstractAxis* self, bool visible); +void QAbstractAxis_setLabelsVisibleWithVisible(QAbstractAxis* self, bool visible); +void QAbstractAxis_setTitleVisibleWithVisible(QAbstractAxis* self, bool visible); +void QAbstractAxis_setShadesVisibleWithVisible(QAbstractAxis* self, bool visible); +void QAbstractAxis_setReverseWithReverse(QAbstractAxis* self, bool reverse); +void QAbstractAxis_setLabelsEditableWithEditable(QAbstractAxis* self, bool editable); +void QAbstractAxis_setTruncateLabelsWithTruncateLabels(QAbstractAxis* self, bool truncateLabels); void QAbstractAxis_delete(QAbstractAxis* self); #ifdef __cplusplus diff --git a/qt-restricted-extras/charts6/gen_qabstractbarseries.cpp b/qt-restricted-extras/charts6/gen_qabstractbarseries.cpp index f1bf5b1b..b8afdc01 100644 --- a/qt-restricted-extras/charts6/gen_qabstractbarseries.cpp +++ b/qt-restricted-extras/charts6/gen_qabstractbarseries.cpp @@ -370,7 +370,7 @@ struct miqt_string QAbstractBarSeries_tr3(const char* s, const char* c, int n) { return _ms; } -void QAbstractBarSeries_setLabelsVisible1(QAbstractBarSeries* self, bool visible) { +void QAbstractBarSeries_setLabelsVisibleWithVisible(QAbstractBarSeries* self, bool visible) { self->setLabelsVisible(visible); } diff --git a/qt-restricted-extras/charts6/gen_qabstractbarseries.go b/qt-restricted-extras/charts6/gen_qabstractbarseries.go index c0c1788f..f54b62f1 100644 --- a/qt-restricted-extras/charts6/gen_qabstractbarseries.go +++ b/qt-restricted-extras/charts6/gen_qabstractbarseries.go @@ -497,8 +497,8 @@ func QAbstractBarSeries_Tr3(s string, c string, n int) string { return _ret } -func (this *QAbstractBarSeries) SetLabelsVisible1(visible bool) { - C.QAbstractBarSeries_setLabelsVisible1(this.h, (C.bool)(visible)) +func (this *QAbstractBarSeries) SetLabelsVisibleWithVisible(visible bool) { + C.QAbstractBarSeries_setLabelsVisibleWithVisible(this.h, (C.bool)(visible)) } // Delete this object from C++ memory. diff --git a/qt-restricted-extras/charts6/gen_qabstractbarseries.h b/qt-restricted-extras/charts6/gen_qabstractbarseries.h index 2b362836..8467d0fa 100644 --- a/qt-restricted-extras/charts6/gen_qabstractbarseries.h +++ b/qt-restricted-extras/charts6/gen_qabstractbarseries.h @@ -82,7 +82,7 @@ void QAbstractBarSeries_barsetsRemoved(QAbstractBarSeries* self, struct miqt_arr void QAbstractBarSeries_connect_barsetsRemoved(QAbstractBarSeries* self, intptr_t slot); struct miqt_string QAbstractBarSeries_tr2(const char* s, const char* c); struct miqt_string QAbstractBarSeries_tr3(const char* s, const char* c, int n); -void QAbstractBarSeries_setLabelsVisible1(QAbstractBarSeries* self, bool visible); +void QAbstractBarSeries_setLabelsVisibleWithVisible(QAbstractBarSeries* self, bool visible); void QAbstractBarSeries_delete(QAbstractBarSeries* self); #ifdef __cplusplus diff --git a/qt-restricted-extras/charts6/gen_qabstractseries.cpp b/qt-restricted-extras/charts6/gen_qabstractseries.cpp index e481eede..33d496f5 100644 --- a/qt-restricted-extras/charts6/gen_qabstractseries.cpp +++ b/qt-restricted-extras/charts6/gen_qabstractseries.cpp @@ -187,11 +187,11 @@ struct miqt_string QAbstractSeries_tr3(const char* s, const char* c, int n) { return _ms; } -void QAbstractSeries_setVisible1(QAbstractSeries* self, bool visible) { +void QAbstractSeries_setVisibleWithVisible(QAbstractSeries* self, bool visible) { self->setVisible(visible); } -void QAbstractSeries_setUseOpenGL1(QAbstractSeries* self, bool enable) { +void QAbstractSeries_setUseOpenGLWithEnable(QAbstractSeries* self, bool enable) { self->setUseOpenGL(enable); } diff --git a/qt-restricted-extras/charts6/gen_qabstractseries.go b/qt-restricted-extras/charts6/gen_qabstractseries.go index 19655dea..352dfae9 100644 --- a/qt-restricted-extras/charts6/gen_qabstractseries.go +++ b/qt-restricted-extras/charts6/gen_qabstractseries.go @@ -251,12 +251,12 @@ func QAbstractSeries_Tr3(s string, c string, n int) string { return _ret } -func (this *QAbstractSeries) SetVisible1(visible bool) { - C.QAbstractSeries_setVisible1(this.h, (C.bool)(visible)) +func (this *QAbstractSeries) SetVisibleWithVisible(visible bool) { + C.QAbstractSeries_setVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QAbstractSeries) SetUseOpenGL1(enable bool) { - C.QAbstractSeries_setUseOpenGL1(this.h, (C.bool)(enable)) +func (this *QAbstractSeries) SetUseOpenGLWithEnable(enable bool) { + C.QAbstractSeries_setUseOpenGLWithEnable(this.h, (C.bool)(enable)) } // Delete this object from C++ memory. diff --git a/qt-restricted-extras/charts6/gen_qabstractseries.h b/qt-restricted-extras/charts6/gen_qabstractseries.h index ac4a2257..7191a9ca 100644 --- a/qt-restricted-extras/charts6/gen_qabstractseries.h +++ b/qt-restricted-extras/charts6/gen_qabstractseries.h @@ -59,8 +59,8 @@ void QAbstractSeries_useOpenGLChanged(QAbstractSeries* self); void QAbstractSeries_connect_useOpenGLChanged(QAbstractSeries* self, intptr_t slot); struct miqt_string QAbstractSeries_tr2(const char* s, const char* c); struct miqt_string QAbstractSeries_tr3(const char* s, const char* c, int n); -void QAbstractSeries_setVisible1(QAbstractSeries* self, bool visible); -void QAbstractSeries_setUseOpenGL1(QAbstractSeries* self, bool enable); +void QAbstractSeries_setVisibleWithVisible(QAbstractSeries* self, bool visible); +void QAbstractSeries_setUseOpenGLWithEnable(QAbstractSeries* self, bool enable); void QAbstractSeries_delete(QAbstractSeries* self); #ifdef __cplusplus diff --git a/qt-restricted-extras/charts6/gen_qareaseries.cpp b/qt-restricted-extras/charts6/gen_qareaseries.cpp index 6b727666..8101b22f 100644 --- a/qt-restricted-extras/charts6/gen_qareaseries.cpp +++ b/qt-restricted-extras/charts6/gen_qareaseries.cpp @@ -552,15 +552,15 @@ struct miqt_string QAreaSeries_tr3(const char* s, const char* c, int n) { return _ms; } -void QAreaSeries_setPointsVisible1(QAreaSeries* self, bool visible) { +void QAreaSeries_setPointsVisibleWithVisible(QAreaSeries* self, bool visible) { self->setPointsVisible(visible); } -void QAreaSeries_setPointLabelsVisible1(QAreaSeries* self, bool visible) { +void QAreaSeries_setPointLabelsVisibleWithVisible(QAreaSeries* self, bool visible) { self->setPointLabelsVisible(visible); } -void QAreaSeries_setPointLabelsClipping1(QAreaSeries* self, bool enabled) { +void QAreaSeries_setPointLabelsClippingWithEnabled(QAreaSeries* self, bool enabled) { self->setPointLabelsClipping(enabled); } diff --git a/qt-restricted-extras/charts6/gen_qareaseries.go b/qt-restricted-extras/charts6/gen_qareaseries.go index a7dab89d..aaa21718 100644 --- a/qt-restricted-extras/charts6/gen_qareaseries.go +++ b/qt-restricted-extras/charts6/gen_qareaseries.go @@ -505,16 +505,16 @@ func QAreaSeries_Tr3(s string, c string, n int) string { return _ret } -func (this *QAreaSeries) SetPointsVisible1(visible bool) { - C.QAreaSeries_setPointsVisible1(this.h, (C.bool)(visible)) +func (this *QAreaSeries) SetPointsVisibleWithVisible(visible bool) { + C.QAreaSeries_setPointsVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QAreaSeries) SetPointLabelsVisible1(visible bool) { - C.QAreaSeries_setPointLabelsVisible1(this.h, (C.bool)(visible)) +func (this *QAreaSeries) SetPointLabelsVisibleWithVisible(visible bool) { + C.QAreaSeries_setPointLabelsVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QAreaSeries) SetPointLabelsClipping1(enabled bool) { - C.QAreaSeries_setPointLabelsClipping1(this.h, (C.bool)(enabled)) +func (this *QAreaSeries) SetPointLabelsClippingWithEnabled(enabled bool) { + C.QAreaSeries_setPointLabelsClippingWithEnabled(this.h, (C.bool)(enabled)) } // Sender can only be called from a QAreaSeries that was directly constructed. diff --git a/qt-restricted-extras/charts6/gen_qareaseries.h b/qt-restricted-extras/charts6/gen_qareaseries.h index bb7d1fd0..c7a2c4df 100644 --- a/qt-restricted-extras/charts6/gen_qareaseries.h +++ b/qt-restricted-extras/charts6/gen_qareaseries.h @@ -107,9 +107,9 @@ void QAreaSeries_pointLabelsClippingChanged(QAreaSeries* self, bool clipping); void QAreaSeries_connect_pointLabelsClippingChanged(QAreaSeries* self, intptr_t slot); struct miqt_string QAreaSeries_tr2(const char* s, const char* c); struct miqt_string QAreaSeries_tr3(const char* s, const char* c, int n); -void QAreaSeries_setPointsVisible1(QAreaSeries* self, bool visible); -void QAreaSeries_setPointLabelsVisible1(QAreaSeries* self, bool visible); -void QAreaSeries_setPointLabelsClipping1(QAreaSeries* self, bool enabled); +void QAreaSeries_setPointsVisibleWithVisible(QAreaSeries* self, bool visible); +void QAreaSeries_setPointLabelsVisibleWithVisible(QAreaSeries* self, bool visible); +void QAreaSeries_setPointLabelsClippingWithEnabled(QAreaSeries* self, bool enabled); bool QAreaSeries_override_virtual_type(void* self, intptr_t slot); int QAreaSeries_virtualbase_type(const void* self); bool QAreaSeries_override_virtual_event(void* self, intptr_t slot); diff --git a/qt-restricted-extras/charts6/gen_qcategoryaxis.cpp b/qt-restricted-extras/charts6/gen_qcategoryaxis.cpp index d0a80dcb..668b9cdf 100644 --- a/qt-restricted-extras/charts6/gen_qcategoryaxis.cpp +++ b/qt-restricted-extras/charts6/gen_qcategoryaxis.cpp @@ -344,7 +344,7 @@ struct miqt_string QCategoryAxis_tr3(const char* s, const char* c, int n) { return _ms; } -double QCategoryAxis_startValue1(const QCategoryAxis* self, struct miqt_string categoryLabel) { +double QCategoryAxis_startValueWithCategoryLabel(const QCategoryAxis* self, struct miqt_string categoryLabel) { QString categoryLabel_QString = QString::fromUtf8(categoryLabel.data, categoryLabel.len); qreal _ret = self->startValue(categoryLabel_QString); return static_cast(_ret); diff --git a/qt-restricted-extras/charts6/gen_qcategoryaxis.go b/qt-restricted-extras/charts6/gen_qcategoryaxis.go index 743316a7..ee59fa95 100644 --- a/qt-restricted-extras/charts6/gen_qcategoryaxis.go +++ b/qt-restricted-extras/charts6/gen_qcategoryaxis.go @@ -221,12 +221,12 @@ func QCategoryAxis_Tr3(s string, c string, n int) string { return _ret } -func (this *QCategoryAxis) StartValue1(categoryLabel string) float64 { +func (this *QCategoryAxis) StartValueWithCategoryLabel(categoryLabel string) float64 { categoryLabel_ms := C.struct_miqt_string{} categoryLabel_ms.data = C.CString(categoryLabel) categoryLabel_ms.len = C.size_t(len(categoryLabel)) defer C.free(unsafe.Pointer(categoryLabel_ms.data)) - return (float64)(C.QCategoryAxis_startValue1(this.h, categoryLabel_ms)) + return (float64)(C.QCategoryAxis_startValueWithCategoryLabel(this.h, categoryLabel_ms)) } // Sender can only be called from a QCategoryAxis that was directly constructed. diff --git a/qt-restricted-extras/charts6/gen_qcategoryaxis.h b/qt-restricted-extras/charts6/gen_qcategoryaxis.h index 96530d56..8bd81862 100644 --- a/qt-restricted-extras/charts6/gen_qcategoryaxis.h +++ b/qt-restricted-extras/charts6/gen_qcategoryaxis.h @@ -59,7 +59,7 @@ void QCategoryAxis_labelsPositionChanged(QCategoryAxis* self, int position); void QCategoryAxis_connect_labelsPositionChanged(QCategoryAxis* self, intptr_t slot); struct miqt_string QCategoryAxis_tr2(const char* s, const char* c); struct miqt_string QCategoryAxis_tr3(const char* s, const char* c, int n); -double QCategoryAxis_startValue1(const QCategoryAxis* self, struct miqt_string categoryLabel); +double QCategoryAxis_startValueWithCategoryLabel(const QCategoryAxis* self, struct miqt_string categoryLabel); bool QCategoryAxis_override_virtual_type(void* self, intptr_t slot); int QCategoryAxis_virtualbase_type(const void* self); bool QCategoryAxis_override_virtual_event(void* self, intptr_t slot); diff --git a/qt-restricted-extras/charts6/gen_qchart.cpp b/qt-restricted-extras/charts6/gen_qchart.cpp index 84cb8e00..f828b928 100644 --- a/qt-restricted-extras/charts6/gen_qchart.cpp +++ b/qt-restricted-extras/charts6/gen_qchart.cpp @@ -1736,15 +1736,15 @@ void QChart_setAxisY2(QChart* self, QAbstractAxis* axis, QAbstractSeries* series self->setAxisY(axis, series); } -QAbstractAxis* QChart_axisX1(const QChart* self, QAbstractSeries* series) { +QAbstractAxis* QChart_axisXWithSeries(const QChart* self, QAbstractSeries* series) { return self->axisX(series); } -QAbstractAxis* QChart_axisY1(const QChart* self, QAbstractSeries* series) { +QAbstractAxis* QChart_axisYWithSeries(const QChart* self, QAbstractSeries* series) { return self->axisY(series); } -struct miqt_array /* of QAbstractAxis* */ QChart_axes1(const QChart* self, int orientation) { +struct miqt_array /* of QAbstractAxis* */ QChart_axesWithOrientation(const QChart* self, int orientation) { QList _ret = self->axes(static_cast(orientation)); // Convert QList<> from C++ memory to manually-managed C memory QAbstractAxis** _arr = static_cast(malloc(sizeof(QAbstractAxis*) * _ret.length())); @@ -1770,15 +1770,15 @@ struct miqt_array /* of QAbstractAxis* */ QChart_axes2(const QChart* self, int return _out; } -void QChart_setBackgroundVisible1(QChart* self, bool visible) { +void QChart_setBackgroundVisibleWithVisible(QChart* self, bool visible) { self->setBackgroundVisible(visible); } -void QChart_setDropShadowEnabled1(QChart* self, bool enabled) { +void QChart_setDropShadowEnabledWithEnabled(QChart* self, bool enabled) { self->setDropShadowEnabled(enabled); } -void QChart_setPlotAreaBackgroundVisible1(QChart* self, bool visible) { +void QChart_setPlotAreaBackgroundVisibleWithVisible(QChart* self, bool visible) { self->setPlotAreaBackgroundVisible(visible); } diff --git a/qt-restricted-extras/charts6/gen_qchart.go b/qt-restricted-extras/charts6/gen_qchart.go index 53858397..e972d15d 100644 --- a/qt-restricted-extras/charts6/gen_qchart.go +++ b/qt-restricted-extras/charts6/gen_qchart.go @@ -455,16 +455,16 @@ func (this *QChart) SetAxisY2(axis *QAbstractAxis, series *QAbstractSeries) { C.QChart_setAxisY2(this.h, axis.cPointer(), series.cPointer()) } -func (this *QChart) AxisX1(series *QAbstractSeries) *QAbstractAxis { - return newQAbstractAxis(C.QChart_axisX1(this.h, series.cPointer())) +func (this *QChart) AxisXWithSeries(series *QAbstractSeries) *QAbstractAxis { + return newQAbstractAxis(C.QChart_axisXWithSeries(this.h, series.cPointer())) } -func (this *QChart) AxisY1(series *QAbstractSeries) *QAbstractAxis { - return newQAbstractAxis(C.QChart_axisY1(this.h, series.cPointer())) +func (this *QChart) AxisYWithSeries(series *QAbstractSeries) *QAbstractAxis { + return newQAbstractAxis(C.QChart_axisYWithSeries(this.h, series.cPointer())) } -func (this *QChart) Axes1(orientation qt6.Orientation) []*QAbstractAxis { - var _ma C.struct_miqt_array = C.QChart_axes1(this.h, (C.int)(orientation)) +func (this *QChart) AxesWithOrientation(orientation qt6.Orientation) []*QAbstractAxis { + var _ma C.struct_miqt_array = C.QChart_axesWithOrientation(this.h, (C.int)(orientation)) _ret := make([]*QAbstractAxis, int(_ma.len)) _outCast := (*[0xffff]*C.QAbstractAxis)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -483,16 +483,16 @@ func (this *QChart) Axes2(orientation qt6.Orientation, series *QAbstractSeries) return _ret } -func (this *QChart) SetBackgroundVisible1(visible bool) { - C.QChart_setBackgroundVisible1(this.h, (C.bool)(visible)) +func (this *QChart) SetBackgroundVisibleWithVisible(visible bool) { + C.QChart_setBackgroundVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QChart) SetDropShadowEnabled1(enabled bool) { - C.QChart_setDropShadowEnabled1(this.h, (C.bool)(enabled)) +func (this *QChart) SetDropShadowEnabledWithEnabled(enabled bool) { + C.QChart_setDropShadowEnabledWithEnabled(this.h, (C.bool)(enabled)) } -func (this *QChart) SetPlotAreaBackgroundVisible1(visible bool) { - C.QChart_setPlotAreaBackgroundVisible1(this.h, (C.bool)(visible)) +func (this *QChart) SetPlotAreaBackgroundVisibleWithVisible(visible bool) { + C.QChart_setPlotAreaBackgroundVisibleWithVisible(this.h, (C.bool)(visible)) } func (this *QChart) MapToValue2(position *qt6.QPointF, series *QAbstractSeries) *qt6.QPointF { diff --git a/qt-restricted-extras/charts6/gen_qchart.h b/qt-restricted-extras/charts6/gen_qchart.h index 90d77f44..319376d7 100644 --- a/qt-restricted-extras/charts6/gen_qchart.h +++ b/qt-restricted-extras/charts6/gen_qchart.h @@ -176,13 +176,13 @@ struct miqt_string QChart_tr2(const char* s, const char* c); struct miqt_string QChart_tr3(const char* s, const char* c, int n); void QChart_setAxisX2(QChart* self, QAbstractAxis* axis, QAbstractSeries* series); void QChart_setAxisY2(QChart* self, QAbstractAxis* axis, QAbstractSeries* series); -QAbstractAxis* QChart_axisX1(const QChart* self, QAbstractSeries* series); -QAbstractAxis* QChart_axisY1(const QChart* self, QAbstractSeries* series); -struct miqt_array /* of QAbstractAxis* */ QChart_axes1(const QChart* self, int orientation); +QAbstractAxis* QChart_axisXWithSeries(const QChart* self, QAbstractSeries* series); +QAbstractAxis* QChart_axisYWithSeries(const QChart* self, QAbstractSeries* series); +struct miqt_array /* of QAbstractAxis* */ QChart_axesWithOrientation(const QChart* self, int orientation); struct miqt_array /* of QAbstractAxis* */ QChart_axes2(const QChart* self, int orientation, QAbstractSeries* series); -void QChart_setBackgroundVisible1(QChart* self, bool visible); -void QChart_setDropShadowEnabled1(QChart* self, bool enabled); -void QChart_setPlotAreaBackgroundVisible1(QChart* self, bool visible); +void QChart_setBackgroundVisibleWithVisible(QChart* self, bool visible); +void QChart_setDropShadowEnabledWithEnabled(QChart* self, bool enabled); +void QChart_setPlotAreaBackgroundVisibleWithVisible(QChart* self, bool visible); QPointF* QChart_mapToValue2(QChart* self, QPointF* position, QAbstractSeries* series); QPointF* QChart_mapToPosition2(QChart* self, QPointF* value, QAbstractSeries* series); bool QChart_override_virtual_setGeometry(void* self, intptr_t slot); diff --git a/qt-restricted-extras/charts6/gen_qlegend.cpp b/qt-restricted-extras/charts6/gen_qlegend.cpp index b9a21771..d246a11f 100644 --- a/qt-restricted-extras/charts6/gen_qlegend.cpp +++ b/qt-restricted-extras/charts6/gen_qlegend.cpp @@ -333,11 +333,11 @@ struct miqt_string QLegend_tr3(const char* s, const char* c, int n) { return _ms; } -void QLegend_setBackgroundVisible1(QLegend* self, bool visible) { +void QLegend_setBackgroundVisibleWithVisible(QLegend* self, bool visible) { self->setBackgroundVisible(visible); } -struct miqt_array /* of QLegendMarker* */ QLegend_markers1(const QLegend* self, QAbstractSeries* series) { +struct miqt_array /* of QLegendMarker* */ QLegend_markersWithSeries(const QLegend* self, QAbstractSeries* series) { QList _ret = self->markers(series); // Convert QList<> from C++ memory to manually-managed C memory QLegendMarker** _arr = static_cast(malloc(sizeof(QLegendMarker*) * _ret.length())); @@ -350,7 +350,7 @@ struct miqt_array /* of QLegendMarker* */ QLegend_markers1(const QLegend* self, return _out; } -void QLegend_setReverseMarkers1(QLegend* self, bool reverseMarkers) { +void QLegend_setReverseMarkersWithReverseMarkers(QLegend* self, bool reverseMarkers) { self->setReverseMarkers(reverseMarkers); } diff --git a/qt-restricted-extras/charts6/gen_qlegend.go b/qt-restricted-extras/charts6/gen_qlegend.go index 42e82f0f..276ac8b8 100644 --- a/qt-restricted-extras/charts6/gen_qlegend.go +++ b/qt-restricted-extras/charts6/gen_qlegend.go @@ -457,12 +457,12 @@ func QLegend_Tr3(s string, c string, n int) string { return _ret } -func (this *QLegend) SetBackgroundVisible1(visible bool) { - C.QLegend_setBackgroundVisible1(this.h, (C.bool)(visible)) +func (this *QLegend) SetBackgroundVisibleWithVisible(visible bool) { + C.QLegend_setBackgroundVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QLegend) Markers1(series *QAbstractSeries) []*QLegendMarker { - var _ma C.struct_miqt_array = C.QLegend_markers1(this.h, series.cPointer()) +func (this *QLegend) MarkersWithSeries(series *QAbstractSeries) []*QLegendMarker { + var _ma C.struct_miqt_array = C.QLegend_markersWithSeries(this.h, series.cPointer()) _ret := make([]*QLegendMarker, int(_ma.len)) _outCast := (*[0xffff]*C.QLegendMarker)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -471,8 +471,8 @@ func (this *QLegend) Markers1(series *QAbstractSeries) []*QLegendMarker { return _ret } -func (this *QLegend) SetReverseMarkers1(reverseMarkers bool) { - C.QLegend_setReverseMarkers1(this.h, (C.bool)(reverseMarkers)) +func (this *QLegend) SetReverseMarkersWithReverseMarkers(reverseMarkers bool) { + C.QLegend_setReverseMarkersWithReverseMarkers(this.h, (C.bool)(reverseMarkers)) } // Delete this object from C++ memory. diff --git a/qt-restricted-extras/charts6/gen_qlegend.h b/qt-restricted-extras/charts6/gen_qlegend.h index dea16721..b1855a78 100644 --- a/qt-restricted-extras/charts6/gen_qlegend.h +++ b/qt-restricted-extras/charts6/gen_qlegend.h @@ -115,9 +115,9 @@ void QLegend_interactiveChanged(QLegend* self, bool interactive); void QLegend_connect_interactiveChanged(QLegend* self, intptr_t slot); struct miqt_string QLegend_tr2(const char* s, const char* c); struct miqt_string QLegend_tr3(const char* s, const char* c, int n); -void QLegend_setBackgroundVisible1(QLegend* self, bool visible); -struct miqt_array /* of QLegendMarker* */ QLegend_markers1(const QLegend* self, QAbstractSeries* series); -void QLegend_setReverseMarkers1(QLegend* self, bool reverseMarkers); +void QLegend_setBackgroundVisibleWithVisible(QLegend* self, bool visible); +struct miqt_array /* of QLegendMarker* */ QLegend_markersWithSeries(const QLegend* self, QAbstractSeries* series); +void QLegend_setReverseMarkersWithReverseMarkers(QLegend* self, bool reverseMarkers); void QLegend_delete(QLegend* self); #ifdef __cplusplus diff --git a/qt-restricted-extras/charts6/gen_qpieseries.cpp b/qt-restricted-extras/charts6/gen_qpieseries.cpp index 8816b2a9..42389ad8 100644 --- a/qt-restricted-extras/charts6/gen_qpieseries.cpp +++ b/qt-restricted-extras/charts6/gen_qpieseries.cpp @@ -522,7 +522,7 @@ struct miqt_string QPieSeries_tr3(const char* s, const char* c, int n) { return _ms; } -void QPieSeries_setLabelsVisible1(QPieSeries* self, bool visible) { +void QPieSeries_setLabelsVisibleWithVisible(QPieSeries* self, bool visible) { self->setLabelsVisible(visible); } diff --git a/qt-restricted-extras/charts6/gen_qpieseries.go b/qt-restricted-extras/charts6/gen_qpieseries.go index b93bd9ca..b632d940 100644 --- a/qt-restricted-extras/charts6/gen_qpieseries.go +++ b/qt-restricted-extras/charts6/gen_qpieseries.go @@ -428,8 +428,8 @@ func QPieSeries_Tr3(s string, c string, n int) string { return _ret } -func (this *QPieSeries) SetLabelsVisible1(visible bool) { - C.QPieSeries_setLabelsVisible1(this.h, (C.bool)(visible)) +func (this *QPieSeries) SetLabelsVisibleWithVisible(visible bool) { + C.QPieSeries_setLabelsVisibleWithVisible(this.h, (C.bool)(visible)) } // Sender can only be called from a QPieSeries that was directly constructed. diff --git a/qt-restricted-extras/charts6/gen_qpieseries.h b/qt-restricted-extras/charts6/gen_qpieseries.h index a68074fd..6783d6fc 100644 --- a/qt-restricted-extras/charts6/gen_qpieseries.h +++ b/qt-restricted-extras/charts6/gen_qpieseries.h @@ -89,7 +89,7 @@ void QPieSeries_sumChanged(QPieSeries* self); void QPieSeries_connect_sumChanged(QPieSeries* self, intptr_t slot); struct miqt_string QPieSeries_tr2(const char* s, const char* c); struct miqt_string QPieSeries_tr3(const char* s, const char* c, int n); -void QPieSeries_setLabelsVisible1(QPieSeries* self, bool visible); +void QPieSeries_setLabelsVisibleWithVisible(QPieSeries* self, bool visible); bool QPieSeries_override_virtual_type(void* self, intptr_t slot); int QPieSeries_virtualbase_type(const void* self); bool QPieSeries_override_virtual_event(void* self, intptr_t slot); diff --git a/qt-restricted-extras/charts6/gen_qpieslice.cpp b/qt-restricted-extras/charts6/gen_qpieslice.cpp index 44c17bf0..c2c35073 100644 --- a/qt-restricted-extras/charts6/gen_qpieslice.cpp +++ b/qt-restricted-extras/charts6/gen_qpieslice.cpp @@ -608,11 +608,11 @@ struct miqt_string QPieSlice_tr3(const char* s, const char* c, int n) { return _ms; } -void QPieSlice_setLabelVisible1(QPieSlice* self, bool visible) { +void QPieSlice_setLabelVisibleWithVisible(QPieSlice* self, bool visible) { self->setLabelVisible(visible); } -void QPieSlice_setExploded1(QPieSlice* self, bool exploded) { +void QPieSlice_setExplodedWithExploded(QPieSlice* self, bool exploded) { self->setExploded(exploded); } diff --git a/qt-restricted-extras/charts6/gen_qpieslice.go b/qt-restricted-extras/charts6/gen_qpieslice.go index a69e2a78..53e95380 100644 --- a/qt-restricted-extras/charts6/gen_qpieslice.go +++ b/qt-restricted-extras/charts6/gen_qpieslice.go @@ -616,12 +616,12 @@ func QPieSlice_Tr3(s string, c string, n int) string { return _ret } -func (this *QPieSlice) SetLabelVisible1(visible bool) { - C.QPieSlice_setLabelVisible1(this.h, (C.bool)(visible)) +func (this *QPieSlice) SetLabelVisibleWithVisible(visible bool) { + C.QPieSlice_setLabelVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QPieSlice) SetExploded1(exploded bool) { - C.QPieSlice_setExploded1(this.h, (C.bool)(exploded)) +func (this *QPieSlice) SetExplodedWithExploded(exploded bool) { + C.QPieSlice_setExplodedWithExploded(this.h, (C.bool)(exploded)) } // Sender can only be called from a QPieSlice that was directly constructed. diff --git a/qt-restricted-extras/charts6/gen_qpieslice.h b/qt-restricted-extras/charts6/gen_qpieslice.h index 7807c0e5..e46cfba1 100644 --- a/qt-restricted-extras/charts6/gen_qpieslice.h +++ b/qt-restricted-extras/charts6/gen_qpieslice.h @@ -124,8 +124,8 @@ void QPieSlice_labelColorChanged(QPieSlice* self); void QPieSlice_connect_labelColorChanged(QPieSlice* self, intptr_t slot); struct miqt_string QPieSlice_tr2(const char* s, const char* c); struct miqt_string QPieSlice_tr3(const char* s, const char* c, int n); -void QPieSlice_setLabelVisible1(QPieSlice* self, bool visible); -void QPieSlice_setExploded1(QPieSlice* self, bool exploded); +void QPieSlice_setLabelVisibleWithVisible(QPieSlice* self, bool visible); +void QPieSlice_setExplodedWithExploded(QPieSlice* self, bool exploded); bool QPieSlice_override_virtual_event(void* self, intptr_t slot); bool QPieSlice_virtualbase_event(void* self, QEvent* event); bool QPieSlice_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt-restricted-extras/charts6/gen_qpolarchart.cpp b/qt-restricted-extras/charts6/gen_qpolarchart.cpp index a0180150..33b62d38 100644 --- a/qt-restricted-extras/charts6/gen_qpolarchart.cpp +++ b/qt-restricted-extras/charts6/gen_qpolarchart.cpp @@ -1456,7 +1456,7 @@ struct miqt_string QPolarChart_tr3(const char* s, const char* c, int n) { return _ms; } -struct miqt_array /* of QAbstractAxis* */ QPolarChart_axes1(const QPolarChart* self, int polarOrientation) { +struct miqt_array /* of QAbstractAxis* */ QPolarChart_axesWithPolarOrientation(const QPolarChart* self, int polarOrientation) { QList _ret = self->axes(static_cast(polarOrientation)); // Convert QList<> from C++ memory to manually-managed C memory QAbstractAxis** _arr = static_cast(malloc(sizeof(QAbstractAxis*) * _ret.length())); diff --git a/qt-restricted-extras/charts6/gen_qpolarchart.go b/qt-restricted-extras/charts6/gen_qpolarchart.go index a15463d6..480aeeb9 100644 --- a/qt-restricted-extras/charts6/gen_qpolarchart.go +++ b/qt-restricted-extras/charts6/gen_qpolarchart.go @@ -135,8 +135,8 @@ func QPolarChart_Tr3(s string, c string, n int) string { return _ret } -func (this *QPolarChart) Axes1(polarOrientation QPolarChart__PolarOrientation) []*QAbstractAxis { - var _ma C.struct_miqt_array = C.QPolarChart_axes1(this.h, (C.int)(polarOrientation)) +func (this *QPolarChart) AxesWithPolarOrientation(polarOrientation QPolarChart__PolarOrientation) []*QAbstractAxis { + var _ma C.struct_miqt_array = C.QPolarChart_axesWithPolarOrientation(this.h, (C.int)(polarOrientation)) _ret := make([]*QAbstractAxis, int(_ma.len)) _outCast := (*[0xffff]*C.QAbstractAxis)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt-restricted-extras/charts6/gen_qpolarchart.h b/qt-restricted-extras/charts6/gen_qpolarchart.h index 5f7c637a..ea298f26 100644 --- a/qt-restricted-extras/charts6/gen_qpolarchart.h +++ b/qt-restricted-extras/charts6/gen_qpolarchart.h @@ -102,7 +102,7 @@ struct miqt_array /* of QAbstractAxis* */ QPolarChart_axes(const QPolarChart* s int QPolarChart_axisPolarOrientation(QAbstractAxis* axis); struct miqt_string QPolarChart_tr2(const char* s, const char* c); struct miqt_string QPolarChart_tr3(const char* s, const char* c, int n); -struct miqt_array /* of QAbstractAxis* */ QPolarChart_axes1(const QPolarChart* self, int polarOrientation); +struct miqt_array /* of QAbstractAxis* */ QPolarChart_axesWithPolarOrientation(const QPolarChart* self, int polarOrientation); struct miqt_array /* of QAbstractAxis* */ QPolarChart_axes2(const QPolarChart* self, int polarOrientation, QAbstractSeries* series); bool QPolarChart_override_virtual_setGeometry(void* self, intptr_t slot); void QPolarChart_virtualbase_setGeometry(void* self, QRectF* rect); diff --git a/qt-restricted-extras/charts6/gen_qxyseries.cpp b/qt-restricted-extras/charts6/gen_qxyseries.cpp index e858c61e..bf311619 100644 --- a/qt-restricted-extras/charts6/gen_qxyseries.cpp +++ b/qt-restricted-extras/charts6/gen_qxyseries.cpp @@ -2,10 +2,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -928,19 +928,19 @@ struct miqt_string QXYSeries_tr3(const char* s, const char* c, int n) { return _ms; } -void QXYSeries_setPointsVisible1(QXYSeries* self, bool visible) { +void QXYSeries_setPointsVisibleWithVisible(QXYSeries* self, bool visible) { self->setPointsVisible(visible); } -void QXYSeries_setPointLabelsVisible1(QXYSeries* self, bool visible) { +void QXYSeries_setPointLabelsVisibleWithVisible(QXYSeries* self, bool visible) { self->setPointLabelsVisible(visible); } -void QXYSeries_setPointLabelsClipping1(QXYSeries* self, bool enabled) { +void QXYSeries_setPointLabelsClippingWithEnabled(QXYSeries* self, bool enabled) { self->setPointLabelsClipping(enabled); } -void QXYSeries_setBestFitLineVisible1(QXYSeries* self, bool visible) { +void QXYSeries_setBestFitLineVisibleWithVisible(QXYSeries* self, bool visible) { self->setBestFitLineVisible(visible); } diff --git a/qt-restricted-extras/charts6/gen_qxyseries.go b/qt-restricted-extras/charts6/gen_qxyseries.go index 211947d4..b91efc8d 100644 --- a/qt-restricted-extras/charts6/gen_qxyseries.go +++ b/qt-restricted-extras/charts6/gen_qxyseries.go @@ -1166,20 +1166,20 @@ func QXYSeries_Tr3(s string, c string, n int) string { return _ret } -func (this *QXYSeries) SetPointsVisible1(visible bool) { - C.QXYSeries_setPointsVisible1(this.h, (C.bool)(visible)) +func (this *QXYSeries) SetPointsVisibleWithVisible(visible bool) { + C.QXYSeries_setPointsVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QXYSeries) SetPointLabelsVisible1(visible bool) { - C.QXYSeries_setPointLabelsVisible1(this.h, (C.bool)(visible)) +func (this *QXYSeries) SetPointLabelsVisibleWithVisible(visible bool) { + C.QXYSeries_setPointLabelsVisibleWithVisible(this.h, (C.bool)(visible)) } -func (this *QXYSeries) SetPointLabelsClipping1(enabled bool) { - C.QXYSeries_setPointLabelsClipping1(this.h, (C.bool)(enabled)) +func (this *QXYSeries) SetPointLabelsClippingWithEnabled(enabled bool) { + C.QXYSeries_setPointLabelsClippingWithEnabled(this.h, (C.bool)(enabled)) } -func (this *QXYSeries) SetBestFitLineVisible1(visible bool) { - C.QXYSeries_setBestFitLineVisible1(this.h, (C.bool)(visible)) +func (this *QXYSeries) SetBestFitLineVisibleWithVisible(visible bool) { + C.QXYSeries_setBestFitLineVisibleWithVisible(this.h, (C.bool)(visible)) } func (this *QXYSeries) ColorBy2(sourceData []float64, gradient *qt6.QLinearGradient) { diff --git a/qt-restricted-extras/charts6/gen_qxyseries.h b/qt-restricted-extras/charts6/gen_qxyseries.h index 53e3459b..acfb71d2 100644 --- a/qt-restricted-extras/charts6/gen_qxyseries.h +++ b/qt-restricted-extras/charts6/gen_qxyseries.h @@ -176,10 +176,10 @@ void QXYSeries_markerSizeChanged(QXYSeries* self, double size); void QXYSeries_connect_markerSizeChanged(QXYSeries* self, intptr_t slot); struct miqt_string QXYSeries_tr2(const char* s, const char* c); struct miqt_string QXYSeries_tr3(const char* s, const char* c, int n); -void QXYSeries_setPointsVisible1(QXYSeries* self, bool visible); -void QXYSeries_setPointLabelsVisible1(QXYSeries* self, bool visible); -void QXYSeries_setPointLabelsClipping1(QXYSeries* self, bool enabled); -void QXYSeries_setBestFitLineVisible1(QXYSeries* self, bool visible); +void QXYSeries_setPointsVisibleWithVisible(QXYSeries* self, bool visible); +void QXYSeries_setPointLabelsVisibleWithVisible(QXYSeries* self, bool visible); +void QXYSeries_setPointLabelsClippingWithEnabled(QXYSeries* self, bool enabled); +void QXYSeries_setBestFitLineVisibleWithVisible(QXYSeries* self, bool visible); void QXYSeries_colorBy2(QXYSeries* self, struct miqt_array /* of double */ sourceData, QLinearGradient* gradient); void QXYSeries_delete(QXYSeries* self); diff --git a/qt-restricted-extras/qscintilla/gen_qsciapis.cpp b/qt-restricted-extras/qscintilla/gen_qsciapis.cpp index 2200c377..ea2ebac3 100644 --- a/qt-restricted-extras/qscintilla/gen_qsciapis.cpp +++ b/qt-restricted-extras/qscintilla/gen_qsciapis.cpp @@ -556,17 +556,17 @@ struct miqt_string QsciAPIs_trUtf83(const char* s, const char* c, int n) { return _ms; } -bool QsciAPIs_isPrepared1(const QsciAPIs* self, struct miqt_string filename) { +bool QsciAPIs_isPreparedWithFilename(const QsciAPIs* self, struct miqt_string filename) { QString filename_QString = QString::fromUtf8(filename.data, filename.len); return self->isPrepared(filename_QString); } -bool QsciAPIs_loadPrepared1(QsciAPIs* self, struct miqt_string filename) { +bool QsciAPIs_loadPreparedWithFilename(QsciAPIs* self, struct miqt_string filename) { QString filename_QString = QString::fromUtf8(filename.data, filename.len); return self->loadPrepared(filename_QString); } -bool QsciAPIs_savePrepared1(const QsciAPIs* self, struct miqt_string filename) { +bool QsciAPIs_savePreparedWithFilename(const QsciAPIs* self, struct miqt_string filename) { QString filename_QString = QString::fromUtf8(filename.data, filename.len); return self->savePrepared(filename_QString); } diff --git a/qt-restricted-extras/qscintilla/gen_qsciapis.go b/qt-restricted-extras/qscintilla/gen_qsciapis.go index b60c0c8d..93f301ba 100644 --- a/qt-restricted-extras/qscintilla/gen_qsciapis.go +++ b/qt-restricted-extras/qscintilla/gen_qsciapis.go @@ -313,28 +313,28 @@ func QsciAPIs_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QsciAPIs) IsPrepared1(filename string) bool { +func (this *QsciAPIs) IsPreparedWithFilename(filename string) bool { 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.QsciAPIs_isPrepared1(this.h, filename_ms)) + return (bool)(C.QsciAPIs_isPreparedWithFilename(this.h, filename_ms)) } -func (this *QsciAPIs) LoadPrepared1(filename string) bool { +func (this *QsciAPIs) LoadPreparedWithFilename(filename string) bool { 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.QsciAPIs_loadPrepared1(this.h, filename_ms)) + return (bool)(C.QsciAPIs_loadPreparedWithFilename(this.h, filename_ms)) } -func (this *QsciAPIs) SavePrepared1(filename string) bool { +func (this *QsciAPIs) SavePreparedWithFilename(filename string) bool { 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.QsciAPIs_savePrepared1(this.h, filename_ms)) + return (bool)(C.QsciAPIs_savePreparedWithFilename(this.h, filename_ms)) } // Sender can only be called from a QsciAPIs that was directly constructed. diff --git a/qt-restricted-extras/qscintilla/gen_qsciapis.h b/qt-restricted-extras/qscintilla/gen_qsciapis.h index adfe5fdf..76601b76 100644 --- a/qt-restricted-extras/qscintilla/gen_qsciapis.h +++ b/qt-restricted-extras/qscintilla/gen_qsciapis.h @@ -67,9 +67,9 @@ struct miqt_string QsciAPIs_tr2(const char* s, const char* c); struct miqt_string QsciAPIs_tr3(const char* s, const char* c, int n); struct miqt_string QsciAPIs_trUtf82(const char* s, const char* c); struct miqt_string QsciAPIs_trUtf83(const char* s, const char* c, int n); -bool QsciAPIs_isPrepared1(const QsciAPIs* self, struct miqt_string filename); -bool QsciAPIs_loadPrepared1(QsciAPIs* self, struct miqt_string filename); -bool QsciAPIs_savePrepared1(const QsciAPIs* self, struct miqt_string filename); +bool QsciAPIs_isPreparedWithFilename(const QsciAPIs* self, struct miqt_string filename); +bool QsciAPIs_loadPreparedWithFilename(QsciAPIs* self, struct miqt_string filename); +bool QsciAPIs_savePreparedWithFilename(const QsciAPIs* self, struct miqt_string filename); bool QsciAPIs_override_virtual_updateAutoCompletionList(void* self, intptr_t slot); void QsciAPIs_virtualbase_updateAutoCompletionList(void* self, struct miqt_array /* of struct miqt_string */ context, struct miqt_array /* of struct miqt_string */ list); bool QsciAPIs_override_virtual_autoCompletionSelected(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.cpp b/qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.cpp index 30d004f1..732f04ce 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.cpp +++ b/qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.cpp @@ -1057,15 +1057,15 @@ struct miqt_string QsciLexerCoffeeScript_trUtf83(const char* s, const char* c, i return _ms; } -const char* QsciLexerCoffeeScript_blockEnd1(const QsciLexerCoffeeScript* self, int* style) { +const char* QsciLexerCoffeeScript_blockEndWithStyle(const QsciLexerCoffeeScript* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerCoffeeScript_blockStart1(const QsciLexerCoffeeScript* self, int* style) { +const char* QsciLexerCoffeeScript_blockStartWithStyle(const QsciLexerCoffeeScript* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } -const char* QsciLexerCoffeeScript_blockStartKeyword1(const QsciLexerCoffeeScript* self, int* style) { +const char* QsciLexerCoffeeScript_blockStartKeywordWithStyle(const QsciLexerCoffeeScript* self, int* style) { return (const char*) self->blockStartKeyword(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.go b/qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.go index 5c1b00a1..af88930f 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.go +++ b/qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.go @@ -281,18 +281,18 @@ func QsciLexerCoffeeScript_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QsciLexerCoffeeScript) BlockEnd1(style *int) string { - _ret := C.QsciLexerCoffeeScript_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCoffeeScript) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerCoffeeScript_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerCoffeeScript) BlockStart1(style *int) string { - _ret := C.QsciLexerCoffeeScript_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCoffeeScript) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerCoffeeScript_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerCoffeeScript) BlockStartKeyword1(style *int) string { - _ret := C.QsciLexerCoffeeScript_blockStartKeyword1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCoffeeScript) BlockStartKeywordWithStyle(style *int) string { + _ret := C.QsciLexerCoffeeScript_blockStartKeywordWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.h b/qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.h index 93667b7b..f11b2009 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.h +++ b/qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.h @@ -76,9 +76,9 @@ struct miqt_string QsciLexerCoffeeScript_tr2(const char* s, const char* c); struct miqt_string QsciLexerCoffeeScript_tr3(const char* s, const char* c, int n); struct miqt_string QsciLexerCoffeeScript_trUtf82(const char* s, const char* c); struct miqt_string QsciLexerCoffeeScript_trUtf83(const char* s, const char* c, int n); -const char* QsciLexerCoffeeScript_blockEnd1(const QsciLexerCoffeeScript* self, int* style); -const char* QsciLexerCoffeeScript_blockStart1(const QsciLexerCoffeeScript* self, int* style); -const char* QsciLexerCoffeeScript_blockStartKeyword1(const QsciLexerCoffeeScript* self, int* style); +const char* QsciLexerCoffeeScript_blockEndWithStyle(const QsciLexerCoffeeScript* self, int* style); +const char* QsciLexerCoffeeScript_blockStartWithStyle(const QsciLexerCoffeeScript* self, int* style); +const char* QsciLexerCoffeeScript_blockStartKeywordWithStyle(const QsciLexerCoffeeScript* self, int* style); bool QsciLexerCoffeeScript_override_virtual_language(void* self, intptr_t slot); const char* QsciLexerCoffeeScript_virtualbase_language(const void* self); bool QsciLexerCoffeeScript_override_virtual_lexer(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla/gen_qscilexercpp.cpp b/qt-restricted-extras/qscintilla/gen_qscilexercpp.cpp index c333c4bf..540dec57 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexercpp.cpp +++ b/qt-restricted-extras/qscintilla/gen_qscilexercpp.cpp @@ -1218,15 +1218,15 @@ struct miqt_string QsciLexerCPP_trUtf83(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerCPP_blockEnd1(const QsciLexerCPP* self, int* style) { +const char* QsciLexerCPP_blockEndWithStyle(const QsciLexerCPP* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerCPP_blockStart1(const QsciLexerCPP* self, int* style) { +const char* QsciLexerCPP_blockStartWithStyle(const QsciLexerCPP* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } -const char* QsciLexerCPP_blockStartKeyword1(const QsciLexerCPP* self, int* style) { +const char* QsciLexerCPP_blockStartKeywordWithStyle(const QsciLexerCPP* self, int* style) { return (const char*) self->blockStartKeyword(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexercpp.go b/qt-restricted-extras/qscintilla/gen_qscilexercpp.go index 5a3fc51d..5410f48b 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexercpp.go +++ b/qt-restricted-extras/qscintilla/gen_qscilexercpp.go @@ -375,18 +375,18 @@ func QsciLexerCPP_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QsciLexerCPP) BlockEnd1(style *int) string { - _ret := C.QsciLexerCPP_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCPP) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerCPP_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerCPP) BlockStart1(style *int) string { - _ret := C.QsciLexerCPP_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCPP) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerCPP_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerCPP) BlockStartKeyword1(style *int) string { - _ret := C.QsciLexerCPP_blockStartKeyword1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCPP) BlockStartKeywordWithStyle(style *int) string { + _ret := C.QsciLexerCPP_blockStartKeywordWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexercpp.h b/qt-restricted-extras/qscintilla/gen_qscilexercpp.h index ad07b52f..d463faf5 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexercpp.h +++ b/qt-restricted-extras/qscintilla/gen_qscilexercpp.h @@ -91,9 +91,9 @@ struct miqt_string QsciLexerCPP_tr2(const char* s, const char* c); struct miqt_string QsciLexerCPP_tr3(const char* s, const char* c, int n); struct miqt_string QsciLexerCPP_trUtf82(const char* s, const char* c); struct miqt_string QsciLexerCPP_trUtf83(const char* s, const char* c, int n); -const char* QsciLexerCPP_blockEnd1(const QsciLexerCPP* self, int* style); -const char* QsciLexerCPP_blockStart1(const QsciLexerCPP* self, int* style); -const char* QsciLexerCPP_blockStartKeyword1(const QsciLexerCPP* self, int* style); +const char* QsciLexerCPP_blockEndWithStyle(const QsciLexerCPP* self, int* style); +const char* QsciLexerCPP_blockStartWithStyle(const QsciLexerCPP* self, int* style); +const char* QsciLexerCPP_blockStartKeywordWithStyle(const QsciLexerCPP* self, int* style); bool QsciLexerCPP_override_virtual_setFoldAtElse(void* self, intptr_t slot); void QsciLexerCPP_virtualbase_setFoldAtElse(void* self, bool fold); bool QsciLexerCPP_override_virtual_setFoldComments(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla/gen_qscilexercss.cpp b/qt-restricted-extras/qscintilla/gen_qscilexercss.cpp index da453b2e..dabb1dfd 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexercss.cpp +++ b/qt-restricted-extras/qscintilla/gen_qscilexercss.cpp @@ -1069,11 +1069,11 @@ struct miqt_string QsciLexerCSS_trUtf83(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerCSS_blockEnd1(const QsciLexerCSS* self, int* style) { +const char* QsciLexerCSS_blockEndWithStyle(const QsciLexerCSS* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerCSS_blockStart1(const QsciLexerCSS* self, int* style) { +const char* QsciLexerCSS_blockStartWithStyle(const QsciLexerCSS* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexercss.go b/qt-restricted-extras/qscintilla/gen_qscilexercss.go index d6c4f69a..57380ab2 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexercss.go +++ b/qt-restricted-extras/qscintilla/gen_qscilexercss.go @@ -257,13 +257,13 @@ func QsciLexerCSS_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QsciLexerCSS) BlockEnd1(style *int) string { - _ret := C.QsciLexerCSS_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCSS) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerCSS_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerCSS) BlockStart1(style *int) string { - _ret := C.QsciLexerCSS_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCSS) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerCSS_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexercss.h b/qt-restricted-extras/qscintilla/gen_qscilexercss.h index d2f085c8..7398a375 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexercss.h +++ b/qt-restricted-extras/qscintilla/gen_qscilexercss.h @@ -73,8 +73,8 @@ struct miqt_string QsciLexerCSS_tr2(const char* s, const char* c); struct miqt_string QsciLexerCSS_tr3(const char* s, const char* c, int n); struct miqt_string QsciLexerCSS_trUtf82(const char* s, const char* c); struct miqt_string QsciLexerCSS_trUtf83(const char* s, const char* c, int n); -const char* QsciLexerCSS_blockEnd1(const QsciLexerCSS* self, int* style); -const char* QsciLexerCSS_blockStart1(const QsciLexerCSS* self, int* style); +const char* QsciLexerCSS_blockEndWithStyle(const QsciLexerCSS* self, int* style); +const char* QsciLexerCSS_blockStartWithStyle(const QsciLexerCSS* self, int* style); bool QsciLexerCSS_override_virtual_setFoldComments(void* self, intptr_t slot); void QsciLexerCSS_virtualbase_setFoldComments(void* self, bool fold); bool QsciLexerCSS_override_virtual_setFoldCompact(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerd.cpp b/qt-restricted-extras/qscintilla/gen_qscilexerd.cpp index e6c1e48e..c115faa7 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerd.cpp +++ b/qt-restricted-extras/qscintilla/gen_qscilexerd.cpp @@ -1109,15 +1109,15 @@ struct miqt_string QsciLexerD_trUtf83(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerD_blockEnd1(const QsciLexerD* self, int* style) { +const char* QsciLexerD_blockEndWithStyle(const QsciLexerD* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerD_blockStart1(const QsciLexerD* self, int* style) { +const char* QsciLexerD_blockStartWithStyle(const QsciLexerD* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } -const char* QsciLexerD_blockStartKeyword1(const QsciLexerD* self, int* style) { +const char* QsciLexerD_blockStartKeywordWithStyle(const QsciLexerD* self, int* style) { return (const char*) self->blockStartKeyword(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerd.go b/qt-restricted-extras/qscintilla/gen_qscilexerd.go index f4f16cc1..52d08d18 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerd.go +++ b/qt-restricted-extras/qscintilla/gen_qscilexerd.go @@ -272,18 +272,18 @@ func QsciLexerD_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QsciLexerD) BlockEnd1(style *int) string { - _ret := C.QsciLexerD_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerD) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerD_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerD) BlockStart1(style *int) string { - _ret := C.QsciLexerD_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerD) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerD_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerD) BlockStartKeyword1(style *int) string { - _ret := C.QsciLexerD_blockStartKeyword1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerD) BlockStartKeywordWithStyle(style *int) string { + _ret := C.QsciLexerD_blockStartKeywordWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerd.h b/qt-restricted-extras/qscintilla/gen_qscilexerd.h index 3327cfb6..6d3e093a 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerd.h +++ b/qt-restricted-extras/qscintilla/gen_qscilexerd.h @@ -74,9 +74,9 @@ struct miqt_string QsciLexerD_tr2(const char* s, const char* c); struct miqt_string QsciLexerD_tr3(const char* s, const char* c, int n); struct miqt_string QsciLexerD_trUtf82(const char* s, const char* c); struct miqt_string QsciLexerD_trUtf83(const char* s, const char* c, int n); -const char* QsciLexerD_blockEnd1(const QsciLexerD* self, int* style); -const char* QsciLexerD_blockStart1(const QsciLexerD* self, int* style); -const char* QsciLexerD_blockStartKeyword1(const QsciLexerD* self, int* style); +const char* QsciLexerD_blockEndWithStyle(const QsciLexerD* self, int* style); +const char* QsciLexerD_blockStartWithStyle(const QsciLexerD* self, int* style); +const char* QsciLexerD_blockStartKeywordWithStyle(const QsciLexerD* self, int* style); bool QsciLexerD_override_virtual_setFoldAtElse(void* self, intptr_t slot); void QsciLexerD_virtualbase_setFoldAtElse(void* self, bool fold); bool QsciLexerD_override_virtual_setFoldComments(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerlua.cpp b/qt-restricted-extras/qscintilla/gen_qscilexerlua.cpp index 1119d971..dbd18af5 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerlua.cpp +++ b/qt-restricted-extras/qscintilla/gen_qscilexerlua.cpp @@ -1041,7 +1041,7 @@ struct miqt_string QsciLexerLua_trUtf83(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerLua_blockStart1(const QsciLexerLua* self, int* style) { +const char* QsciLexerLua_blockStartWithStyle(const QsciLexerLua* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerlua.go b/qt-restricted-extras/qscintilla/gen_qscilexerlua.go index 1386bfcc..ec83c358 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerlua.go +++ b/qt-restricted-extras/qscintilla/gen_qscilexerlua.go @@ -238,8 +238,8 @@ func QsciLexerLua_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QsciLexerLua) BlockStart1(style *int) string { - _ret := C.QsciLexerLua_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerLua) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerLua_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerlua.h b/qt-restricted-extras/qscintilla/gen_qscilexerlua.h index 5bd76f55..3ddec4cb 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerlua.h +++ b/qt-restricted-extras/qscintilla/gen_qscilexerlua.h @@ -67,7 +67,7 @@ struct miqt_string QsciLexerLua_tr2(const char* s, const char* c); struct miqt_string QsciLexerLua_tr3(const char* s, const char* c, int n); struct miqt_string QsciLexerLua_trUtf82(const char* s, const char* c); struct miqt_string QsciLexerLua_trUtf83(const char* s, const char* c, int n); -const char* QsciLexerLua_blockStart1(const QsciLexerLua* self, int* style); +const char* QsciLexerLua_blockStartWithStyle(const QsciLexerLua* self, int* style); bool QsciLexerLua_override_virtual_setFoldCompact(void* self, intptr_t slot); void QsciLexerLua_virtualbase_setFoldCompact(void* self, bool fold); bool QsciLexerLua_override_virtual_language(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerpascal.cpp b/qt-restricted-extras/qscintilla/gen_qscilexerpascal.cpp index 16a4a018..0ed235ef 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerpascal.cpp +++ b/qt-restricted-extras/qscintilla/gen_qscilexerpascal.cpp @@ -1113,15 +1113,15 @@ struct miqt_string QsciLexerPascal_trUtf83(const char* s, const char* c, int n) return _ms; } -const char* QsciLexerPascal_blockEnd1(const QsciLexerPascal* self, int* style) { +const char* QsciLexerPascal_blockEndWithStyle(const QsciLexerPascal* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerPascal_blockStart1(const QsciLexerPascal* self, int* style) { +const char* QsciLexerPascal_blockStartWithStyle(const QsciLexerPascal* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } -const char* QsciLexerPascal_blockStartKeyword1(const QsciLexerPascal* self, int* style) { +const char* QsciLexerPascal_blockStartKeywordWithStyle(const QsciLexerPascal* self, int* style) { return (const char*) self->blockStartKeyword(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerpascal.go b/qt-restricted-extras/qscintilla/gen_qscilexerpascal.go index 5ef1dd00..a48e5c54 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerpascal.go +++ b/qt-restricted-extras/qscintilla/gen_qscilexerpascal.go @@ -267,18 +267,18 @@ func QsciLexerPascal_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QsciLexerPascal) BlockEnd1(style *int) string { - _ret := C.QsciLexerPascal_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerPascal) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerPascal_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerPascal) BlockStart1(style *int) string { - _ret := C.QsciLexerPascal_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerPascal) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerPascal_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerPascal) BlockStartKeyword1(style *int) string { - _ret := C.QsciLexerPascal_blockStartKeyword1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerPascal) BlockStartKeywordWithStyle(style *int) string { + _ret := C.QsciLexerPascal_blockStartKeywordWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerpascal.h b/qt-restricted-extras/qscintilla/gen_qscilexerpascal.h index e3dee54b..fbbe57ca 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerpascal.h +++ b/qt-restricted-extras/qscintilla/gen_qscilexerpascal.h @@ -75,9 +75,9 @@ struct miqt_string QsciLexerPascal_tr2(const char* s, const char* c); struct miqt_string QsciLexerPascal_tr3(const char* s, const char* c, int n); struct miqt_string QsciLexerPascal_trUtf82(const char* s, const char* c); struct miqt_string QsciLexerPascal_trUtf83(const char* s, const char* c, int n); -const char* QsciLexerPascal_blockEnd1(const QsciLexerPascal* self, int* style); -const char* QsciLexerPascal_blockStart1(const QsciLexerPascal* self, int* style); -const char* QsciLexerPascal_blockStartKeyword1(const QsciLexerPascal* self, int* style); +const char* QsciLexerPascal_blockEndWithStyle(const QsciLexerPascal* self, int* style); +const char* QsciLexerPascal_blockStartWithStyle(const QsciLexerPascal* self, int* style); +const char* QsciLexerPascal_blockStartKeywordWithStyle(const QsciLexerPascal* self, int* style); bool QsciLexerPascal_override_virtual_setFoldComments(void* self, intptr_t slot); void QsciLexerPascal_virtualbase_setFoldComments(void* self, bool fold); bool QsciLexerPascal_override_virtual_setFoldCompact(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerperl.cpp b/qt-restricted-extras/qscintilla/gen_qscilexerperl.cpp index 6686fec7..56692bd0 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerperl.cpp +++ b/qt-restricted-extras/qscintilla/gen_qscilexerperl.cpp @@ -1101,11 +1101,11 @@ struct miqt_string QsciLexerPerl_trUtf83(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerPerl_blockEnd1(const QsciLexerPerl* self, int* style) { +const char* QsciLexerPerl_blockEndWithStyle(const QsciLexerPerl* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerPerl_blockStart1(const QsciLexerPerl* self, int* style) { +const char* QsciLexerPerl_blockStartWithStyle(const QsciLexerPerl* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerperl.go b/qt-restricted-extras/qscintilla/gen_qscilexerperl.go index 11d13b61..98d5ec0a 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerperl.go +++ b/qt-restricted-extras/qscintilla/gen_qscilexerperl.go @@ -301,13 +301,13 @@ func QsciLexerPerl_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QsciLexerPerl) BlockEnd1(style *int) string { - _ret := C.QsciLexerPerl_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerPerl) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerPerl_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerPerl) BlockStart1(style *int) string { - _ret := C.QsciLexerPerl_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerPerl) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerPerl_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerperl.h b/qt-restricted-extras/qscintilla/gen_qscilexerperl.h index 8da04c65..857ca639 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerperl.h +++ b/qt-restricted-extras/qscintilla/gen_qscilexerperl.h @@ -77,8 +77,8 @@ struct miqt_string QsciLexerPerl_tr2(const char* s, const char* c); struct miqt_string QsciLexerPerl_tr3(const char* s, const char* c, int n); struct miqt_string QsciLexerPerl_trUtf82(const char* s, const char* c); struct miqt_string QsciLexerPerl_trUtf83(const char* s, const char* c, int n); -const char* QsciLexerPerl_blockEnd1(const QsciLexerPerl* self, int* style); -const char* QsciLexerPerl_blockStart1(const QsciLexerPerl* self, int* style); +const char* QsciLexerPerl_blockEndWithStyle(const QsciLexerPerl* self, int* style); +const char* QsciLexerPerl_blockStartWithStyle(const QsciLexerPerl* self, int* style); bool QsciLexerPerl_override_virtual_setFoldComments(void* self, intptr_t slot); void QsciLexerPerl_virtualbase_setFoldComments(void* self, bool fold); bool QsciLexerPerl_override_virtual_setFoldCompact(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerpython.cpp b/qt-restricted-extras/qscintilla/gen_qscilexerpython.cpp index b36f8ddb..8b4fd2bf 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerpython.cpp +++ b/qt-restricted-extras/qscintilla/gen_qscilexerpython.cpp @@ -1155,7 +1155,7 @@ struct miqt_string QsciLexerPython_trUtf83(const char* s, const char* c, int n) return _ms; } -const char* QsciLexerPython_blockStart1(const QsciLexerPython* self, int* style) { +const char* QsciLexerPython_blockStartWithStyle(const QsciLexerPython* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerpython.go b/qt-restricted-extras/qscintilla/gen_qscilexerpython.go index e903d057..7542cd49 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerpython.go +++ b/qt-restricted-extras/qscintilla/gen_qscilexerpython.go @@ -320,8 +320,8 @@ func QsciLexerPython_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QsciLexerPython) BlockStart1(style *int) string { - _ret := C.QsciLexerPython_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerPython) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerPython_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerpython.h b/qt-restricted-extras/qscintilla/gen_qscilexerpython.h index 0278a158..a195a9dd 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerpython.h +++ b/qt-restricted-extras/qscintilla/gen_qscilexerpython.h @@ -85,7 +85,7 @@ struct miqt_string QsciLexerPython_tr2(const char* s, const char* c); struct miqt_string QsciLexerPython_tr3(const char* s, const char* c, int n); struct miqt_string QsciLexerPython_trUtf82(const char* s, const char* c); struct miqt_string QsciLexerPython_trUtf83(const char* s, const char* c, int n); -const char* QsciLexerPython_blockStart1(const QsciLexerPython* self, int* style); +const char* QsciLexerPython_blockStartWithStyle(const QsciLexerPython* self, int* style); bool QsciLexerPython_override_virtual_indentationGuideView(void* self, intptr_t slot); int QsciLexerPython_virtualbase_indentationGuideView(const void* self); bool QsciLexerPython_override_virtual_setFoldComments(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerruby.cpp b/qt-restricted-extras/qscintilla/gen_qscilexerruby.cpp index 981dc139..b8ae1997 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerruby.cpp +++ b/qt-restricted-extras/qscintilla/gen_qscilexerruby.cpp @@ -1017,15 +1017,15 @@ struct miqt_string QsciLexerRuby_trUtf83(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerRuby_blockEnd1(const QsciLexerRuby* self, int* style) { +const char* QsciLexerRuby_blockEndWithStyle(const QsciLexerRuby* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerRuby_blockStart1(const QsciLexerRuby* self, int* style) { +const char* QsciLexerRuby_blockStartWithStyle(const QsciLexerRuby* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } -const char* QsciLexerRuby_blockStartKeyword1(const QsciLexerRuby* self, int* style) { +const char* QsciLexerRuby_blockStartKeywordWithStyle(const QsciLexerRuby* self, int* style) { return (const char*) self->blockStartKeyword(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerruby.go b/qt-restricted-extras/qscintilla/gen_qscilexerruby.go index b5c4c1ce..83a54020 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerruby.go +++ b/qt-restricted-extras/qscintilla/gen_qscilexerruby.go @@ -254,18 +254,18 @@ func QsciLexerRuby_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QsciLexerRuby) BlockEnd1(style *int) string { - _ret := C.QsciLexerRuby_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerRuby) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerRuby_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerRuby) BlockStart1(style *int) string { - _ret := C.QsciLexerRuby_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerRuby) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerRuby_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerRuby) BlockStartKeyword1(style *int) string { - _ret := C.QsciLexerRuby_blockStartKeyword1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerRuby) BlockStartKeywordWithStyle(style *int) string { + _ret := C.QsciLexerRuby_blockStartKeywordWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla/gen_qscilexerruby.h b/qt-restricted-extras/qscintilla/gen_qscilexerruby.h index d845a380..095d9d66 100644 --- a/qt-restricted-extras/qscintilla/gen_qscilexerruby.h +++ b/qt-restricted-extras/qscintilla/gen_qscilexerruby.h @@ -70,9 +70,9 @@ struct miqt_string QsciLexerRuby_tr2(const char* s, const char* c); struct miqt_string QsciLexerRuby_tr3(const char* s, const char* c, int n); struct miqt_string QsciLexerRuby_trUtf82(const char* s, const char* c); struct miqt_string QsciLexerRuby_trUtf83(const char* s, const char* c, int n); -const char* QsciLexerRuby_blockEnd1(const QsciLexerRuby* self, int* style); -const char* QsciLexerRuby_blockStart1(const QsciLexerRuby* self, int* style); -const char* QsciLexerRuby_blockStartKeyword1(const QsciLexerRuby* self, int* style); +const char* QsciLexerRuby_blockEndWithStyle(const QsciLexerRuby* self, int* style); +const char* QsciLexerRuby_blockStartWithStyle(const QsciLexerRuby* self, int* style); +const char* QsciLexerRuby_blockStartKeywordWithStyle(const QsciLexerRuby* self, int* style); bool QsciLexerRuby_override_virtual_language(void* self, intptr_t slot); const char* QsciLexerRuby_virtualbase_language(const void* self); bool QsciLexerRuby_override_virtual_lexer(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla/gen_qsciscintilla.cpp b/qt-restricted-extras/qscintilla/gen_qsciscintilla.cpp index 1d54dd09..906ae88b 100644 --- a/qt-restricted-extras/qscintilla/gen_qsciscintilla.cpp +++ b/qt-restricted-extras/qscintilla/gen_qsciscintilla.cpp @@ -4340,7 +4340,7 @@ struct miqt_string QsciScintilla_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QsciScintilla_clearAnnotations1(QsciScintilla* self, int line) { +void QsciScintilla_clearAnnotationsWithLine(QsciScintilla* self, int line) { self->clearAnnotations(static_cast(line)); } @@ -4352,15 +4352,15 @@ int QsciScintilla_markerDefine2(QsciScintilla* self, int sym, int markerNumber) return self->markerDefine(static_cast(sym), static_cast(markerNumber)); } -int QsciScintilla_markerDefine22(QsciScintilla* self, char ch, int markerNumber) { +int QsciScintilla_markerDefine3(QsciScintilla* self, char ch, int markerNumber) { return self->markerDefine(static_cast(ch), static_cast(markerNumber)); } -int QsciScintilla_markerDefine23(QsciScintilla* self, QPixmap* pm, int markerNumber) { +int QsciScintilla_markerDefine4(QsciScintilla* self, QPixmap* pm, int markerNumber) { return self->markerDefine(*pm, static_cast(markerNumber)); } -int QsciScintilla_markerDefine24(QsciScintilla* self, QImage* im, int markerNumber) { +int QsciScintilla_markerDefine5(QsciScintilla* self, QImage* im, int markerNumber) { return self->markerDefine(*im, static_cast(markerNumber)); } @@ -4368,7 +4368,7 @@ void QsciScintilla_markerDelete2(QsciScintilla* self, int linenr, int markerNumb self->markerDelete(static_cast(linenr), static_cast(markerNumber)); } -void QsciScintilla_markerDeleteAll1(QsciScintilla* self, int markerNumber) { +void QsciScintilla_markerDeleteAllWithMarkerNumber(QsciScintilla* self, int markerNumber) { self->markerDeleteAll(static_cast(markerNumber)); } @@ -4392,7 +4392,7 @@ void QsciScintilla_setIndicatorOutlineColor2(QsciScintilla* self, QColor* col, i self->setIndicatorOutlineColor(*col, static_cast(indicatorNumber)); } -void QsciScintilla_clearMarginText1(QsciScintilla* self, int line) { +void QsciScintilla_clearMarginTextWithLine(QsciScintilla* self, int line) { self->clearMarginText(static_cast(line)); } diff --git a/qt-restricted-extras/qscintilla/gen_qsciscintilla.go b/qt-restricted-extras/qscintilla/gen_qsciscintilla.go index 9c699d70..f5858c8f 100644 --- a/qt-restricted-extras/qscintilla/gen_qsciscintilla.go +++ b/qt-restricted-extras/qscintilla/gen_qsciscintilla.go @@ -1760,8 +1760,8 @@ func QsciScintilla_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QsciScintilla) ClearAnnotations1(line int) { - C.QsciScintilla_clearAnnotations1(this.h, (C.int)(line)) +func (this *QsciScintilla) ClearAnnotationsWithLine(line int) { + C.QsciScintilla_clearAnnotationsWithLine(this.h, (C.int)(line)) } func (this *QsciScintilla) IndicatorDefine2(style QsciScintilla__IndicatorStyle, indicatorNumber int) int { @@ -1772,24 +1772,24 @@ func (this *QsciScintilla) MarkerDefine2(sym QsciScintilla__MarkerSymbol, marker return (int)(C.QsciScintilla_markerDefine2(this.h, (C.int)(sym), (C.int)(markerNumber))) } -func (this *QsciScintilla) MarkerDefine22(ch int8, markerNumber int) int { - return (int)(C.QsciScintilla_markerDefine22(this.h, (C.char)(ch), (C.int)(markerNumber))) +func (this *QsciScintilla) MarkerDefine3(ch int8, markerNumber int) int { + return (int)(C.QsciScintilla_markerDefine3(this.h, (C.char)(ch), (C.int)(markerNumber))) } -func (this *QsciScintilla) MarkerDefine23(pm *qt.QPixmap, markerNumber int) int { - return (int)(C.QsciScintilla_markerDefine23(this.h, (*C.QPixmap)(pm.UnsafePointer()), (C.int)(markerNumber))) +func (this *QsciScintilla) MarkerDefine4(pm *qt.QPixmap, markerNumber int) int { + return (int)(C.QsciScintilla_markerDefine4(this.h, (*C.QPixmap)(pm.UnsafePointer()), (C.int)(markerNumber))) } -func (this *QsciScintilla) MarkerDefine24(im *qt.QImage, markerNumber int) int { - return (int)(C.QsciScintilla_markerDefine24(this.h, (*C.QImage)(im.UnsafePointer()), (C.int)(markerNumber))) +func (this *QsciScintilla) MarkerDefine5(im *qt.QImage, markerNumber int) int { + return (int)(C.QsciScintilla_markerDefine5(this.h, (*C.QImage)(im.UnsafePointer()), (C.int)(markerNumber))) } func (this *QsciScintilla) MarkerDelete2(linenr int, markerNumber int) { C.QsciScintilla_markerDelete2(this.h, (C.int)(linenr), (C.int)(markerNumber)) } -func (this *QsciScintilla) MarkerDeleteAll1(markerNumber int) { - C.QsciScintilla_markerDeleteAll1(this.h, (C.int)(markerNumber)) +func (this *QsciScintilla) MarkerDeleteAllWithMarkerNumber(markerNumber int) { + C.QsciScintilla_markerDeleteAllWithMarkerNumber(this.h, (C.int)(markerNumber)) } func (this *QsciScintilla) SetIndicatorDrawUnder2(under bool, indicatorNumber int) { @@ -1812,8 +1812,8 @@ func (this *QsciScintilla) SetIndicatorOutlineColor2(col *qt.QColor, indicatorNu C.QsciScintilla_setIndicatorOutlineColor2(this.h, (*C.QColor)(col.UnsafePointer()), (C.int)(indicatorNumber)) } -func (this *QsciScintilla) ClearMarginText1(line int) { - C.QsciScintilla_clearMarginText1(this.h, (C.int)(line)) +func (this *QsciScintilla) ClearMarginTextWithLine(line int) { + C.QsciScintilla_clearMarginTextWithLine(this.h, (C.int)(line)) } func (this *QsciScintilla) SetMarkerBackgroundColor2(col *qt.QColor, markerNumber int) { diff --git a/qt-restricted-extras/qscintilla/gen_qsciscintilla.h b/qt-restricted-extras/qscintilla/gen_qsciscintilla.h index 5e599f11..1943cdc0 100644 --- a/qt-restricted-extras/qscintilla/gen_qsciscintilla.h +++ b/qt-restricted-extras/qscintilla/gen_qsciscintilla.h @@ -414,20 +414,20 @@ struct miqt_string QsciScintilla_tr2(const char* s, const char* c); struct miqt_string QsciScintilla_tr3(const char* s, const char* c, int n); struct miqt_string QsciScintilla_trUtf82(const char* s, const char* c); struct miqt_string QsciScintilla_trUtf83(const char* s, const char* c, int n); -void QsciScintilla_clearAnnotations1(QsciScintilla* self, int line); +void QsciScintilla_clearAnnotationsWithLine(QsciScintilla* self, int line); int QsciScintilla_indicatorDefine2(QsciScintilla* self, int style, int indicatorNumber); int QsciScintilla_markerDefine2(QsciScintilla* self, int sym, int markerNumber); -int QsciScintilla_markerDefine22(QsciScintilla* self, char ch, int markerNumber); -int QsciScintilla_markerDefine23(QsciScintilla* self, QPixmap* pm, int markerNumber); -int QsciScintilla_markerDefine24(QsciScintilla* self, QImage* im, int markerNumber); +int QsciScintilla_markerDefine3(QsciScintilla* self, char ch, int markerNumber); +int QsciScintilla_markerDefine4(QsciScintilla* self, QPixmap* pm, int markerNumber); +int QsciScintilla_markerDefine5(QsciScintilla* self, QImage* im, int markerNumber); void QsciScintilla_markerDelete2(QsciScintilla* self, int linenr, int markerNumber); -void QsciScintilla_markerDeleteAll1(QsciScintilla* self, int markerNumber); +void QsciScintilla_markerDeleteAllWithMarkerNumber(QsciScintilla* self, int markerNumber); void QsciScintilla_setIndicatorDrawUnder2(QsciScintilla* self, bool under, int indicatorNumber); void QsciScintilla_setIndicatorForegroundColor2(QsciScintilla* self, QColor* col, int indicatorNumber); void QsciScintilla_setIndicatorHoverForegroundColor2(QsciScintilla* self, QColor* col, int indicatorNumber); void QsciScintilla_setIndicatorHoverStyle2(QsciScintilla* self, int style, int indicatorNumber); void QsciScintilla_setIndicatorOutlineColor2(QsciScintilla* self, QColor* col, int indicatorNumber); -void QsciScintilla_clearMarginText1(QsciScintilla* self, int line); +void QsciScintilla_clearMarginTextWithLine(QsciScintilla* self, int line); void QsciScintilla_setMarkerBackgroundColor2(QsciScintilla* self, QColor* col, int markerNumber); void QsciScintilla_setMarkerForegroundColor2(QsciScintilla* self, QColor* col, int markerNumber); void QsciScintilla_setWrapVisualFlags2(QsciScintilla* self, int endFlag, int startFlag); diff --git a/qt-restricted-extras/qscintilla/gen_qsciscintillabase.cpp b/qt-restricted-extras/qscintilla/gen_qsciscintillabase.cpp index 9d1e2ca8..eca4133e 100644 --- a/qt-restricted-extras/qscintilla/gen_qsciscintillabase.cpp +++ b/qt-restricted-extras/qscintilla/gen_qsciscintillabase.cpp @@ -1786,11 +1786,11 @@ struct miqt_string QsciScintillaBase_trUtf83(const char* s, const char* c, int n return _ms; } -long QsciScintillaBase_SendScintilla22(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam) { +long QsciScintillaBase_SendScintilla14(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam) { return self->SendScintilla(static_cast(msg), static_cast(wParam)); } -long QsciScintillaBase_SendScintilla32(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam, long lParam) { +long QsciScintillaBase_SendScintilla15(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam, long lParam) { return self->SendScintilla(static_cast(msg), static_cast(wParam), static_cast(lParam)); } diff --git a/qt-restricted-extras/qscintilla/gen_qsciscintillabase.go b/qt-restricted-extras/qscintilla/gen_qsciscintillabase.go index 51328717..0fe59384 100644 --- a/qt-restricted-extras/qscintilla/gen_qsciscintillabase.go +++ b/qt-restricted-extras/qscintilla/gen_qsciscintillabase.go @@ -2189,12 +2189,12 @@ func QsciScintillaBase_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QsciScintillaBase) SendScintilla22(msg uint, wParam uint64) int64 { - return (int64)(C.QsciScintillaBase_SendScintilla22(this.h, (C.uint)(msg), (C.ulong)(wParam))) +func (this *QsciScintillaBase) SendScintilla14(msg uint, wParam uint64) int64 { + return (int64)(C.QsciScintillaBase_SendScintilla14(this.h, (C.uint)(msg), (C.ulong)(wParam))) } -func (this *QsciScintillaBase) SendScintilla32(msg uint, wParam uint64, lParam int64) int64 { - return (int64)(C.QsciScintillaBase_SendScintilla32(this.h, (C.uint)(msg), (C.ulong)(wParam), (C.long)(lParam))) +func (this *QsciScintillaBase) SendScintilla15(msg uint, wParam uint64, lParam int64) int64 { + return (int64)(C.QsciScintillaBase_SendScintilla15(this.h, (C.uint)(msg), (C.ulong)(wParam), (C.long)(lParam))) } // SetScrollBars can only be called from a QsciScintillaBase that was directly constructed. diff --git a/qt-restricted-extras/qscintilla/gen_qsciscintillabase.h b/qt-restricted-extras/qscintilla/gen_qsciscintillabase.h index 714f6a84..ec5c6a71 100644 --- a/qt-restricted-extras/qscintilla/gen_qsciscintillabase.h +++ b/qt-restricted-extras/qscintilla/gen_qsciscintillabase.h @@ -227,8 +227,8 @@ struct miqt_string QsciScintillaBase_tr2(const char* s, const char* c); struct miqt_string QsciScintillaBase_tr3(const char* s, const char* c, int n); struct miqt_string QsciScintillaBase_trUtf82(const char* s, const char* c); struct miqt_string QsciScintillaBase_trUtf83(const char* s, const char* c, int n); -long QsciScintillaBase_SendScintilla22(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam); -long QsciScintillaBase_SendScintilla32(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam, long lParam); +long QsciScintillaBase_SendScintilla14(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam); +long QsciScintillaBase_SendScintilla15(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam, long lParam); bool QsciScintillaBase_override_virtual_canInsertFromMimeData(void* self, intptr_t slot); bool QsciScintillaBase_virtualbase_canInsertFromMimeData(const void* self, QMimeData* source); bool QsciScintillaBase_override_virtual_fromMimeData(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla6/gen_qsciapis.cpp b/qt-restricted-extras/qscintilla6/gen_qsciapis.cpp index 686314be..e4ddc8ba 100644 --- a/qt-restricted-extras/qscintilla6/gen_qsciapis.cpp +++ b/qt-restricted-extras/qscintilla6/gen_qsciapis.cpp @@ -523,17 +523,17 @@ struct miqt_string QsciAPIs_tr3(const char* s, const char* c, int n) { return _ms; } -bool QsciAPIs_isPrepared1(const QsciAPIs* self, struct miqt_string filename) { +bool QsciAPIs_isPreparedWithFilename(const QsciAPIs* self, struct miqt_string filename) { QString filename_QString = QString::fromUtf8(filename.data, filename.len); return self->isPrepared(filename_QString); } -bool QsciAPIs_loadPrepared1(QsciAPIs* self, struct miqt_string filename) { +bool QsciAPIs_loadPreparedWithFilename(QsciAPIs* self, struct miqt_string filename) { QString filename_QString = QString::fromUtf8(filename.data, filename.len); return self->loadPrepared(filename_QString); } -bool QsciAPIs_savePrepared1(const QsciAPIs* self, struct miqt_string filename) { +bool QsciAPIs_savePreparedWithFilename(const QsciAPIs* self, struct miqt_string filename) { QString filename_QString = QString::fromUtf8(filename.data, filename.len); return self->savePrepared(filename_QString); } diff --git a/qt-restricted-extras/qscintilla6/gen_qsciapis.go b/qt-restricted-extras/qscintilla6/gen_qsciapis.go index e845be14..51d12e1d 100644 --- a/qt-restricted-extras/qscintilla6/gen_qsciapis.go +++ b/qt-restricted-extras/qscintilla6/gen_qsciapis.go @@ -282,28 +282,28 @@ func QsciAPIs_Tr3(s string, c string, n int) string { return _ret } -func (this *QsciAPIs) IsPrepared1(filename string) bool { +func (this *QsciAPIs) IsPreparedWithFilename(filename string) bool { 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.QsciAPIs_isPrepared1(this.h, filename_ms)) + return (bool)(C.QsciAPIs_isPreparedWithFilename(this.h, filename_ms)) } -func (this *QsciAPIs) LoadPrepared1(filename string) bool { +func (this *QsciAPIs) LoadPreparedWithFilename(filename string) bool { 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.QsciAPIs_loadPrepared1(this.h, filename_ms)) + return (bool)(C.QsciAPIs_loadPreparedWithFilename(this.h, filename_ms)) } -func (this *QsciAPIs) SavePrepared1(filename string) bool { +func (this *QsciAPIs) SavePreparedWithFilename(filename string) bool { 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.QsciAPIs_savePrepared1(this.h, filename_ms)) + return (bool)(C.QsciAPIs_savePreparedWithFilename(this.h, filename_ms)) } // Sender can only be called from a QsciAPIs that was directly constructed. diff --git a/qt-restricted-extras/qscintilla6/gen_qsciapis.h b/qt-restricted-extras/qscintilla6/gen_qsciapis.h index df09407f..d8001a59 100644 --- a/qt-restricted-extras/qscintilla6/gen_qsciapis.h +++ b/qt-restricted-extras/qscintilla6/gen_qsciapis.h @@ -64,9 +64,9 @@ void QsciAPIs_apiPreparationFinished(QsciAPIs* self); void QsciAPIs_connect_apiPreparationFinished(QsciAPIs* self, intptr_t slot); struct miqt_string QsciAPIs_tr2(const char* s, const char* c); struct miqt_string QsciAPIs_tr3(const char* s, const char* c, int n); -bool QsciAPIs_isPrepared1(const QsciAPIs* self, struct miqt_string filename); -bool QsciAPIs_loadPrepared1(QsciAPIs* self, struct miqt_string filename); -bool QsciAPIs_savePrepared1(const QsciAPIs* self, struct miqt_string filename); +bool QsciAPIs_isPreparedWithFilename(const QsciAPIs* self, struct miqt_string filename); +bool QsciAPIs_loadPreparedWithFilename(QsciAPIs* self, struct miqt_string filename); +bool QsciAPIs_savePreparedWithFilename(const QsciAPIs* self, struct miqt_string filename); bool QsciAPIs_override_virtual_updateAutoCompletionList(void* self, intptr_t slot); void QsciAPIs_virtualbase_updateAutoCompletionList(void* self, struct miqt_array /* of struct miqt_string */ context, struct miqt_array /* of struct miqt_string */ list); bool QsciAPIs_override_virtual_autoCompletionSelected(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.cpp b/qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.cpp index 230fe3a0..bd0f9d59 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.cpp +++ b/qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.cpp @@ -1024,15 +1024,15 @@ struct miqt_string QsciLexerCoffeeScript_tr3(const char* s, const char* c, int n return _ms; } -const char* QsciLexerCoffeeScript_blockEnd1(const QsciLexerCoffeeScript* self, int* style) { +const char* QsciLexerCoffeeScript_blockEndWithStyle(const QsciLexerCoffeeScript* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerCoffeeScript_blockStart1(const QsciLexerCoffeeScript* self, int* style) { +const char* QsciLexerCoffeeScript_blockStartWithStyle(const QsciLexerCoffeeScript* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } -const char* QsciLexerCoffeeScript_blockStartKeyword1(const QsciLexerCoffeeScript* self, int* style) { +const char* QsciLexerCoffeeScript_blockStartKeywordWithStyle(const QsciLexerCoffeeScript* self, int* style) { return (const char*) self->blockStartKeyword(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.go b/qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.go index 1a10d839..66c1d7b8 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.go +++ b/qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.go @@ -250,18 +250,18 @@ func QsciLexerCoffeeScript_Tr3(s string, c string, n int) string { return _ret } -func (this *QsciLexerCoffeeScript) BlockEnd1(style *int) string { - _ret := C.QsciLexerCoffeeScript_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCoffeeScript) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerCoffeeScript_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerCoffeeScript) BlockStart1(style *int) string { - _ret := C.QsciLexerCoffeeScript_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCoffeeScript) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerCoffeeScript_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerCoffeeScript) BlockStartKeyword1(style *int) string { - _ret := C.QsciLexerCoffeeScript_blockStartKeyword1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCoffeeScript) BlockStartKeywordWithStyle(style *int) string { + _ret := C.QsciLexerCoffeeScript_blockStartKeywordWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.h b/qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.h index d91d9237..9c571a84 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.h +++ b/qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.h @@ -73,9 +73,9 @@ bool QsciLexerCoffeeScript_stylePreprocessor(const QsciLexerCoffeeScript* self); void QsciLexerCoffeeScript_setStylePreprocessor(QsciLexerCoffeeScript* self, bool style); struct miqt_string QsciLexerCoffeeScript_tr2(const char* s, const char* c); struct miqt_string QsciLexerCoffeeScript_tr3(const char* s, const char* c, int n); -const char* QsciLexerCoffeeScript_blockEnd1(const QsciLexerCoffeeScript* self, int* style); -const char* QsciLexerCoffeeScript_blockStart1(const QsciLexerCoffeeScript* self, int* style); -const char* QsciLexerCoffeeScript_blockStartKeyword1(const QsciLexerCoffeeScript* self, int* style); +const char* QsciLexerCoffeeScript_blockEndWithStyle(const QsciLexerCoffeeScript* self, int* style); +const char* QsciLexerCoffeeScript_blockStartWithStyle(const QsciLexerCoffeeScript* self, int* style); +const char* QsciLexerCoffeeScript_blockStartKeywordWithStyle(const QsciLexerCoffeeScript* self, int* style); bool QsciLexerCoffeeScript_override_virtual_language(void* self, intptr_t slot); const char* QsciLexerCoffeeScript_virtualbase_language(const void* self); bool QsciLexerCoffeeScript_override_virtual_lexer(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexercpp.cpp b/qt-restricted-extras/qscintilla6/gen_qscilexercpp.cpp index 0898fea4..09304019 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexercpp.cpp +++ b/qt-restricted-extras/qscintilla6/gen_qscilexercpp.cpp @@ -1185,15 +1185,15 @@ struct miqt_string QsciLexerCPP_tr3(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerCPP_blockEnd1(const QsciLexerCPP* self, int* style) { +const char* QsciLexerCPP_blockEndWithStyle(const QsciLexerCPP* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerCPP_blockStart1(const QsciLexerCPP* self, int* style) { +const char* QsciLexerCPP_blockStartWithStyle(const QsciLexerCPP* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } -const char* QsciLexerCPP_blockStartKeyword1(const QsciLexerCPP* self, int* style) { +const char* QsciLexerCPP_blockStartKeywordWithStyle(const QsciLexerCPP* self, int* style) { return (const char*) self->blockStartKeyword(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexercpp.go b/qt-restricted-extras/qscintilla6/gen_qscilexercpp.go index 00d8d5e8..95d31ff6 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexercpp.go +++ b/qt-restricted-extras/qscintilla6/gen_qscilexercpp.go @@ -344,18 +344,18 @@ func QsciLexerCPP_Tr3(s string, c string, n int) string { return _ret } -func (this *QsciLexerCPP) BlockEnd1(style *int) string { - _ret := C.QsciLexerCPP_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCPP) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerCPP_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerCPP) BlockStart1(style *int) string { - _ret := C.QsciLexerCPP_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCPP) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerCPP_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerCPP) BlockStartKeyword1(style *int) string { - _ret := C.QsciLexerCPP_blockStartKeyword1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCPP) BlockStartKeywordWithStyle(style *int) string { + _ret := C.QsciLexerCPP_blockStartKeywordWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexercpp.h b/qt-restricted-extras/qscintilla6/gen_qscilexercpp.h index 634091be..9b2a7c53 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexercpp.h +++ b/qt-restricted-extras/qscintilla6/gen_qscilexercpp.h @@ -88,9 +88,9 @@ void QsciLexerCPP_setFoldPreprocessor(QsciLexerCPP* self, bool fold); void QsciLexerCPP_setStylePreprocessor(QsciLexerCPP* self, bool style); struct miqt_string QsciLexerCPP_tr2(const char* s, const char* c); struct miqt_string QsciLexerCPP_tr3(const char* s, const char* c, int n); -const char* QsciLexerCPP_blockEnd1(const QsciLexerCPP* self, int* style); -const char* QsciLexerCPP_blockStart1(const QsciLexerCPP* self, int* style); -const char* QsciLexerCPP_blockStartKeyword1(const QsciLexerCPP* self, int* style); +const char* QsciLexerCPP_blockEndWithStyle(const QsciLexerCPP* self, int* style); +const char* QsciLexerCPP_blockStartWithStyle(const QsciLexerCPP* self, int* style); +const char* QsciLexerCPP_blockStartKeywordWithStyle(const QsciLexerCPP* self, int* style); bool QsciLexerCPP_override_virtual_setFoldAtElse(void* self, intptr_t slot); void QsciLexerCPP_virtualbase_setFoldAtElse(void* self, bool fold); bool QsciLexerCPP_override_virtual_setFoldComments(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexercss.cpp b/qt-restricted-extras/qscintilla6/gen_qscilexercss.cpp index 26f35b00..b0607001 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexercss.cpp +++ b/qt-restricted-extras/qscintilla6/gen_qscilexercss.cpp @@ -1036,11 +1036,11 @@ struct miqt_string QsciLexerCSS_tr3(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerCSS_blockEnd1(const QsciLexerCSS* self, int* style) { +const char* QsciLexerCSS_blockEndWithStyle(const QsciLexerCSS* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerCSS_blockStart1(const QsciLexerCSS* self, int* style) { +const char* QsciLexerCSS_blockStartWithStyle(const QsciLexerCSS* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexercss.go b/qt-restricted-extras/qscintilla6/gen_qscilexercss.go index 707219b8..3b7a4a61 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexercss.go +++ b/qt-restricted-extras/qscintilla6/gen_qscilexercss.go @@ -226,13 +226,13 @@ func QsciLexerCSS_Tr3(s string, c string, n int) string { return _ret } -func (this *QsciLexerCSS) BlockEnd1(style *int) string { - _ret := C.QsciLexerCSS_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCSS) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerCSS_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerCSS) BlockStart1(style *int) string { - _ret := C.QsciLexerCSS_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerCSS) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerCSS_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexercss.h b/qt-restricted-extras/qscintilla6/gen_qscilexercss.h index 4c75ef35..bfda8302 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexercss.h +++ b/qt-restricted-extras/qscintilla6/gen_qscilexercss.h @@ -70,8 +70,8 @@ void QsciLexerCSS_setFoldComments(QsciLexerCSS* self, bool fold); void QsciLexerCSS_setFoldCompact(QsciLexerCSS* self, bool fold); struct miqt_string QsciLexerCSS_tr2(const char* s, const char* c); struct miqt_string QsciLexerCSS_tr3(const char* s, const char* c, int n); -const char* QsciLexerCSS_blockEnd1(const QsciLexerCSS* self, int* style); -const char* QsciLexerCSS_blockStart1(const QsciLexerCSS* self, int* style); +const char* QsciLexerCSS_blockEndWithStyle(const QsciLexerCSS* self, int* style); +const char* QsciLexerCSS_blockStartWithStyle(const QsciLexerCSS* self, int* style); bool QsciLexerCSS_override_virtual_setFoldComments(void* self, intptr_t slot); void QsciLexerCSS_virtualbase_setFoldComments(void* self, bool fold); bool QsciLexerCSS_override_virtual_setFoldCompact(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerd.cpp b/qt-restricted-extras/qscintilla6/gen_qscilexerd.cpp index 5476580e..82215131 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerd.cpp +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerd.cpp @@ -1076,15 +1076,15 @@ struct miqt_string QsciLexerD_tr3(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerD_blockEnd1(const QsciLexerD* self, int* style) { +const char* QsciLexerD_blockEndWithStyle(const QsciLexerD* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerD_blockStart1(const QsciLexerD* self, int* style) { +const char* QsciLexerD_blockStartWithStyle(const QsciLexerD* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } -const char* QsciLexerD_blockStartKeyword1(const QsciLexerD* self, int* style) { +const char* QsciLexerD_blockStartKeywordWithStyle(const QsciLexerD* self, int* style) { return (const char*) self->blockStartKeyword(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerd.go b/qt-restricted-extras/qscintilla6/gen_qscilexerd.go index 569760a0..7f2ab6d9 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerd.go +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerd.go @@ -241,18 +241,18 @@ func QsciLexerD_Tr3(s string, c string, n int) string { return _ret } -func (this *QsciLexerD) BlockEnd1(style *int) string { - _ret := C.QsciLexerD_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerD) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerD_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerD) BlockStart1(style *int) string { - _ret := C.QsciLexerD_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerD) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerD_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerD) BlockStartKeyword1(style *int) string { - _ret := C.QsciLexerD_blockStartKeyword1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerD) BlockStartKeywordWithStyle(style *int) string { + _ret := C.QsciLexerD_blockStartKeywordWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerd.h b/qt-restricted-extras/qscintilla6/gen_qscilexerd.h index 513c5f8c..7b6c8c73 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerd.h +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerd.h @@ -71,9 +71,9 @@ void QsciLexerD_setFoldComments(QsciLexerD* self, bool fold); void QsciLexerD_setFoldCompact(QsciLexerD* self, bool fold); struct miqt_string QsciLexerD_tr2(const char* s, const char* c); struct miqt_string QsciLexerD_tr3(const char* s, const char* c, int n); -const char* QsciLexerD_blockEnd1(const QsciLexerD* self, int* style); -const char* QsciLexerD_blockStart1(const QsciLexerD* self, int* style); -const char* QsciLexerD_blockStartKeyword1(const QsciLexerD* self, int* style); +const char* QsciLexerD_blockEndWithStyle(const QsciLexerD* self, int* style); +const char* QsciLexerD_blockStartWithStyle(const QsciLexerD* self, int* style); +const char* QsciLexerD_blockStartKeywordWithStyle(const QsciLexerD* self, int* style); bool QsciLexerD_override_virtual_setFoldAtElse(void* self, intptr_t slot); void QsciLexerD_virtualbase_setFoldAtElse(void* self, bool fold); bool QsciLexerD_override_virtual_setFoldComments(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerlua.cpp b/qt-restricted-extras/qscintilla6/gen_qscilexerlua.cpp index b7ba80c6..be3cbe57 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerlua.cpp +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerlua.cpp @@ -1008,7 +1008,7 @@ struct miqt_string QsciLexerLua_tr3(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerLua_blockStart1(const QsciLexerLua* self, int* style) { +const char* QsciLexerLua_blockStartWithStyle(const QsciLexerLua* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerlua.go b/qt-restricted-extras/qscintilla6/gen_qscilexerlua.go index ec69d3e7..470e599d 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerlua.go +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerlua.go @@ -207,8 +207,8 @@ func QsciLexerLua_Tr3(s string, c string, n int) string { return _ret } -func (this *QsciLexerLua) BlockStart1(style *int) string { - _ret := C.QsciLexerLua_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerLua) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerLua_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerlua.h b/qt-restricted-extras/qscintilla6/gen_qscilexerlua.h index 8d80380a..d0ee99af 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerlua.h +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerlua.h @@ -64,7 +64,7 @@ bool QsciLexerLua_foldCompact(const QsciLexerLua* self); void QsciLexerLua_setFoldCompact(QsciLexerLua* self, bool fold); struct miqt_string QsciLexerLua_tr2(const char* s, const char* c); struct miqt_string QsciLexerLua_tr3(const char* s, const char* c, int n); -const char* QsciLexerLua_blockStart1(const QsciLexerLua* self, int* style); +const char* QsciLexerLua_blockStartWithStyle(const QsciLexerLua* self, int* style); bool QsciLexerLua_override_virtual_setFoldCompact(void* self, intptr_t slot); void QsciLexerLua_virtualbase_setFoldCompact(void* self, bool fold); bool QsciLexerLua_override_virtual_language(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerpascal.cpp b/qt-restricted-extras/qscintilla6/gen_qscilexerpascal.cpp index 10ee8801..f7e8647e 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerpascal.cpp +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerpascal.cpp @@ -1080,15 +1080,15 @@ struct miqt_string QsciLexerPascal_tr3(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerPascal_blockEnd1(const QsciLexerPascal* self, int* style) { +const char* QsciLexerPascal_blockEndWithStyle(const QsciLexerPascal* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerPascal_blockStart1(const QsciLexerPascal* self, int* style) { +const char* QsciLexerPascal_blockStartWithStyle(const QsciLexerPascal* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } -const char* QsciLexerPascal_blockStartKeyword1(const QsciLexerPascal* self, int* style) { +const char* QsciLexerPascal_blockStartKeywordWithStyle(const QsciLexerPascal* self, int* style) { return (const char*) self->blockStartKeyword(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerpascal.go b/qt-restricted-extras/qscintilla6/gen_qscilexerpascal.go index a10ab4fd..92571906 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerpascal.go +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerpascal.go @@ -236,18 +236,18 @@ func QsciLexerPascal_Tr3(s string, c string, n int) string { return _ret } -func (this *QsciLexerPascal) BlockEnd1(style *int) string { - _ret := C.QsciLexerPascal_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerPascal) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerPascal_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerPascal) BlockStart1(style *int) string { - _ret := C.QsciLexerPascal_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerPascal) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerPascal_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerPascal) BlockStartKeyword1(style *int) string { - _ret := C.QsciLexerPascal_blockStartKeyword1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerPascal) BlockStartKeywordWithStyle(style *int) string { + _ret := C.QsciLexerPascal_blockStartKeywordWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerpascal.h b/qt-restricted-extras/qscintilla6/gen_qscilexerpascal.h index 8430d343..de4cabe4 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerpascal.h +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerpascal.h @@ -72,9 +72,9 @@ void QsciLexerPascal_setFoldCompact(QsciLexerPascal* self, bool fold); void QsciLexerPascal_setFoldPreprocessor(QsciLexerPascal* self, bool fold); struct miqt_string QsciLexerPascal_tr2(const char* s, const char* c); struct miqt_string QsciLexerPascal_tr3(const char* s, const char* c, int n); -const char* QsciLexerPascal_blockEnd1(const QsciLexerPascal* self, int* style); -const char* QsciLexerPascal_blockStart1(const QsciLexerPascal* self, int* style); -const char* QsciLexerPascal_blockStartKeyword1(const QsciLexerPascal* self, int* style); +const char* QsciLexerPascal_blockEndWithStyle(const QsciLexerPascal* self, int* style); +const char* QsciLexerPascal_blockStartWithStyle(const QsciLexerPascal* self, int* style); +const char* QsciLexerPascal_blockStartKeywordWithStyle(const QsciLexerPascal* self, int* style); bool QsciLexerPascal_override_virtual_setFoldComments(void* self, intptr_t slot); void QsciLexerPascal_virtualbase_setFoldComments(void* self, bool fold); bool QsciLexerPascal_override_virtual_setFoldCompact(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerperl.cpp b/qt-restricted-extras/qscintilla6/gen_qscilexerperl.cpp index bedb721a..30b52f7c 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerperl.cpp +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerperl.cpp @@ -1068,11 +1068,11 @@ struct miqt_string QsciLexerPerl_tr3(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerPerl_blockEnd1(const QsciLexerPerl* self, int* style) { +const char* QsciLexerPerl_blockEndWithStyle(const QsciLexerPerl* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerPerl_blockStart1(const QsciLexerPerl* self, int* style) { +const char* QsciLexerPerl_blockStartWithStyle(const QsciLexerPerl* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerperl.go b/qt-restricted-extras/qscintilla6/gen_qscilexerperl.go index 35865bbf..75470187 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerperl.go +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerperl.go @@ -270,13 +270,13 @@ func QsciLexerPerl_Tr3(s string, c string, n int) string { return _ret } -func (this *QsciLexerPerl) BlockEnd1(style *int) string { - _ret := C.QsciLexerPerl_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerPerl) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerPerl_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerPerl) BlockStart1(style *int) string { - _ret := C.QsciLexerPerl_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerPerl) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerPerl_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerperl.h b/qt-restricted-extras/qscintilla6/gen_qscilexerperl.h index 1f197faf..3180d52d 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerperl.h +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerperl.h @@ -74,8 +74,8 @@ void QsciLexerPerl_setFoldComments(QsciLexerPerl* self, bool fold); void QsciLexerPerl_setFoldCompact(QsciLexerPerl* self, bool fold); struct miqt_string QsciLexerPerl_tr2(const char* s, const char* c); struct miqt_string QsciLexerPerl_tr3(const char* s, const char* c, int n); -const char* QsciLexerPerl_blockEnd1(const QsciLexerPerl* self, int* style); -const char* QsciLexerPerl_blockStart1(const QsciLexerPerl* self, int* style); +const char* QsciLexerPerl_blockEndWithStyle(const QsciLexerPerl* self, int* style); +const char* QsciLexerPerl_blockStartWithStyle(const QsciLexerPerl* self, int* style); bool QsciLexerPerl_override_virtual_setFoldComments(void* self, intptr_t slot); void QsciLexerPerl_virtualbase_setFoldComments(void* self, bool fold); bool QsciLexerPerl_override_virtual_setFoldCompact(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerpython.cpp b/qt-restricted-extras/qscintilla6/gen_qscilexerpython.cpp index ea7415fc..f36b466a 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerpython.cpp +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerpython.cpp @@ -1122,7 +1122,7 @@ struct miqt_string QsciLexerPython_tr3(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerPython_blockStart1(const QsciLexerPython* self, int* style) { +const char* QsciLexerPython_blockStartWithStyle(const QsciLexerPython* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerpython.go b/qt-restricted-extras/qscintilla6/gen_qscilexerpython.go index 13319a90..255f5c89 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerpython.go +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerpython.go @@ -289,8 +289,8 @@ func QsciLexerPython_Tr3(s string, c string, n int) string { return _ret } -func (this *QsciLexerPython) BlockStart1(style *int) string { - _ret := C.QsciLexerPython_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerPython) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerPython_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerpython.h b/qt-restricted-extras/qscintilla6/gen_qscilexerpython.h index 8d3b3dcd..147f5a2e 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerpython.h +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerpython.h @@ -82,7 +82,7 @@ void QsciLexerPython_setFoldQuotes(QsciLexerPython* self, bool fold); void QsciLexerPython_setIndentationWarning(QsciLexerPython* self, int warn); struct miqt_string QsciLexerPython_tr2(const char* s, const char* c); struct miqt_string QsciLexerPython_tr3(const char* s, const char* c, int n); -const char* QsciLexerPython_blockStart1(const QsciLexerPython* self, int* style); +const char* QsciLexerPython_blockStartWithStyle(const QsciLexerPython* self, int* style); bool QsciLexerPython_override_virtual_indentationGuideView(void* self, intptr_t slot); int QsciLexerPython_virtualbase_indentationGuideView(const void* self); bool QsciLexerPython_override_virtual_setFoldComments(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerruby.cpp b/qt-restricted-extras/qscintilla6/gen_qscilexerruby.cpp index 0883c52e..8b713a36 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerruby.cpp +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerruby.cpp @@ -984,15 +984,15 @@ struct miqt_string QsciLexerRuby_tr3(const char* s, const char* c, int n) { return _ms; } -const char* QsciLexerRuby_blockEnd1(const QsciLexerRuby* self, int* style) { +const char* QsciLexerRuby_blockEndWithStyle(const QsciLexerRuby* self, int* style) { return (const char*) self->blockEnd(static_cast(style)); } -const char* QsciLexerRuby_blockStart1(const QsciLexerRuby* self, int* style) { +const char* QsciLexerRuby_blockStartWithStyle(const QsciLexerRuby* self, int* style) { return (const char*) self->blockStart(static_cast(style)); } -const char* QsciLexerRuby_blockStartKeyword1(const QsciLexerRuby* self, int* style) { +const char* QsciLexerRuby_blockStartKeywordWithStyle(const QsciLexerRuby* self, int* style) { return (const char*) self->blockStartKeyword(static_cast(style)); } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerruby.go b/qt-restricted-extras/qscintilla6/gen_qscilexerruby.go index 8939371b..1370193e 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerruby.go +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerruby.go @@ -223,18 +223,18 @@ func QsciLexerRuby_Tr3(s string, c string, n int) string { return _ret } -func (this *QsciLexerRuby) BlockEnd1(style *int) string { - _ret := C.QsciLexerRuby_blockEnd1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerRuby) BlockEndWithStyle(style *int) string { + _ret := C.QsciLexerRuby_blockEndWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerRuby) BlockStart1(style *int) string { - _ret := C.QsciLexerRuby_blockStart1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerRuby) BlockStartWithStyle(style *int) string { + _ret := C.QsciLexerRuby_blockStartWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } -func (this *QsciLexerRuby) BlockStartKeyword1(style *int) string { - _ret := C.QsciLexerRuby_blockStartKeyword1(this.h, (*C.int)(unsafe.Pointer(style))) +func (this *QsciLexerRuby) BlockStartKeywordWithStyle(style *int) string { + _ret := C.QsciLexerRuby_blockStartKeywordWithStyle(this.h, (*C.int)(unsafe.Pointer(style))) return C.GoString(_ret) } diff --git a/qt-restricted-extras/qscintilla6/gen_qscilexerruby.h b/qt-restricted-extras/qscintilla6/gen_qscilexerruby.h index d81094d2..525ace7f 100644 --- a/qt-restricted-extras/qscintilla6/gen_qscilexerruby.h +++ b/qt-restricted-extras/qscintilla6/gen_qscilexerruby.h @@ -67,9 +67,9 @@ void QsciLexerRuby_setFoldCompact(QsciLexerRuby* self, bool fold); bool QsciLexerRuby_foldCompact(const QsciLexerRuby* self); struct miqt_string QsciLexerRuby_tr2(const char* s, const char* c); struct miqt_string QsciLexerRuby_tr3(const char* s, const char* c, int n); -const char* QsciLexerRuby_blockEnd1(const QsciLexerRuby* self, int* style); -const char* QsciLexerRuby_blockStart1(const QsciLexerRuby* self, int* style); -const char* QsciLexerRuby_blockStartKeyword1(const QsciLexerRuby* self, int* style); +const char* QsciLexerRuby_blockEndWithStyle(const QsciLexerRuby* self, int* style); +const char* QsciLexerRuby_blockStartWithStyle(const QsciLexerRuby* self, int* style); +const char* QsciLexerRuby_blockStartKeywordWithStyle(const QsciLexerRuby* self, int* style); bool QsciLexerRuby_override_virtual_language(void* self, intptr_t slot); const char* QsciLexerRuby_virtualbase_language(const void* self); bool QsciLexerRuby_override_virtual_lexer(void* self, intptr_t slot); diff --git a/qt-restricted-extras/qscintilla6/gen_qsciscintilla.cpp b/qt-restricted-extras/qscintilla6/gen_qsciscintilla.cpp index ec0d9e4a..7a71229b 100644 --- a/qt-restricted-extras/qscintilla6/gen_qsciscintilla.cpp +++ b/qt-restricted-extras/qscintilla6/gen_qsciscintilla.cpp @@ -4328,7 +4328,7 @@ struct miqt_string QsciScintilla_tr3(const char* s, const char* c, int n) { return _ms; } -void QsciScintilla_clearAnnotations1(QsciScintilla* self, int line) { +void QsciScintilla_clearAnnotationsWithLine(QsciScintilla* self, int line) { self->clearAnnotations(static_cast(line)); } @@ -4340,15 +4340,15 @@ int QsciScintilla_markerDefine2(QsciScintilla* self, int sym, int markerNumber) return self->markerDefine(static_cast(sym), static_cast(markerNumber)); } -int QsciScintilla_markerDefine22(QsciScintilla* self, char ch, int markerNumber) { +int QsciScintilla_markerDefine3(QsciScintilla* self, char ch, int markerNumber) { return self->markerDefine(static_cast(ch), static_cast(markerNumber)); } -int QsciScintilla_markerDefine23(QsciScintilla* self, QPixmap* pm, int markerNumber) { +int QsciScintilla_markerDefine4(QsciScintilla* self, QPixmap* pm, int markerNumber) { return self->markerDefine(*pm, static_cast(markerNumber)); } -int QsciScintilla_markerDefine24(QsciScintilla* self, QImage* im, int markerNumber) { +int QsciScintilla_markerDefine5(QsciScintilla* self, QImage* im, int markerNumber) { return self->markerDefine(*im, static_cast(markerNumber)); } @@ -4356,7 +4356,7 @@ void QsciScintilla_markerDelete2(QsciScintilla* self, int linenr, int markerNumb self->markerDelete(static_cast(linenr), static_cast(markerNumber)); } -void QsciScintilla_markerDeleteAll1(QsciScintilla* self, int markerNumber) { +void QsciScintilla_markerDeleteAllWithMarkerNumber(QsciScintilla* self, int markerNumber) { self->markerDeleteAll(static_cast(markerNumber)); } @@ -4380,7 +4380,7 @@ void QsciScintilla_setIndicatorOutlineColor2(QsciScintilla* self, QColor* col, i self->setIndicatorOutlineColor(*col, static_cast(indicatorNumber)); } -void QsciScintilla_clearMarginText1(QsciScintilla* self, int line) { +void QsciScintilla_clearMarginTextWithLine(QsciScintilla* self, int line) { self->clearMarginText(static_cast(line)); } diff --git a/qt-restricted-extras/qscintilla6/gen_qsciscintilla.go b/qt-restricted-extras/qscintilla6/gen_qsciscintilla.go index c15be4c8..fd0b3d55 100644 --- a/qt-restricted-extras/qscintilla6/gen_qsciscintilla.go +++ b/qt-restricted-extras/qscintilla6/gen_qsciscintilla.go @@ -1729,8 +1729,8 @@ func QsciScintilla_Tr3(s string, c string, n int) string { return _ret } -func (this *QsciScintilla) ClearAnnotations1(line int) { - C.QsciScintilla_clearAnnotations1(this.h, (C.int)(line)) +func (this *QsciScintilla) ClearAnnotationsWithLine(line int) { + C.QsciScintilla_clearAnnotationsWithLine(this.h, (C.int)(line)) } func (this *QsciScintilla) IndicatorDefine2(style QsciScintilla__IndicatorStyle, indicatorNumber int) int { @@ -1741,24 +1741,24 @@ func (this *QsciScintilla) MarkerDefine2(sym QsciScintilla__MarkerSymbol, marker return (int)(C.QsciScintilla_markerDefine2(this.h, (C.int)(sym), (C.int)(markerNumber))) } -func (this *QsciScintilla) MarkerDefine22(ch int8, markerNumber int) int { - return (int)(C.QsciScintilla_markerDefine22(this.h, (C.char)(ch), (C.int)(markerNumber))) +func (this *QsciScintilla) MarkerDefine3(ch int8, markerNumber int) int { + return (int)(C.QsciScintilla_markerDefine3(this.h, (C.char)(ch), (C.int)(markerNumber))) } -func (this *QsciScintilla) MarkerDefine23(pm *qt6.QPixmap, markerNumber int) int { - return (int)(C.QsciScintilla_markerDefine23(this.h, (*C.QPixmap)(pm.UnsafePointer()), (C.int)(markerNumber))) +func (this *QsciScintilla) MarkerDefine4(pm *qt6.QPixmap, markerNumber int) int { + return (int)(C.QsciScintilla_markerDefine4(this.h, (*C.QPixmap)(pm.UnsafePointer()), (C.int)(markerNumber))) } -func (this *QsciScintilla) MarkerDefine24(im *qt6.QImage, markerNumber int) int { - return (int)(C.QsciScintilla_markerDefine24(this.h, (*C.QImage)(im.UnsafePointer()), (C.int)(markerNumber))) +func (this *QsciScintilla) MarkerDefine5(im *qt6.QImage, markerNumber int) int { + return (int)(C.QsciScintilla_markerDefine5(this.h, (*C.QImage)(im.UnsafePointer()), (C.int)(markerNumber))) } func (this *QsciScintilla) MarkerDelete2(linenr int, markerNumber int) { C.QsciScintilla_markerDelete2(this.h, (C.int)(linenr), (C.int)(markerNumber)) } -func (this *QsciScintilla) MarkerDeleteAll1(markerNumber int) { - C.QsciScintilla_markerDeleteAll1(this.h, (C.int)(markerNumber)) +func (this *QsciScintilla) MarkerDeleteAllWithMarkerNumber(markerNumber int) { + C.QsciScintilla_markerDeleteAllWithMarkerNumber(this.h, (C.int)(markerNumber)) } func (this *QsciScintilla) SetIndicatorDrawUnder2(under bool, indicatorNumber int) { @@ -1781,8 +1781,8 @@ func (this *QsciScintilla) SetIndicatorOutlineColor2(col *qt6.QColor, indicatorN C.QsciScintilla_setIndicatorOutlineColor2(this.h, (*C.QColor)(col.UnsafePointer()), (C.int)(indicatorNumber)) } -func (this *QsciScintilla) ClearMarginText1(line int) { - C.QsciScintilla_clearMarginText1(this.h, (C.int)(line)) +func (this *QsciScintilla) ClearMarginTextWithLine(line int) { + C.QsciScintilla_clearMarginTextWithLine(this.h, (C.int)(line)) } func (this *QsciScintilla) SetMarkerBackgroundColor2(col *qt6.QColor, markerNumber int) { diff --git a/qt-restricted-extras/qscintilla6/gen_qsciscintilla.h b/qt-restricted-extras/qscintilla6/gen_qsciscintilla.h index 658c8d04..895a597b 100644 --- a/qt-restricted-extras/qscintilla6/gen_qsciscintilla.h +++ b/qt-restricted-extras/qscintilla6/gen_qsciscintilla.h @@ -413,20 +413,20 @@ void QsciScintilla_contextMenuEvent(QsciScintilla* self, QContextMenuEvent* e); void QsciScintilla_wheelEvent(QsciScintilla* self, QWheelEvent* e); struct miqt_string QsciScintilla_tr2(const char* s, const char* c); struct miqt_string QsciScintilla_tr3(const char* s, const char* c, int n); -void QsciScintilla_clearAnnotations1(QsciScintilla* self, int line); +void QsciScintilla_clearAnnotationsWithLine(QsciScintilla* self, int line); int QsciScintilla_indicatorDefine2(QsciScintilla* self, int style, int indicatorNumber); int QsciScintilla_markerDefine2(QsciScintilla* self, int sym, int markerNumber); -int QsciScintilla_markerDefine22(QsciScintilla* self, char ch, int markerNumber); -int QsciScintilla_markerDefine23(QsciScintilla* self, QPixmap* pm, int markerNumber); -int QsciScintilla_markerDefine24(QsciScintilla* self, QImage* im, int markerNumber); +int QsciScintilla_markerDefine3(QsciScintilla* self, char ch, int markerNumber); +int QsciScintilla_markerDefine4(QsciScintilla* self, QPixmap* pm, int markerNumber); +int QsciScintilla_markerDefine5(QsciScintilla* self, QImage* im, int markerNumber); void QsciScintilla_markerDelete2(QsciScintilla* self, int linenr, int markerNumber); -void QsciScintilla_markerDeleteAll1(QsciScintilla* self, int markerNumber); +void QsciScintilla_markerDeleteAllWithMarkerNumber(QsciScintilla* self, int markerNumber); void QsciScintilla_setIndicatorDrawUnder2(QsciScintilla* self, bool under, int indicatorNumber); void QsciScintilla_setIndicatorForegroundColor2(QsciScintilla* self, QColor* col, int indicatorNumber); void QsciScintilla_setIndicatorHoverForegroundColor2(QsciScintilla* self, QColor* col, int indicatorNumber); void QsciScintilla_setIndicatorHoverStyle2(QsciScintilla* self, int style, int indicatorNumber); void QsciScintilla_setIndicatorOutlineColor2(QsciScintilla* self, QColor* col, int indicatorNumber); -void QsciScintilla_clearMarginText1(QsciScintilla* self, int line); +void QsciScintilla_clearMarginTextWithLine(QsciScintilla* self, int line); void QsciScintilla_setMarkerBackgroundColor2(QsciScintilla* self, QColor* col, int markerNumber); void QsciScintilla_setMarkerForegroundColor2(QsciScintilla* self, QColor* col, int markerNumber); void QsciScintilla_setWrapVisualFlags2(QsciScintilla* self, int endFlag, int startFlag); diff --git a/qt-restricted-extras/qscintilla6/gen_qsciscintillabase.cpp b/qt-restricted-extras/qscintilla6/gen_qsciscintillabase.cpp index 1d2ba211..5990d640 100644 --- a/qt-restricted-extras/qscintilla6/gen_qsciscintillabase.cpp +++ b/qt-restricted-extras/qscintilla6/gen_qsciscintillabase.cpp @@ -1774,11 +1774,11 @@ struct miqt_string QsciScintillaBase_tr3(const char* s, const char* c, int n) { return _ms; } -long QsciScintillaBase_SendScintilla22(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam) { +long QsciScintillaBase_SendScintilla14(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam) { return self->SendScintilla(static_cast(msg), static_cast(wParam)); } -long QsciScintillaBase_SendScintilla32(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam, long lParam) { +long QsciScintillaBase_SendScintilla15(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam, long lParam) { return self->SendScintilla(static_cast(msg), static_cast(wParam), static_cast(lParam)); } diff --git a/qt-restricted-extras/qscintilla6/gen_qsciscintillabase.go b/qt-restricted-extras/qscintilla6/gen_qsciscintillabase.go index dbc1d5a6..81138a5c 100644 --- a/qt-restricted-extras/qscintilla6/gen_qsciscintillabase.go +++ b/qt-restricted-extras/qscintilla6/gen_qsciscintillabase.go @@ -2158,12 +2158,12 @@ func QsciScintillaBase_Tr3(s string, c string, n int) string { return _ret } -func (this *QsciScintillaBase) SendScintilla22(msg uint, wParam uint64) int64 { - return (int64)(C.QsciScintillaBase_SendScintilla22(this.h, (C.uint)(msg), (C.ulong)(wParam))) +func (this *QsciScintillaBase) SendScintilla14(msg uint, wParam uint64) int64 { + return (int64)(C.QsciScintillaBase_SendScintilla14(this.h, (C.uint)(msg), (C.ulong)(wParam))) } -func (this *QsciScintillaBase) SendScintilla32(msg uint, wParam uint64, lParam int64) int64 { - return (int64)(C.QsciScintillaBase_SendScintilla32(this.h, (C.uint)(msg), (C.ulong)(wParam), (C.long)(lParam))) +func (this *QsciScintillaBase) SendScintilla15(msg uint, wParam uint64, lParam int64) int64 { + return (int64)(C.QsciScintillaBase_SendScintilla15(this.h, (C.uint)(msg), (C.ulong)(wParam), (C.long)(lParam))) } // SetScrollBars can only be called from a QsciScintillaBase that was directly constructed. diff --git a/qt-restricted-extras/qscintilla6/gen_qsciscintillabase.h b/qt-restricted-extras/qscintilla6/gen_qsciscintillabase.h index 22cb1c92..523aaacc 100644 --- a/qt-restricted-extras/qscintilla6/gen_qsciscintillabase.h +++ b/qt-restricted-extras/qscintilla6/gen_qsciscintillabase.h @@ -226,8 +226,8 @@ void QsciScintillaBase_resizeEvent(QsciScintillaBase* self, QResizeEvent* e); void QsciScintillaBase_scrollContentsBy(QsciScintillaBase* self, int dx, int dy); struct miqt_string QsciScintillaBase_tr2(const char* s, const char* c); struct miqt_string QsciScintillaBase_tr3(const char* s, const char* c, int n); -long QsciScintillaBase_SendScintilla22(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam); -long QsciScintillaBase_SendScintilla32(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam, long lParam); +long QsciScintillaBase_SendScintilla14(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam); +long QsciScintillaBase_SendScintilla15(const QsciScintillaBase* self, unsigned int msg, unsigned long wParam, long lParam); bool QsciScintillaBase_override_virtual_canInsertFromMimeData(void* self, intptr_t slot); bool QsciScintillaBase_virtualbase_canInsertFromMimeData(const void* self, QMimeData* source); bool QsciScintillaBase_override_virtual_fromMimeData(void* self, intptr_t slot); diff --git a/qt/cbor/gen_qcborarray.cpp b/qt/cbor/gen_qcborarray.cpp index e9fc975b..fc7ba231 100644 --- a/qt/cbor/gen_qcborarray.cpp +++ b/qt/cbor/gen_qcborarray.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "gen_qcborarray.h" @@ -239,10 +240,33 @@ QCborArray* QCborArray_fromStringList(struct miqt_array /* of struct miqt_string return new QCborArray(QCborArray::fromStringList(list_QList)); } +QCborArray* QCborArray_fromVariantList(struct miqt_array /* of QVariant* */ list) { + QVariantList list_QList; + list_QList.reserve(list.len); + QVariant** list_arr = static_cast(list.data); + for(size_t i = 0; i < list.len; ++i) { + list_QList.push_back(*(list_arr[i])); + } + return new QCborArray(QCborArray::fromVariantList(list_QList)); +} + QCborArray* QCborArray_fromJsonArray(QJsonArray* array) { return new QCborArray(QCborArray::fromJsonArray(*array)); } +struct miqt_array /* of QVariant* */ QCborArray_toVariantList(const QCborArray* self) { + QVariantList _ret = self->toVariantList(); + // Convert QList<> from C++ memory to manually-managed C memory + QVariant** _arr = static_cast(malloc(sizeof(QVariant*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = new QVariant(_ret[i]); + } + struct miqt_array _out; + _out.len = _ret.length(); + _out.data = static_cast(_arr); + return _out; +} + QJsonArray* QCborArray_toJsonArray(const QCborArray* self) { return new QJsonArray(self->toJsonArray()); } diff --git a/qt/cbor/gen_qcborarray.go b/qt/cbor/gen_qcborarray.go index c195fe19..e043b3e2 100644 --- a/qt/cbor/gen_qcborarray.go +++ b/qt/cbor/gen_qcborarray.go @@ -322,12 +322,36 @@ func QCborArray_FromStringList(list []string) *QCborArray { return _goptr } +func QCborArray_FromVariantList(list []qt.QVariant) *QCborArray { + list_CArray := (*[0xffff]*C.QVariant)(C.malloc(C.size_t(8 * len(list)))) + defer C.free(unsafe.Pointer(list_CArray)) + for i := range list { + list_CArray[i] = (*C.QVariant)(list[i].UnsafePointer()) + } + list_ma := C.struct_miqt_array{len: C.size_t(len(list)), data: unsafe.Pointer(list_CArray)} + _goptr := newQCborArray(C.QCborArray_fromVariantList(list_ma)) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func QCborArray_FromJsonArray(array *qt.QJsonArray) *QCborArray { _goptr := newQCborArray(C.QCborArray_fromJsonArray((*C.QJsonArray)(array.UnsafePointer()))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } +func (this *QCborArray) ToVariantList() []qt.QVariant { + var _ma C.struct_miqt_array = C.QCborArray_toVariantList(this.h) + _ret := make([]qt.QVariant, int(_ma.len)) + _outCast := (*[0xffff]*C.QVariant)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _lv_goptr := qt.UnsafeNewQVariant(unsafe.Pointer(_outCast[i])) + _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + _ret[i] = *_lv_goptr + } + return _ret +} + func (this *QCborArray) ToJsonArray() *qt.QJsonArray { _goptr := qt.UnsafeNewQJsonArray(unsafe.Pointer(C.QCborArray_toJsonArray(this.h))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer diff --git a/qt/cbor/gen_qcborarray.h b/qt/cbor/gen_qcborarray.h index 856da692..75f185fa 100644 --- a/qt/cbor/gen_qcborarray.h +++ b/qt/cbor/gen_qcborarray.h @@ -29,6 +29,7 @@ class QCborArray__Iterator; class QCborValue; class QCborValueRef; class QJsonArray; +class QVariant; #else typedef struct QCborArray QCborArray; typedef struct QCborArray__ConstIterator QCborArray__ConstIterator; @@ -36,6 +37,7 @@ typedef struct QCborArray__Iterator QCborArray__Iterator; typedef struct QCborValue QCborValue; typedef struct QCborValueRef QCborValueRef; typedef struct QJsonArray QJsonArray; +typedef struct QVariant QVariant; #endif QCborArray* QCborArray_new(); @@ -90,7 +92,9 @@ 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_fromVariantList(struct miqt_array /* of QVariant* */ list); QCborArray* QCborArray_fromJsonArray(QJsonArray* array); +struct miqt_array /* of QVariant* */ QCborArray_toVariantList(const QCborArray* self); QJsonArray* QCborArray_toJsonArray(const QCborArray* self); void QCborArray_delete(QCborArray* self); diff --git a/qt/cbor/gen_qcbormap.cpp b/qt/cbor/gen_qcbormap.cpp index 3b125eb9..e3642250 100644 --- a/qt/cbor/gen_qcbormap.cpp +++ b/qt/cbor/gen_qcbormap.cpp @@ -3,14 +3,15 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QCborMap__Iterator #include #include +#include #include -#include #include #include #include #include #include #include +#include #include #include "gen_qcbormap.h" diff --git a/qt/cbor/gen_qcborstreamreader.cpp b/qt/cbor/gen_qcborstreamreader.cpp index 9282eeb3..c4849bcc 100644 --- a/qt/cbor/gen_qcborstreamreader.cpp +++ b/qt/cbor/gen_qcborstreamreader.cpp @@ -241,7 +241,7 @@ long long QCborStreamReader_toInteger(const QCborStreamReader* self) { return static_cast(_ret); } -bool QCborStreamReader_next1(QCborStreamReader* self, int maxRecursion) { +bool QCborStreamReader_nextWithMaxRecursion(QCborStreamReader* self, int maxRecursion) { return self->next(static_cast(maxRecursion)); } diff --git a/qt/cbor/gen_qcborstreamreader.go b/qt/cbor/gen_qcborstreamreader.go index 6beb15f6..93d8090d 100644 --- a/qt/cbor/gen_qcborstreamreader.go +++ b/qt/cbor/gen_qcborstreamreader.go @@ -320,8 +320,8 @@ func (this *QCborStreamReader) ToInteger() int64 { return (int64)(C.QCborStreamReader_toInteger(this.h)) } -func (this *QCborStreamReader) Next1(maxRecursion int) bool { - return (bool)(C.QCborStreamReader_next1(this.h, (C.int)(maxRecursion))) +func (this *QCborStreamReader) NextWithMaxRecursion(maxRecursion int) bool { + return (bool)(C.QCborStreamReader_nextWithMaxRecursion(this.h, (C.int)(maxRecursion))) } // Delete this object from C++ memory. diff --git a/qt/cbor/gen_qcborstreamreader.h b/qt/cbor/gen_qcborstreamreader.h index 7b15dc38..bc9c8fe2 100644 --- a/qt/cbor/gen_qcborstreamreader.h +++ b/qt/cbor/gen_qcborstreamreader.h @@ -78,7 +78,7 @@ uint8_t QCborStreamReader_toSimpleType(const QCborStreamReader* self); float QCborStreamReader_toFloat(const QCborStreamReader* self); double QCborStreamReader_toDouble(const QCborStreamReader* self); long long QCborStreamReader_toInteger(const QCborStreamReader* self); -bool QCborStreamReader_next1(QCborStreamReader* self, int maxRecursion); +bool QCborStreamReader_nextWithMaxRecursion(QCborStreamReader* self, int maxRecursion); void QCborStreamReader_delete(QCborStreamReader* self); #ifdef __cplusplus diff --git a/qt/cbor/gen_qcborstreamwriter.cpp b/qt/cbor/gen_qcborstreamwriter.cpp index a5062be3..64fca3b7 100644 --- a/qt/cbor/gen_qcborstreamwriter.cpp +++ b/qt/cbor/gen_qcborstreamwriter.cpp @@ -117,7 +117,7 @@ bool QCborStreamWriter_endMap(QCborStreamWriter* self) { return self->endMap(); } -void QCborStreamWriter_append22(QCborStreamWriter* self, const char* str, ptrdiff_t size) { +void QCborStreamWriter_append5(QCborStreamWriter* self, const char* str, ptrdiff_t size) { self->append(str, (qsizetype)(size)); } diff --git a/qt/cbor/gen_qcborstreamwriter.go b/qt/cbor/gen_qcborstreamwriter.go index adfb127e..e237515e 100644 --- a/qt/cbor/gen_qcborstreamwriter.go +++ b/qt/cbor/gen_qcborstreamwriter.go @@ -165,10 +165,10 @@ func (this *QCborStreamWriter) EndMap() bool { return (bool)(C.QCborStreamWriter_endMap(this.h)) } -func (this *QCborStreamWriter) Append22(str string, size int64) { +func (this *QCborStreamWriter) Append5(str string, size int64) { str_Cstring := C.CString(str) defer C.free(unsafe.Pointer(str_Cstring)) - C.QCborStreamWriter_append22(this.h, str_Cstring, (C.ptrdiff_t)(size)) + C.QCborStreamWriter_append5(this.h, str_Cstring, (C.ptrdiff_t)(size)) } // Delete this object from C++ memory. diff --git a/qt/cbor/gen_qcborstreamwriter.h b/qt/cbor/gen_qcborstreamwriter.h index 22303e14..87e40775 100644 --- a/qt/cbor/gen_qcborstreamwriter.h +++ b/qt/cbor/gen_qcborstreamwriter.h @@ -48,7 +48,7 @@ bool QCborStreamWriter_endArray(QCborStreamWriter* self); void QCborStreamWriter_startMap(QCborStreamWriter* self); void QCborStreamWriter_startMapWithCount(QCborStreamWriter* self, unsigned long long count); bool QCborStreamWriter_endMap(QCborStreamWriter* self); -void QCborStreamWriter_append22(QCborStreamWriter* self, const char* str, ptrdiff_t size); +void QCborStreamWriter_append5(QCborStreamWriter* self, const char* str, ptrdiff_t size); void QCborStreamWriter_delete(QCborStreamWriter* self); #ifdef __cplusplus diff --git a/qt/cbor/gen_qcborvalue.cpp b/qt/cbor/gen_qcborvalue.cpp index f8d3c5d6..c7857e24 100644 --- a/qt/cbor/gen_qcborvalue.cpp +++ b/qt/cbor/gen_qcborvalue.cpp @@ -394,34 +394,34 @@ struct miqt_string QCborValue_toDiagnosticNotation(const QCborValue* self) { return _ms; } -uint8_t QCborValue_toSimpleType1(const QCborValue* self, uint8_t defaultValue) { +uint8_t QCborValue_toSimpleTypeWithDefaultValue(const QCborValue* self, uint8_t defaultValue) { QCborSimpleType _ret = self->toSimpleType(static_cast(defaultValue)); return static_cast(_ret); } -long long QCborValue_toInteger1(const QCborValue* self, long long defaultValue) { +long long QCborValue_toIntegerWithDefaultValue(const QCborValue* self, long long defaultValue) { qint64 _ret = self->toInteger(static_cast(defaultValue)); return static_cast(_ret); } -bool QCborValue_toBool1(const QCborValue* self, bool defaultValue) { +bool QCborValue_toBoolWithDefaultValue(const QCborValue* self, bool defaultValue) { return self->toBool(defaultValue); } -double QCborValue_toDouble1(const QCborValue* self, double defaultValue) { +double QCborValue_toDoubleWithDefaultValue(const QCborValue* self, double defaultValue) { return self->toDouble(static_cast(defaultValue)); } -uint64_t QCborValue_tag1(const QCborValue* self, uint64_t defaultValue) { +uint64_t QCborValue_tagWithDefaultValue(const QCborValue* self, uint64_t defaultValue) { QCborTag _ret = self->tag(static_cast(defaultValue)); return static_cast(_ret); } -QCborValue* QCborValue_taggedValue1(const QCborValue* self, QCborValue* defaultValue) { +QCborValue* QCborValue_taggedValueWithDefaultValue(const QCborValue* self, QCborValue* defaultValue) { return new QCborValue(self->taggedValue(*defaultValue)); } -struct miqt_string QCborValue_toByteArray1(const QCborValue* self, struct miqt_string defaultValue) { +struct miqt_string QCborValue_toByteArrayWithDefaultValue(const QCborValue* self, struct miqt_string defaultValue) { QByteArray defaultValue_QByteArray(defaultValue.data, defaultValue.len); QByteArray _qb = self->toByteArray(defaultValue_QByteArray); struct miqt_string _ms; @@ -431,7 +431,7 @@ struct miqt_string QCborValue_toByteArray1(const QCborValue* self, struct miqt_s return _ms; } -struct miqt_string QCborValue_toString1(const QCborValue* self, struct miqt_string defaultValue) { +struct miqt_string QCborValue_toStringWithDefaultValue(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 @@ -443,36 +443,36 @@ struct miqt_string QCborValue_toString1(const QCborValue* self, struct miqt_stri return _ms; } -QDateTime* QCborValue_toDateTime1(const QCborValue* self, QDateTime* defaultValue) { +QDateTime* QCborValue_toDateTimeWithDefaultValue(const QCborValue* self, QDateTime* defaultValue) { return new QDateTime(self->toDateTime(*defaultValue)); } -QUrl* QCborValue_toUrl1(const QCborValue* self, QUrl* defaultValue) { +QUrl* QCborValue_toUrlWithDefaultValue(const QCborValue* self, QUrl* defaultValue) { return new QUrl(self->toUrl(*defaultValue)); } -QRegularExpression* QCborValue_toRegularExpression1(const QCborValue* self, QRegularExpression* defaultValue) { +QRegularExpression* QCborValue_toRegularExpressionWithDefaultValue(const QCborValue* self, QRegularExpression* defaultValue) { return new QRegularExpression(self->toRegularExpression(*defaultValue)); } -QUuid* QCborValue_toUuid1(const QCborValue* self, QUuid* defaultValue) { +QUuid* QCborValue_toUuidWithDefaultValue(const QCborValue* self, QUuid* defaultValue) { return new QUuid(self->toUuid(*defaultValue)); } -QCborValue* QCborValue_fromCbor22(struct miqt_string ba, QCborParserError* error) { +QCborValue* QCborValue_fromCbor4(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 len, QCborParserError* error) { +QCborValue* QCborValue_fromCbor5(const char* data, ptrdiff_t len, QCborParserError* error) { return new QCborValue(QCborValue::fromCbor(data, (qsizetype)(len), error)); } -QCborValue* QCborValue_fromCbor33(const unsigned char* data, ptrdiff_t len, QCborParserError* error) { +QCborValue* QCborValue_fromCbor6(const unsigned char* data, ptrdiff_t len, QCborParserError* error) { return new QCborValue(QCborValue::fromCbor(static_cast(data), (qsizetype)(len), error)); } -struct miqt_string QCborValue_toCbor1(QCborValue* self, int opt) { +struct miqt_string QCborValue_toCborWithOpt(QCborValue* self, int opt) { QByteArray _qb = self->toCbor(static_cast(opt)); struct miqt_string _ms; _ms.len = _qb.length(); @@ -485,7 +485,7 @@ 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_toDiagnosticNotationWithOpts(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(); @@ -741,29 +741,29 @@ struct miqt_string QCborValueRef_toDiagnosticNotation(QCborValueRef* self) { return _ms; } -uint64_t QCborValueRef_tag1(const QCborValueRef* self, uint64_t defaultValue) { +uint64_t QCborValueRef_tagWithDefaultValue(const QCborValueRef* self, uint64_t defaultValue) { QCborTag _ret = self->tag(static_cast(defaultValue)); return static_cast(_ret); } -QCborValue* QCborValueRef_taggedValue1(const QCborValueRef* self, QCborValue* defaultValue) { +QCborValue* QCborValueRef_taggedValueWithDefaultValue(const QCborValueRef* self, QCborValue* defaultValue) { return new QCborValue(self->taggedValue(*defaultValue)); } -long long QCborValueRef_toInteger1(const QCborValueRef* self, long long defaultValue) { +long long QCborValueRef_toIntegerWithDefaultValue(const QCborValueRef* self, long long defaultValue) { qint64 _ret = self->toInteger(static_cast(defaultValue)); return static_cast(_ret); } -bool QCborValueRef_toBool1(const QCborValueRef* self, bool defaultValue) { +bool QCborValueRef_toBoolWithDefaultValue(const QCborValueRef* self, bool defaultValue) { return self->toBool(defaultValue); } -double QCborValueRef_toDouble1(const QCborValueRef* self, double defaultValue) { +double QCborValueRef_toDoubleWithDefaultValue(const QCborValueRef* self, double defaultValue) { return self->toDouble(static_cast(defaultValue)); } -struct miqt_string QCborValueRef_toByteArray1(const QCborValueRef* self, struct miqt_string defaultValue) { +struct miqt_string QCborValueRef_toByteArrayWithDefaultValue(const QCborValueRef* self, struct miqt_string defaultValue) { QByteArray defaultValue_QByteArray(defaultValue.data, defaultValue.len); QByteArray _qb = self->toByteArray(defaultValue_QByteArray); struct miqt_string _ms; @@ -773,7 +773,7 @@ struct miqt_string QCborValueRef_toByteArray1(const QCborValueRef* self, struct return _ms; } -struct miqt_string QCborValueRef_toString1(const QCborValueRef* self, struct miqt_string defaultValue) { +struct miqt_string QCborValueRef_toStringWithDefaultValue(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 @@ -785,23 +785,23 @@ struct miqt_string QCborValueRef_toString1(const QCborValueRef* self, struct miq return _ms; } -QDateTime* QCborValueRef_toDateTime1(const QCborValueRef* self, QDateTime* defaultValue) { +QDateTime* QCborValueRef_toDateTimeWithDefaultValue(const QCborValueRef* self, QDateTime* defaultValue) { return new QDateTime(self->toDateTime(*defaultValue)); } -QUrl* QCborValueRef_toUrl1(const QCborValueRef* self, QUrl* defaultValue) { +QUrl* QCborValueRef_toUrlWithDefaultValue(const QCborValueRef* self, QUrl* defaultValue) { return new QUrl(self->toUrl(*defaultValue)); } -QRegularExpression* QCborValueRef_toRegularExpression1(const QCborValueRef* self, QRegularExpression* defaultValue) { +QRegularExpression* QCborValueRef_toRegularExpressionWithDefaultValue(const QCborValueRef* self, QRegularExpression* defaultValue) { return new QRegularExpression(self->toRegularExpression(*defaultValue)); } -QUuid* QCborValueRef_toUuid1(const QCborValueRef* self, QUuid* defaultValue) { +QUuid* QCborValueRef_toUuidWithDefaultValue(const QCborValueRef* self, QUuid* defaultValue) { return new QUuid(self->toUuid(*defaultValue)); } -struct miqt_string QCborValueRef_toCbor1(QCborValueRef* self, int opt) { +struct miqt_string QCborValueRef_toCborWithOpt(QCborValueRef* self, int opt) { QByteArray _qb = self->toCbor(static_cast(opt)); struct miqt_string _ms; _ms.len = _qb.length(); @@ -814,7 +814,7 @@ void QCborValueRef_toCbor2(QCborValueRef* self, QCborStreamWriter* writer, int o self->toCbor(*writer, static_cast(opt)); } -struct miqt_string QCborValueRef_toDiagnosticNotation1(QCborValueRef* self, int opt) { +struct miqt_string QCborValueRef_toDiagnosticNotationWithOpt(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(); diff --git a/qt/cbor/gen_qcborvalue.go b/qt/cbor/gen_qcborvalue.go index 6b5818da..fb698f84 100644 --- a/qt/cbor/gen_qcborvalue.go +++ b/qt/cbor/gen_qcborvalue.go @@ -587,33 +587,33 @@ func (this *QCborValue) ToDiagnosticNotation() string { return _ret } -func (this *QCborValue) ToSimpleType1(defaultValue QCborSimpleType) QCborSimpleType { - return (QCborSimpleType)(C.QCborValue_toSimpleType1(this.h, (C.uint8_t)(defaultValue))) +func (this *QCborValue) ToSimpleTypeWithDefaultValue(defaultValue QCborSimpleType) QCborSimpleType { + return (QCborSimpleType)(C.QCborValue_toSimpleTypeWithDefaultValue(this.h, (C.uint8_t)(defaultValue))) } -func (this *QCborValue) ToInteger1(defaultValue int64) int64 { - return (int64)(C.QCborValue_toInteger1(this.h, (C.longlong)(defaultValue))) +func (this *QCborValue) ToIntegerWithDefaultValue(defaultValue int64) int64 { + return (int64)(C.QCborValue_toIntegerWithDefaultValue(this.h, (C.longlong)(defaultValue))) } -func (this *QCborValue) ToBool1(defaultValue bool) bool { - return (bool)(C.QCborValue_toBool1(this.h, (C.bool)(defaultValue))) +func (this *QCborValue) ToBoolWithDefaultValue(defaultValue bool) bool { + return (bool)(C.QCborValue_toBoolWithDefaultValue(this.h, (C.bool)(defaultValue))) } -func (this *QCborValue) ToDouble1(defaultValue float64) float64 { - return (float64)(C.QCborValue_toDouble1(this.h, (C.double)(defaultValue))) +func (this *QCborValue) ToDoubleWithDefaultValue(defaultValue float64) float64 { + return (float64)(C.QCborValue_toDoubleWithDefaultValue(this.h, (C.double)(defaultValue))) } -func (this *QCborValue) Tag1(defaultValue QCborTag) QCborTag { - return (QCborTag)(C.QCborValue_tag1(this.h, (C.uint64_t)(defaultValue))) +func (this *QCborValue) TagWithDefaultValue(defaultValue QCborTag) QCborTag { + return (QCborTag)(C.QCborValue_tagWithDefaultValue(this.h, (C.uint64_t)(defaultValue))) } -func (this *QCborValue) TaggedValue1(defaultValue *QCborValue) *QCborValue { - _goptr := newQCborValue(C.QCborValue_taggedValue1(this.h, defaultValue.cPointer())) +func (this *QCborValue) TaggedValueWithDefaultValue(defaultValue *QCborValue) *QCborValue { + _goptr := newQCborValue(C.QCborValue_taggedValueWithDefaultValue(this.h, defaultValue.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToByteArray1(defaultValue []byte) []byte { +func (this *QCborValue) ToByteArrayWithDefaultValue(defaultValue []byte) []byte { defaultValue_alias := C.struct_miqt_string{} if len(defaultValue) > 0 { defaultValue_alias.data = (*C.char)(unsafe.Pointer(&defaultValue[0])) @@ -621,48 +621,48 @@ func (this *QCborValue) ToByteArray1(defaultValue []byte) []byte { defaultValue_alias.data = (*C.char)(unsafe.Pointer(nil)) } defaultValue_alias.len = C.size_t(len(defaultValue)) - var _bytearray C.struct_miqt_string = C.QCborValue_toByteArray1(this.h, defaultValue_alias) + var _bytearray C.struct_miqt_string = C.QCborValue_toByteArrayWithDefaultValue(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 { +func (this *QCborValue) ToStringWithDefaultValue(defaultValue string) string { 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) + var _ms C.struct_miqt_string = C.QCborValue_toStringWithDefaultValue(this.h, defaultValue_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QCborValue) ToDateTime1(defaultValue *qt.QDateTime) *qt.QDateTime { - _goptr := qt.UnsafeNewQDateTime(unsafe.Pointer(C.QCborValue_toDateTime1(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())))) +func (this *QCborValue) ToDateTimeWithDefaultValue(defaultValue *qt.QDateTime) *qt.QDateTime { + _goptr := qt.UnsafeNewQDateTime(unsafe.Pointer(C.QCborValue_toDateTimeWithDefaultValue(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToUrl1(defaultValue *qt.QUrl) *qt.QUrl { - _goptr := qt.UnsafeNewQUrl(unsafe.Pointer(C.QCborValue_toUrl1(this.h, (*C.QUrl)(defaultValue.UnsafePointer())))) +func (this *QCborValue) ToUrlWithDefaultValue(defaultValue *qt.QUrl) *qt.QUrl { + _goptr := qt.UnsafeNewQUrl(unsafe.Pointer(C.QCborValue_toUrlWithDefaultValue(this.h, (*C.QUrl)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToRegularExpression1(defaultValue *qt.QRegularExpression) *qt.QRegularExpression { - _goptr := qt.UnsafeNewQRegularExpression(unsafe.Pointer(C.QCborValue_toRegularExpression1(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())))) +func (this *QCborValue) ToRegularExpressionWithDefaultValue(defaultValue *qt.QRegularExpression) *qt.QRegularExpression { + _goptr := qt.UnsafeNewQRegularExpression(unsafe.Pointer(C.QCborValue_toRegularExpressionWithDefaultValue(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToUuid1(defaultValue *qt.QUuid) *qt.QUuid { - _goptr := qt.UnsafeNewQUuid(unsafe.Pointer(C.QCborValue_toUuid1(this.h, (*C.QUuid)(defaultValue.UnsafePointer())))) +func (this *QCborValue) ToUuidWithDefaultValue(defaultValue *qt.QUuid) *qt.QUuid { + _goptr := qt.UnsafeNewQUuid(unsafe.Pointer(C.QCborValue_toUuidWithDefaultValue(this.h, (*C.QUuid)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QCborValue_FromCbor22(ba []byte, error *QCborParserError) *QCborValue { +func QCborValue_FromCbor4(ba []byte, error *QCborParserError) *QCborValue { ba_alias := C.struct_miqt_string{} if len(ba) > 0 { ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) @@ -670,27 +670,27 @@ func QCborValue_FromCbor22(ba []byte, error *QCborParserError) *QCborValue { ba_alias.data = (*C.char)(unsafe.Pointer(nil)) } ba_alias.len = C.size_t(len(ba)) - _goptr := newQCborValue(C.QCborValue_fromCbor22(ba_alias, error.cPointer())) + _goptr := newQCborValue(C.QCborValue_fromCbor4(ba_alias, error.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QCborValue_FromCbor32(data string, lenVal int64, error *QCborParserError) *QCborValue { +func QCborValue_FromCbor5(data string, lenVal int64, error *QCborParserError) *QCborValue { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - _goptr := newQCborValue(C.QCborValue_fromCbor32(data_Cstring, (C.ptrdiff_t)(lenVal), error.cPointer())) + _goptr := newQCborValue(C.QCborValue_fromCbor5(data_Cstring, (C.ptrdiff_t)(lenVal), error.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QCborValue_FromCbor33(data *byte, lenVal int64, error *QCborParserError) *QCborValue { - _goptr := newQCborValue(C.QCborValue_fromCbor33((*C.uchar)(unsafe.Pointer(data)), (C.ptrdiff_t)(lenVal), error.cPointer())) +func QCborValue_FromCbor6(data *byte, lenVal int64, error *QCborParserError) *QCborValue { + _goptr := newQCborValue(C.QCborValue_fromCbor6((*C.uchar)(unsafe.Pointer(data)), (C.ptrdiff_t)(lenVal), error.cPointer())) _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)) +func (this *QCborValue) ToCborWithOpt(opt QCborValue__EncodingOption) []byte { + var _bytearray C.struct_miqt_string = C.QCborValue_toCborWithOpt(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 @@ -700,8 +700,8 @@ func (this *QCborValue) ToCbor2(writer *QCborStreamWriter, opt QCborValue__Encod C.QCborValue_toCbor2(this.h, writer.cPointer(), (C.int)(opt)) } -func (this *QCborValue) ToDiagnosticNotation1(opts QCborValue__DiagnosticNotationOption) string { - var _ms C.struct_miqt_string = C.QCborValue_toDiagnosticNotation1(this.h, (C.int)(opts)) +func (this *QCborValue) ToDiagnosticNotationWithOpts(opts QCborValue__DiagnosticNotationOption) string { + var _ms C.struct_miqt_string = C.QCborValue_toDiagnosticNotationWithOpts(this.h, (C.int)(opts)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1019,29 +1019,29 @@ func (this *QCborValueRef) ToDiagnosticNotation() string { return _ret } -func (this *QCborValueRef) Tag1(defaultValue QCborTag) QCborTag { - return (QCborTag)(C.QCborValueRef_tag1(this.h, (C.uint64_t)(defaultValue))) +func (this *QCborValueRef) TagWithDefaultValue(defaultValue QCborTag) QCborTag { + return (QCborTag)(C.QCborValueRef_tagWithDefaultValue(this.h, (C.uint64_t)(defaultValue))) } -func (this *QCborValueRef) TaggedValue1(defaultValue *QCborValue) *QCborValue { - _goptr := newQCborValue(C.QCborValueRef_taggedValue1(this.h, defaultValue.cPointer())) +func (this *QCborValueRef) TaggedValueWithDefaultValue(defaultValue *QCborValue) *QCborValue { + _goptr := newQCborValue(C.QCborValueRef_taggedValueWithDefaultValue(this.h, defaultValue.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToInteger1(defaultValue int64) int64 { - return (int64)(C.QCborValueRef_toInteger1(this.h, (C.longlong)(defaultValue))) +func (this *QCborValueRef) ToIntegerWithDefaultValue(defaultValue int64) int64 { + return (int64)(C.QCborValueRef_toIntegerWithDefaultValue(this.h, (C.longlong)(defaultValue))) } -func (this *QCborValueRef) ToBool1(defaultValue bool) bool { - return (bool)(C.QCborValueRef_toBool1(this.h, (C.bool)(defaultValue))) +func (this *QCborValueRef) ToBoolWithDefaultValue(defaultValue bool) bool { + return (bool)(C.QCborValueRef_toBoolWithDefaultValue(this.h, (C.bool)(defaultValue))) } -func (this *QCborValueRef) ToDouble1(defaultValue float64) float64 { - return (float64)(C.QCborValueRef_toDouble1(this.h, (C.double)(defaultValue))) +func (this *QCborValueRef) ToDoubleWithDefaultValue(defaultValue float64) float64 { + return (float64)(C.QCborValueRef_toDoubleWithDefaultValue(this.h, (C.double)(defaultValue))) } -func (this *QCborValueRef) ToByteArray1(defaultValue []byte) []byte { +func (this *QCborValueRef) ToByteArrayWithDefaultValue(defaultValue []byte) []byte { defaultValue_alias := C.struct_miqt_string{} if len(defaultValue) > 0 { defaultValue_alias.data = (*C.char)(unsafe.Pointer(&defaultValue[0])) @@ -1049,49 +1049,49 @@ func (this *QCborValueRef) ToByteArray1(defaultValue []byte) []byte { defaultValue_alias.data = (*C.char)(unsafe.Pointer(nil)) } defaultValue_alias.len = C.size_t(len(defaultValue)) - var _bytearray C.struct_miqt_string = C.QCborValueRef_toByteArray1(this.h, defaultValue_alias) + var _bytearray C.struct_miqt_string = C.QCborValueRef_toByteArrayWithDefaultValue(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 { +func (this *QCborValueRef) ToStringWithDefaultValue(defaultValue string) string { 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) + var _ms C.struct_miqt_string = C.QCborValueRef_toStringWithDefaultValue(this.h, defaultValue_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QCborValueRef) ToDateTime1(defaultValue *qt.QDateTime) *qt.QDateTime { - _goptr := qt.UnsafeNewQDateTime(unsafe.Pointer(C.QCborValueRef_toDateTime1(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())))) +func (this *QCborValueRef) ToDateTimeWithDefaultValue(defaultValue *qt.QDateTime) *qt.QDateTime { + _goptr := qt.UnsafeNewQDateTime(unsafe.Pointer(C.QCborValueRef_toDateTimeWithDefaultValue(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToUrl1(defaultValue *qt.QUrl) *qt.QUrl { - _goptr := qt.UnsafeNewQUrl(unsafe.Pointer(C.QCborValueRef_toUrl1(this.h, (*C.QUrl)(defaultValue.UnsafePointer())))) +func (this *QCborValueRef) ToUrlWithDefaultValue(defaultValue *qt.QUrl) *qt.QUrl { + _goptr := qt.UnsafeNewQUrl(unsafe.Pointer(C.QCborValueRef_toUrlWithDefaultValue(this.h, (*C.QUrl)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToRegularExpression1(defaultValue *qt.QRegularExpression) *qt.QRegularExpression { - _goptr := qt.UnsafeNewQRegularExpression(unsafe.Pointer(C.QCborValueRef_toRegularExpression1(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())))) +func (this *QCborValueRef) ToRegularExpressionWithDefaultValue(defaultValue *qt.QRegularExpression) *qt.QRegularExpression { + _goptr := qt.UnsafeNewQRegularExpression(unsafe.Pointer(C.QCborValueRef_toRegularExpressionWithDefaultValue(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToUuid1(defaultValue *qt.QUuid) *qt.QUuid { - _goptr := qt.UnsafeNewQUuid(unsafe.Pointer(C.QCborValueRef_toUuid1(this.h, (*C.QUuid)(defaultValue.UnsafePointer())))) +func (this *QCborValueRef) ToUuidWithDefaultValue(defaultValue *qt.QUuid) *qt.QUuid { + _goptr := qt.UnsafeNewQUuid(unsafe.Pointer(C.QCborValueRef_toUuidWithDefaultValue(this.h, (*C.QUuid)(defaultValue.UnsafePointer())))) _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)) +func (this *QCborValueRef) ToCborWithOpt(opt QCborValue__EncodingOption) []byte { + var _bytearray C.struct_miqt_string = C.QCborValueRef_toCborWithOpt(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 @@ -1101,8 +1101,8 @@ func (this *QCborValueRef) ToCbor2(writer *QCborStreamWriter, opt QCborValue__En C.QCborValueRef_toCbor2(this.h, writer.cPointer(), (C.int)(opt)) } -func (this *QCborValueRef) ToDiagnosticNotation1(opt QCborValue__DiagnosticNotationOption) string { - var _ms C.struct_miqt_string = C.QCborValueRef_toDiagnosticNotation1(this.h, (C.int)(opt)) +func (this *QCborValueRef) ToDiagnosticNotationWithOpt(opt QCborValue__DiagnosticNotationOption) string { + var _ms C.struct_miqt_string = C.QCborValueRef_toDiagnosticNotationWithOpt(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/cbor/gen_qcborvalue.h b/qt/cbor/gen_qcborvalue.h index d939bc60..276efb43 100644 --- a/qt/cbor/gen_qcborvalue.h +++ b/qt/cbor/gen_qcborvalue.h @@ -127,24 +127,24 @@ QCborValue* QCborValue_fromCbor3(const unsigned char* data, ptrdiff_t len); struct miqt_string QCborValue_toCbor(QCborValue* self); void QCborValue_toCborWithWriter(QCborValue* self, QCborStreamWriter* writer); 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); -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(struct miqt_string ba, QCborParserError* error); -QCborValue* QCborValue_fromCbor32(const char* data, ptrdiff_t len, QCborParserError* error); -QCborValue* QCborValue_fromCbor33(const unsigned char* data, ptrdiff_t len, QCborParserError* error); -struct miqt_string QCborValue_toCbor1(QCborValue* self, int opt); +uint8_t QCborValue_toSimpleTypeWithDefaultValue(const QCborValue* self, uint8_t defaultValue); +long long QCborValue_toIntegerWithDefaultValue(const QCborValue* self, long long defaultValue); +bool QCborValue_toBoolWithDefaultValue(const QCborValue* self, bool defaultValue); +double QCborValue_toDoubleWithDefaultValue(const QCborValue* self, double defaultValue); +uint64_t QCborValue_tagWithDefaultValue(const QCborValue* self, uint64_t defaultValue); +QCborValue* QCborValue_taggedValueWithDefaultValue(const QCborValue* self, QCborValue* defaultValue); +struct miqt_string QCborValue_toByteArrayWithDefaultValue(const QCborValue* self, struct miqt_string defaultValue); +struct miqt_string QCborValue_toStringWithDefaultValue(const QCborValue* self, struct miqt_string defaultValue); +QDateTime* QCborValue_toDateTimeWithDefaultValue(const QCborValue* self, QDateTime* defaultValue); +QUrl* QCborValue_toUrlWithDefaultValue(const QCborValue* self, QUrl* defaultValue); +QRegularExpression* QCborValue_toRegularExpressionWithDefaultValue(const QCborValue* self, QRegularExpression* defaultValue); +QUuid* QCborValue_toUuidWithDefaultValue(const QCborValue* self, QUuid* defaultValue); +QCborValue* QCborValue_fromCbor4(struct miqt_string ba, QCborParserError* error); +QCborValue* QCborValue_fromCbor5(const char* data, ptrdiff_t len, QCborParserError* error); +QCborValue* QCborValue_fromCbor6(const unsigned char* data, ptrdiff_t len, QCborParserError* error); +struct miqt_string QCborValue_toCborWithOpt(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_toDiagnosticNotationWithOpts(const QCborValue* self, int opts); void QCborValue_delete(QCborValue* self); QCborValueRef* QCborValueRef_new(QCborValueRef* param1); @@ -200,20 +200,20 @@ QJsonValue* QCborValueRef_toJsonValue(const QCborValueRef* self); struct miqt_string QCborValueRef_toCbor(QCborValueRef* self); void QCborValueRef_toCborWithWriter(QCborValueRef* self, QCborStreamWriter* writer); 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); -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); -struct miqt_string QCborValueRef_toCbor1(QCborValueRef* self, int opt); +uint64_t QCborValueRef_tagWithDefaultValue(const QCborValueRef* self, uint64_t defaultValue); +QCborValue* QCborValueRef_taggedValueWithDefaultValue(const QCborValueRef* self, QCborValue* defaultValue); +long long QCborValueRef_toIntegerWithDefaultValue(const QCborValueRef* self, long long defaultValue); +bool QCborValueRef_toBoolWithDefaultValue(const QCborValueRef* self, bool defaultValue); +double QCborValueRef_toDoubleWithDefaultValue(const QCborValueRef* self, double defaultValue); +struct miqt_string QCborValueRef_toByteArrayWithDefaultValue(const QCborValueRef* self, struct miqt_string defaultValue); +struct miqt_string QCborValueRef_toStringWithDefaultValue(const QCborValueRef* self, struct miqt_string defaultValue); +QDateTime* QCborValueRef_toDateTimeWithDefaultValue(const QCborValueRef* self, QDateTime* defaultValue); +QUrl* QCborValueRef_toUrlWithDefaultValue(const QCborValueRef* self, QUrl* defaultValue); +QRegularExpression* QCborValueRef_toRegularExpressionWithDefaultValue(const QCborValueRef* self, QRegularExpression* defaultValue); +QUuid* QCborValueRef_toUuidWithDefaultValue(const QCborValueRef* self, QUuid* defaultValue); +struct miqt_string QCborValueRef_toCborWithOpt(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_toDiagnosticNotationWithOpt(QCborValueRef* self, int opt); void QCborValueRef_delete(QCborValueRef* self); #ifdef __cplusplus diff --git a/qt/gen_qabstractanimation.cpp b/qt/gen_qabstractanimation.cpp index eb29bd96..ce66bdf6 100644 --- a/qt/gen_qabstractanimation.cpp +++ b/qt/gen_qabstractanimation.cpp @@ -476,7 +476,7 @@ struct miqt_string QAbstractAnimation_trUtf83(const char* s, const char* c, int return _ms; } -void QAbstractAnimation_start1(QAbstractAnimation* self, int policy) { +void QAbstractAnimation_startWithPolicy(QAbstractAnimation* self, int policy) { self->start(static_cast(policy)); } @@ -917,7 +917,7 @@ public: // Wrappers to allow calling protected methods: friend void QAnimationDriver_protectedbase_advanceAnimation(bool* _dynamic_cast_ok, void* self); - friend void QAnimationDriver_protectedbase_advanceAnimation1(bool* _dynamic_cast_ok, void* self, long long timeStep); + friend void QAnimationDriver_protectedbase_advanceAnimationWithTimeStep(bool* _dynamic_cast_ok, void* self, long long timeStep); friend QObject* QAnimationDriver_protectedbase_sender(bool* _dynamic_cast_ok, const void* self); friend int QAnimationDriver_protectedbase_senderSignalIndex(bool* _dynamic_cast_ok, const void* self); friend int QAnimationDriver_protectedbase_receivers(bool* _dynamic_cast_ok, const void* self, const char* signal); @@ -1250,7 +1250,7 @@ void QAnimationDriver_protectedbase_advanceAnimation(bool* _dynamic_cast_ok, voi } -void QAnimationDriver_protectedbase_advanceAnimation1(bool* _dynamic_cast_ok, void* self, long long timeStep) { +void QAnimationDriver_protectedbase_advanceAnimationWithTimeStep(bool* _dynamic_cast_ok, void* self, long long timeStep) { MiqtVirtualQAnimationDriver* self_cast = dynamic_cast( (QAnimationDriver*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt/gen_qabstractanimation.go b/qt/gen_qabstractanimation.go index d0bfd513..656ec6e1 100644 --- a/qt/gen_qabstractanimation.go +++ b/qt/gen_qabstractanimation.go @@ -303,8 +303,8 @@ func QAbstractAnimation_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QAbstractAnimation) Start1(policy QAbstractAnimation__DeletionPolicy) { - C.QAbstractAnimation_start1(this.h, (C.int)(policy)) +func (this *QAbstractAnimation) StartWithPolicy(policy QAbstractAnimation__DeletionPolicy) { + C.QAbstractAnimation_startWithPolicy(this.h, (C.int)(policy)) } // Sender can only be called from a QAbstractAnimation that was directly constructed. @@ -854,11 +854,11 @@ func (this *QAnimationDriver) AdvanceAnimation() { } -// AdvanceAnimation1 can only be called from a QAnimationDriver that was directly constructed. -func (this *QAnimationDriver) AdvanceAnimation1(timeStep int64) { +// AdvanceAnimationWithTimeStep can only be called from a QAnimationDriver that was directly constructed. +func (this *QAnimationDriver) AdvanceAnimationWithTimeStep(timeStep int64) { var _dynamic_cast_ok C.bool = false - C.QAnimationDriver_protectedbase_advanceAnimation1(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.longlong)(timeStep)) + C.QAnimationDriver_protectedbase_advanceAnimationWithTimeStep(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.longlong)(timeStep)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") diff --git a/qt/gen_qabstractanimation.h b/qt/gen_qabstractanimation.h index 9775ea88..c6519533 100644 --- a/qt/gen_qabstractanimation.h +++ b/qt/gen_qabstractanimation.h @@ -76,7 +76,7 @@ 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_startWithPolicy(QAbstractAnimation* self, int policy); bool QAbstractAnimation_override_virtual_duration(void* self, intptr_t slot); int QAbstractAnimation_virtualbase_duration(const void* self); bool QAbstractAnimation_override_virtual_event(void* self, intptr_t slot); @@ -152,7 +152,7 @@ void QAnimationDriver_virtualbase_connectNotify(void* self, QMetaMethod* signal) bool QAnimationDriver_override_virtual_disconnectNotify(void* self, intptr_t slot); void QAnimationDriver_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QAnimationDriver_protectedbase_advanceAnimation(bool* _dynamic_cast_ok, void* self); -void QAnimationDriver_protectedbase_advanceAnimation1(bool* _dynamic_cast_ok, void* self, long long timeStep); +void QAnimationDriver_protectedbase_advanceAnimationWithTimeStep(bool* _dynamic_cast_ok, void* self, long long timeStep); QObject* QAnimationDriver_protectedbase_sender(bool* _dynamic_cast_ok, const void* self); int QAnimationDriver_protectedbase_senderSignalIndex(bool* _dynamic_cast_ok, const void* self); int QAnimationDriver_protectedbase_receivers(bool* _dynamic_cast_ok, const void* self, const char* signal); diff --git a/qt/gen_qabstractbutton.cpp b/qt/gen_qabstractbutton.cpp index a0f058cc..5ce7c0b7 100644 --- a/qt/gen_qabstractbutton.cpp +++ b/qt/gen_qabstractbutton.cpp @@ -48,7 +48,7 @@ void miqt_exec_callback_QAbstractButton_pressed(intptr_t); void miqt_exec_callback_QAbstractButton_released(intptr_t); void miqt_exec_callback_QAbstractButton_clicked(intptr_t); void miqt_exec_callback_QAbstractButton_toggled(intptr_t, bool); -void miqt_exec_callback_QAbstractButton_clicked1(intptr_t, bool); +void miqt_exec_callback_QAbstractButton_clickedWithChecked(intptr_t, bool); void miqt_exec_callback_QAbstractButton_paintEvent(QAbstractButton*, intptr_t, QPaintEvent*); bool miqt_exec_callback_QAbstractButton_hitButton(const QAbstractButton*, intptr_t, QPoint*); void miqt_exec_callback_QAbstractButton_checkStateSet(QAbstractButton*, intptr_t); @@ -1302,18 +1302,18 @@ struct miqt_string QAbstractButton_trUtf83(const char* s, const char* c, int n) return _ms; } -void QAbstractButton_animateClick1(QAbstractButton* self, int msec) { +void QAbstractButton_animateClickWithMsec(QAbstractButton* self, int msec) { self->animateClick(static_cast(msec)); } -void QAbstractButton_clicked1(QAbstractButton* self, bool checked) { +void QAbstractButton_clickedWithChecked(QAbstractButton* self, bool checked) { self->clicked(checked); } -void QAbstractButton_connect_clicked1(QAbstractButton* self, intptr_t slot) { +void QAbstractButton_connect_clickedWithChecked(QAbstractButton* self, intptr_t slot) { MiqtVirtualQAbstractButton::connect(self, static_cast(&QAbstractButton::clicked), self, [=](bool checked) { bool sigval1 = checked; - miqt_exec_callback_QAbstractButton_clicked1(slot, sigval1); + miqt_exec_callback_QAbstractButton_clickedWithChecked(slot, sigval1); }); } diff --git a/qt/gen_qabstractbutton.go b/qt/gen_qabstractbutton.go index 993ed5f3..df80e42f 100644 --- a/qt/gen_qabstractbutton.go +++ b/qt/gen_qabstractbutton.go @@ -322,19 +322,19 @@ func QAbstractButton_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QAbstractButton) AnimateClick1(msec int) { - C.QAbstractButton_animateClick1(this.h, (C.int)(msec)) +func (this *QAbstractButton) AnimateClickWithMsec(msec int) { + C.QAbstractButton_animateClickWithMsec(this.h, (C.int)(msec)) } -func (this *QAbstractButton) Clicked1(checked bool) { - C.QAbstractButton_clicked1(this.h, (C.bool)(checked)) +func (this *QAbstractButton) ClickedWithChecked(checked bool) { + C.QAbstractButton_clickedWithChecked(this.h, (C.bool)(checked)) } -func (this *QAbstractButton) OnClicked1(slot func(checked bool)) { - C.QAbstractButton_connect_clicked1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QAbstractButton) OnClickedWithChecked(slot func(checked bool)) { + C.QAbstractButton_connect_clickedWithChecked(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QAbstractButton_clicked1 -func miqt_exec_callback_QAbstractButton_clicked1(cb C.intptr_t, checked C.bool) { +//export miqt_exec_callback_QAbstractButton_clickedWithChecked +func miqt_exec_callback_QAbstractButton_clickedWithChecked(cb C.intptr_t, checked C.bool) { gofunc, ok := cgo.Handle(cb).Value().(func(checked bool)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qabstractbutton.h b/qt/gen_qabstractbutton.h index f37cfd4a..7613b155 100644 --- a/qt/gen_qabstractbutton.h +++ b/qt/gen_qabstractbutton.h @@ -147,9 +147,9 @@ 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); +void QAbstractButton_animateClickWithMsec(QAbstractButton* self, int msec); +void QAbstractButton_clickedWithChecked(QAbstractButton* self, bool checked); +void QAbstractButton_connect_clickedWithChecked(QAbstractButton* self, intptr_t slot); bool QAbstractButton_override_virtual_paintEvent(void* self, intptr_t slot); void QAbstractButton_virtualbase_paintEvent(void* self, QPaintEvent* e); bool QAbstractButton_override_virtual_hitButton(void* self, intptr_t slot); diff --git a/qt/gen_qabstracteventdispatcher.cpp b/qt/gen_qabstracteventdispatcher.cpp index f6a2f19f..5a439efd 100644 --- a/qt/gen_qabstracteventdispatcher.cpp +++ b/qt/gen_qabstracteventdispatcher.cpp @@ -208,7 +208,7 @@ struct miqt_string QAbstractEventDispatcher_trUtf83(const char* s, const char* c return _ms; } -QAbstractEventDispatcher* QAbstractEventDispatcher_instance1(QThread* thread) { +QAbstractEventDispatcher* QAbstractEventDispatcher_instanceWithThread(QThread* thread) { return QAbstractEventDispatcher::instance(thread); } diff --git a/qt/gen_qabstracteventdispatcher.go b/qt/gen_qabstracteventdispatcher.go index daf0df15..1c3b646f 100644 --- a/qt/gen_qabstracteventdispatcher.go +++ b/qt/gen_qabstracteventdispatcher.go @@ -247,8 +247,8 @@ func QAbstractEventDispatcher_TrUtf83(s string, c string, n int) string { return _ret } -func QAbstractEventDispatcher_Instance1(thread *QThread) *QAbstractEventDispatcher { - return newQAbstractEventDispatcher(C.QAbstractEventDispatcher_instance1(thread.cPointer())) +func QAbstractEventDispatcher_InstanceWithThread(thread *QThread) *QAbstractEventDispatcher { + return newQAbstractEventDispatcher(C.QAbstractEventDispatcher_instanceWithThread(thread.cPointer())) } // Delete this object from C++ memory. diff --git a/qt/gen_qabstracteventdispatcher.h b/qt/gen_qabstracteventdispatcher.h index df656113..022dffbd 100644 --- a/qt/gen_qabstracteventdispatcher.h +++ b/qt/gen_qabstracteventdispatcher.h @@ -70,7 +70,7 @@ 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); +QAbstractEventDispatcher* QAbstractEventDispatcher_instanceWithThread(QThread* thread); void QAbstractEventDispatcher_delete(QAbstractEventDispatcher* self); QAbstractEventDispatcher__TimerInfo* QAbstractEventDispatcher__TimerInfo_new(int id, int i, int t); diff --git a/qt/gen_qabstractitemdelegate.cpp b/qt/gen_qabstractitemdelegate.cpp index b9b56b4d..65c6437a 100644 --- a/qt/gen_qabstractitemdelegate.cpp +++ b/qt/gen_qabstractitemdelegate.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -17,6 +16,7 @@ #include #include #include +#include #include #include #include "gen_qabstractitemdelegate.h" diff --git a/qt/gen_qabstractitemmodel.cpp b/qt/gen_qabstractitemmodel.cpp index 2df648f9..25f67bcd 100644 --- a/qt/gen_qabstractitemmodel.cpp +++ b/qt/gen_qabstractitemmodel.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -19,6 +20,7 @@ #include #include #include +#include #include #include "gen_qabstractitemmodel.h" @@ -30,10 +32,10 @@ void miqt_exec_callback_QAbstractItemModel_dataChanged(intptr_t, QModelIndex*, Q void miqt_exec_callback_QAbstractItemModel_headerDataChanged(intptr_t, int, int, int); void miqt_exec_callback_QAbstractItemModel_layoutChanged(intptr_t); void miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChanged(intptr_t); -void miqt_exec_callback_QAbstractItemModel_dataChanged3(intptr_t, QModelIndex*, QModelIndex*, struct miqt_array /* of int */ ); -void miqt_exec_callback_QAbstractItemModel_layoutChanged1(intptr_t, struct miqt_array /* of QPersistentModelIndex* */ ); +void miqt_exec_callback_QAbstractItemModel_dataChanged2(intptr_t, QModelIndex*, QModelIndex*, struct miqt_array /* of int */ ); +void miqt_exec_callback_QAbstractItemModel_layoutChangedWithParents(intptr_t, struct miqt_array /* of QPersistentModelIndex* */ ); void miqt_exec_callback_QAbstractItemModel_layoutChanged2(intptr_t, struct miqt_array /* of QPersistentModelIndex* */ , int); -void miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChanged1(intptr_t, struct miqt_array /* of QPersistentModelIndex* */ ); +void miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChangedWithParents(intptr_t, struct miqt_array /* of QPersistentModelIndex* */ ); void miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChanged2(intptr_t, struct miqt_array /* of QPersistentModelIndex* */ , int); QModelIndex* miqt_exec_callback_QAbstractItemModel_index(const QAbstractItemModel*, intptr_t, int, int, QModelIndex*); QModelIndex* miqt_exec_callback_QAbstractItemModel_parent(const QAbstractItemModel*, intptr_t, QModelIndex*); @@ -231,7 +233,7 @@ bool QModelIndex_operatorLesser(const QModelIndex* self, QModelIndex* other) { return (*self < *other); } -QVariant* QModelIndex_data1(const QModelIndex* self, int role) { +QVariant* QModelIndex_dataWithRole(const QModelIndex* self, int role) { return new QVariant(self->data(static_cast(role))); } @@ -335,7 +337,7 @@ bool QPersistentModelIndex_isValid(const QPersistentModelIndex* self) { return self->isValid(); } -QVariant* QPersistentModelIndex_data1(const QPersistentModelIndex* self, int role) { +QVariant* QPersistentModelIndex_dataWithRole(const QPersistentModelIndex* self, int role) { return new QVariant(self->data(static_cast(role))); } @@ -1649,7 +1651,7 @@ struct miqt_string QAbstractItemModel_trUtf83(const char* s, const char* c, int return _ms; } -bool QAbstractItemModel_hasIndex3(const QAbstractItemModel* self, int row, int column, QModelIndex* parent) { +bool QAbstractItemModel_hasIndex2(const QAbstractItemModel* self, int row, int column, QModelIndex* parent) { return self->hasIndex(static_cast(row), static_cast(column), *parent); } @@ -1673,7 +1675,7 @@ bool QAbstractItemModel_checkIndex2(const QAbstractItemModel* self, QModelIndex* return self->checkIndex(*index, static_cast(options)); } -void QAbstractItemModel_dataChanged3(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight, struct miqt_array /* of int */ roles) { +void QAbstractItemModel_dataChanged2(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight, struct miqt_array /* of int */ roles) { QVector roles_QList; roles_QList.reserve(roles.len); int* roles_arr = static_cast(roles.data); @@ -1683,7 +1685,7 @@ void QAbstractItemModel_dataChanged3(QAbstractItemModel* self, QModelIndex* topL self->dataChanged(*topLeft, *bottomRight, roles_QList); } -void QAbstractItemModel_connect_dataChanged3(QAbstractItemModel* self, intptr_t slot) { +void QAbstractItemModel_connect_dataChanged2(QAbstractItemModel* self, intptr_t slot) { MiqtVirtualQAbstractItemModel::connect(self, static_cast&)>(&QAbstractItemModel::dataChanged), self, [=](const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector& roles) { const QModelIndex& topLeft_ret = topLeft; // Cast returned reference into pointer @@ -1701,11 +1703,11 @@ void QAbstractItemModel_connect_dataChanged3(QAbstractItemModel* self, intptr_t roles_out.len = roles_ret.length(); roles_out.data = static_cast(roles_arr); struct miqt_array /* of int */ sigval3 = roles_out; - miqt_exec_callback_QAbstractItemModel_dataChanged3(slot, sigval1, sigval2, sigval3); + miqt_exec_callback_QAbstractItemModel_dataChanged2(slot, sigval1, sigval2, sigval3); }); } -void QAbstractItemModel_layoutChanged1(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents) { +void QAbstractItemModel_layoutChangedWithParents(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents) { QList parents_QList; parents_QList.reserve(parents.len); QPersistentModelIndex** parents_arr = static_cast(parents.data); @@ -1715,7 +1717,7 @@ void QAbstractItemModel_layoutChanged1(QAbstractItemModel* self, struct miqt_arr self->layoutChanged(parents_QList); } -void QAbstractItemModel_connect_layoutChanged1(QAbstractItemModel* self, intptr_t slot) { +void QAbstractItemModel_connect_layoutChangedWithParents(QAbstractItemModel* self, intptr_t slot) { MiqtVirtualQAbstractItemModel::connect(self, static_cast&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutChanged), self, [=](const QList& parents) { const QList& parents_ret = parents; // Convert QList<> from C++ memory to manually-managed C memory @@ -1727,7 +1729,7 @@ void QAbstractItemModel_connect_layoutChanged1(QAbstractItemModel* self, intptr_ parents_out.len = parents_ret.length(); parents_out.data = static_cast(parents_arr); struct miqt_array /* of QPersistentModelIndex* */ sigval1 = parents_out; - miqt_exec_callback_QAbstractItemModel_layoutChanged1(slot, sigval1); + miqt_exec_callback_QAbstractItemModel_layoutChangedWithParents(slot, sigval1); }); } @@ -1759,7 +1761,7 @@ void QAbstractItemModel_connect_layoutChanged2(QAbstractItemModel* self, intptr_ }); } -void QAbstractItemModel_layoutAboutToBeChanged1(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents) { +void QAbstractItemModel_layoutAboutToBeChangedWithParents(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents) { QList parents_QList; parents_QList.reserve(parents.len); QPersistentModelIndex** parents_arr = static_cast(parents.data); @@ -1769,7 +1771,7 @@ void QAbstractItemModel_layoutAboutToBeChanged1(QAbstractItemModel* self, struct self->layoutAboutToBeChanged(parents_QList); } -void QAbstractItemModel_connect_layoutAboutToBeChanged1(QAbstractItemModel* self, intptr_t slot) { +void QAbstractItemModel_connect_layoutAboutToBeChangedWithParents(QAbstractItemModel* self, intptr_t slot) { MiqtVirtualQAbstractItemModel::connect(self, static_cast&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutAboutToBeChanged), self, [=](const QList& parents) { const QList& parents_ret = parents; // Convert QList<> from C++ memory to manually-managed C memory @@ -1781,7 +1783,7 @@ void QAbstractItemModel_connect_layoutAboutToBeChanged1(QAbstractItemModel* self parents_out.len = parents_ret.length(); parents_out.data = static_cast(parents_arr); struct miqt_array /* of QPersistentModelIndex* */ sigval1 = parents_out; - miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChanged1(slot, sigval1); + miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChangedWithParents(slot, sigval1); }); } diff --git a/qt/gen_qabstractitemmodel.go b/qt/gen_qabstractitemmodel.go index a2936cd5..e407fde8 100644 --- a/qt/gen_qabstractitemmodel.go +++ b/qt/gen_qabstractitemmodel.go @@ -151,8 +151,8 @@ func (this *QModelIndex) OperatorLesser(other *QModelIndex) bool { return (bool)(C.QModelIndex_operatorLesser(this.h, other.cPointer())) } -func (this *QModelIndex) Data1(role int) *QVariant { - _goptr := newQVariant(C.QModelIndex_data1(this.h, (C.int)(role))) +func (this *QModelIndex) DataWithRole(role int) *QVariant { + _goptr := newQVariant(C.QModelIndex_dataWithRole(this.h, (C.int)(role))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -309,8 +309,8 @@ func (this *QPersistentModelIndex) IsValid() bool { return (bool)(C.QPersistentModelIndex_isValid(this.h)) } -func (this *QPersistentModelIndex) Data1(role int) *QVariant { - _goptr := newQVariant(C.QPersistentModelIndex_data1(this.h, (C.int)(role))) +func (this *QPersistentModelIndex) DataWithRole(role int) *QVariant { + _goptr := newQVariant(C.QPersistentModelIndex_dataWithRole(this.h, (C.int)(role))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -775,8 +775,8 @@ func QAbstractItemModel_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QAbstractItemModel) HasIndex3(row int, column int, parent *QModelIndex) bool { - return (bool)(C.QAbstractItemModel_hasIndex3(this.h, (C.int)(row), (C.int)(column), parent.cPointer())) +func (this *QAbstractItemModel) HasIndex2(row int, column int, parent *QModelIndex) bool { + return (bool)(C.QAbstractItemModel_hasIndex2(this.h, (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QAbstractItemModel) InsertRow2(row int, parent *QModelIndex) bool { @@ -799,21 +799,21 @@ func (this *QAbstractItemModel) CheckIndex2(index *QModelIndex, options QAbstrac return (bool)(C.QAbstractItemModel_checkIndex2(this.h, index.cPointer(), (C.int)(options))) } -func (this *QAbstractItemModel) DataChanged3(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int) { +func (this *QAbstractItemModel) DataChanged2(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int) { roles_CArray := (*[0xffff]C.int)(C.malloc(C.size_t(8 * len(roles)))) defer C.free(unsafe.Pointer(roles_CArray)) for i := range roles { roles_CArray[i] = (C.int)(roles[i]) } roles_ma := C.struct_miqt_array{len: C.size_t(len(roles)), data: unsafe.Pointer(roles_CArray)} - C.QAbstractItemModel_dataChanged3(this.h, topLeft.cPointer(), bottomRight.cPointer(), roles_ma) + C.QAbstractItemModel_dataChanged2(this.h, topLeft.cPointer(), bottomRight.cPointer(), roles_ma) } -func (this *QAbstractItemModel) OnDataChanged3(slot func(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int)) { - C.QAbstractItemModel_connect_dataChanged3(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QAbstractItemModel) OnDataChanged2(slot func(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int)) { + C.QAbstractItemModel_connect_dataChanged2(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QAbstractItemModel_dataChanged3 -func miqt_exec_callback_QAbstractItemModel_dataChanged3(cb C.intptr_t, topLeft *C.QModelIndex, bottomRight *C.QModelIndex, roles C.struct_miqt_array) { +//export miqt_exec_callback_QAbstractItemModel_dataChanged2 +func miqt_exec_callback_QAbstractItemModel_dataChanged2(cb C.intptr_t, topLeft *C.QModelIndex, bottomRight *C.QModelIndex, roles C.struct_miqt_array) { gofunc, ok := cgo.Handle(cb).Value().(func(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -835,21 +835,21 @@ func miqt_exec_callback_QAbstractItemModel_dataChanged3(cb C.intptr_t, topLeft * gofunc(slotval1, slotval2, slotval3) } -func (this *QAbstractItemModel) LayoutChanged1(parents []QPersistentModelIndex) { +func (this *QAbstractItemModel) LayoutChangedWithParents(parents []QPersistentModelIndex) { parents_CArray := (*[0xffff]*C.QPersistentModelIndex)(C.malloc(C.size_t(8 * len(parents)))) defer C.free(unsafe.Pointer(parents_CArray)) for i := range parents { parents_CArray[i] = parents[i].cPointer() } parents_ma := C.struct_miqt_array{len: C.size_t(len(parents)), data: unsafe.Pointer(parents_CArray)} - C.QAbstractItemModel_layoutChanged1(this.h, parents_ma) + C.QAbstractItemModel_layoutChangedWithParents(this.h, parents_ma) } -func (this *QAbstractItemModel) OnLayoutChanged1(slot func(parents []QPersistentModelIndex)) { - C.QAbstractItemModel_connect_layoutChanged1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QAbstractItemModel) OnLayoutChangedWithParents(slot func(parents []QPersistentModelIndex)) { + C.QAbstractItemModel_connect_layoutChangedWithParents(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QAbstractItemModel_layoutChanged1 -func miqt_exec_callback_QAbstractItemModel_layoutChanged1(cb C.intptr_t, parents C.struct_miqt_array) { +//export miqt_exec_callback_QAbstractItemModel_layoutChangedWithParents +func miqt_exec_callback_QAbstractItemModel_layoutChangedWithParents(cb C.intptr_t, parents C.struct_miqt_array) { gofunc, ok := cgo.Handle(cb).Value().(func(parents []QPersistentModelIndex)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -905,21 +905,21 @@ func miqt_exec_callback_QAbstractItemModel_layoutChanged2(cb C.intptr_t, parents gofunc(slotval1, slotval2) } -func (this *QAbstractItemModel) LayoutAboutToBeChanged1(parents []QPersistentModelIndex) { +func (this *QAbstractItemModel) LayoutAboutToBeChangedWithParents(parents []QPersistentModelIndex) { parents_CArray := (*[0xffff]*C.QPersistentModelIndex)(C.malloc(C.size_t(8 * len(parents)))) defer C.free(unsafe.Pointer(parents_CArray)) for i := range parents { parents_CArray[i] = parents[i].cPointer() } parents_ma := C.struct_miqt_array{len: C.size_t(len(parents)), data: unsafe.Pointer(parents_CArray)} - C.QAbstractItemModel_layoutAboutToBeChanged1(this.h, parents_ma) + C.QAbstractItemModel_layoutAboutToBeChangedWithParents(this.h, parents_ma) } -func (this *QAbstractItemModel) OnLayoutAboutToBeChanged1(slot func(parents []QPersistentModelIndex)) { - C.QAbstractItemModel_connect_layoutAboutToBeChanged1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QAbstractItemModel) OnLayoutAboutToBeChangedWithParents(slot func(parents []QPersistentModelIndex)) { + C.QAbstractItemModel_connect_layoutAboutToBeChangedWithParents(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChanged1 -func miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChanged1(cb C.intptr_t, parents C.struct_miqt_array) { +//export miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChangedWithParents +func miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChangedWithParents(cb C.intptr_t, parents C.struct_miqt_array) { gofunc, ok := cgo.Handle(cb).Value().(func(parents []QPersistentModelIndex)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qabstractitemmodel.h b/qt/gen_qabstractitemmodel.h index f0e591d6..4dd52bc1 100644 --- a/qt/gen_qabstractitemmodel.h +++ b/qt/gen_qabstractitemmodel.h @@ -66,7 +66,7 @@ bool QModelIndex_isValid(const QModelIndex* self); bool QModelIndex_operatorEqual(const QModelIndex* self, QModelIndex* other); bool QModelIndex_operatorNotEqual(const QModelIndex* self, QModelIndex* other); bool QModelIndex_operatorLesser(const QModelIndex* self, QModelIndex* other); -QVariant* QModelIndex_data1(const QModelIndex* self, int role); +QVariant* QModelIndex_dataWithRole(const QModelIndex* self, int role); void QModelIndex_delete(QModelIndex* self); QPersistentModelIndex* QPersistentModelIndex_new(); @@ -92,7 +92,7 @@ QVariant* QPersistentModelIndex_data(const QPersistentModelIndex* self); int QPersistentModelIndex_flags(const QPersistentModelIndex* self); QAbstractItemModel* QPersistentModelIndex_model(const QPersistentModelIndex* self); bool QPersistentModelIndex_isValid(const QPersistentModelIndex* self); -QVariant* QPersistentModelIndex_data1(const QPersistentModelIndex* self, int role); +QVariant* QPersistentModelIndex_dataWithRole(const QPersistentModelIndex* self, int role); void QPersistentModelIndex_delete(QPersistentModelIndex* self); QAbstractItemModel* QAbstractItemModel_new(); @@ -156,20 +156,20 @@ 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); +bool QAbstractItemModel_hasIndex2(const QAbstractItemModel* self, int row, int column, QModelIndex* parent); bool QAbstractItemModel_insertRow2(QAbstractItemModel* self, int row, QModelIndex* parent); bool QAbstractItemModel_insertColumn2(QAbstractItemModel* self, int column, QModelIndex* parent); bool QAbstractItemModel_removeRow2(QAbstractItemModel* self, int row, QModelIndex* parent); bool QAbstractItemModel_removeColumn2(QAbstractItemModel* self, int column, QModelIndex* parent); bool QAbstractItemModel_checkIndex2(const QAbstractItemModel* self, QModelIndex* index, int options); -void QAbstractItemModel_dataChanged3(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight, struct miqt_array /* of int */ roles); -void QAbstractItemModel_connect_dataChanged3(QAbstractItemModel* self, intptr_t slot); -void QAbstractItemModel_layoutChanged1(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents); -void QAbstractItemModel_connect_layoutChanged1(QAbstractItemModel* self, intptr_t slot); +void QAbstractItemModel_dataChanged2(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight, struct miqt_array /* of int */ roles); +void QAbstractItemModel_connect_dataChanged2(QAbstractItemModel* self, intptr_t slot); +void QAbstractItemModel_layoutChangedWithParents(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents); +void QAbstractItemModel_connect_layoutChangedWithParents(QAbstractItemModel* self, intptr_t slot); void QAbstractItemModel_layoutChanged2(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents, int hint); void QAbstractItemModel_connect_layoutChanged2(QAbstractItemModel* self, intptr_t slot); -void QAbstractItemModel_layoutAboutToBeChanged1(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents); -void QAbstractItemModel_connect_layoutAboutToBeChanged1(QAbstractItemModel* self, intptr_t slot); +void QAbstractItemModel_layoutAboutToBeChangedWithParents(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents); +void QAbstractItemModel_connect_layoutAboutToBeChangedWithParents(QAbstractItemModel* self, intptr_t slot); void QAbstractItemModel_layoutAboutToBeChanged2(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents, int hint); void QAbstractItemModel_connect_layoutAboutToBeChanged2(QAbstractItemModel* self, intptr_t slot); bool QAbstractItemModel_override_virtual_index(void* self, intptr_t slot); diff --git a/qt/gen_qabstractitemview.cpp b/qt/gen_qabstractitemview.cpp index 77e58f96..edec9ac2 100644 --- a/qt/gen_qabstractitemview.cpp +++ b/qt/gen_qabstractitemview.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qabstractproxymodel.cpp b/qt/gen_qabstractproxymodel.cpp index bf2dd382..17b5ba3a 100644 --- a/qt/gen_qabstractproxymodel.cpp +++ b/qt/gen_qabstractproxymodel.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qabstracttextdocumentlayout.cpp b/qt/gen_qabstracttextdocumentlayout.cpp index 02e0ad4a..356e605f 100644 --- a/qt/gen_qabstracttextdocumentlayout.cpp +++ b/qt/gen_qabstracttextdocumentlayout.cpp @@ -33,7 +33,7 @@ void miqt_exec_callback_QAbstractTextDocumentLayout_update(intptr_t); void miqt_exec_callback_QAbstractTextDocumentLayout_updateBlock(intptr_t, QTextBlock*); void miqt_exec_callback_QAbstractTextDocumentLayout_documentSizeChanged(intptr_t, QSizeF*); void miqt_exec_callback_QAbstractTextDocumentLayout_pageCountChanged(intptr_t, int); -void miqt_exec_callback_QAbstractTextDocumentLayout_update1(intptr_t, QRectF*); +void miqt_exec_callback_QAbstractTextDocumentLayout_updateWithQRectF(intptr_t, QRectF*); void miqt_exec_callback_QAbstractTextDocumentLayout_draw(QAbstractTextDocumentLayout*, intptr_t, QPainter*, QAbstractTextDocumentLayout__PaintContext*); int miqt_exec_callback_QAbstractTextDocumentLayout_hitTest(const QAbstractTextDocumentLayout*, intptr_t, QPointF*, int); int miqt_exec_callback_QAbstractTextDocumentLayout_pageCount(const QAbstractTextDocumentLayout*, intptr_t); @@ -612,16 +612,16 @@ void QAbstractTextDocumentLayout_unregisterHandler2(QAbstractTextDocumentLayout* self->unregisterHandler(static_cast(objectType), component); } -void QAbstractTextDocumentLayout_update1(QAbstractTextDocumentLayout* self, QRectF* param1) { +void QAbstractTextDocumentLayout_updateWithQRectF(QAbstractTextDocumentLayout* self, QRectF* param1) { self->update(*param1); } -void QAbstractTextDocumentLayout_connect_update1(QAbstractTextDocumentLayout* self, intptr_t slot) { +void QAbstractTextDocumentLayout_connect_updateWithQRectF(QAbstractTextDocumentLayout* self, intptr_t slot) { MiqtVirtualQAbstractTextDocumentLayout::connect(self, static_cast(&QAbstractTextDocumentLayout::update), self, [=](const QRectF& param1) { const QRectF& param1_ret = param1; // Cast returned reference into pointer QRectF* sigval1 = const_cast(¶m1_ret); - miqt_exec_callback_QAbstractTextDocumentLayout_update1(slot, sigval1); + miqt_exec_callback_QAbstractTextDocumentLayout_updateWithQRectF(slot, sigval1); }); } diff --git a/qt/gen_qabstracttextdocumentlayout.go b/qt/gen_qabstracttextdocumentlayout.go index 0ed9d6ae..e8d1c985 100644 --- a/qt/gen_qabstracttextdocumentlayout.go +++ b/qt/gen_qabstracttextdocumentlayout.go @@ -289,15 +289,15 @@ func (this *QAbstractTextDocumentLayout) UnregisterHandler2(objectType int, comp C.QAbstractTextDocumentLayout_unregisterHandler2(this.h, (C.int)(objectType), component.cPointer()) } -func (this *QAbstractTextDocumentLayout) Update1(param1 *QRectF) { - C.QAbstractTextDocumentLayout_update1(this.h, param1.cPointer()) +func (this *QAbstractTextDocumentLayout) UpdateWithQRectF(param1 *QRectF) { + C.QAbstractTextDocumentLayout_updateWithQRectF(this.h, param1.cPointer()) } -func (this *QAbstractTextDocumentLayout) OnUpdate1(slot func(param1 *QRectF)) { - C.QAbstractTextDocumentLayout_connect_update1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QAbstractTextDocumentLayout) OnUpdateWithQRectF(slot func(param1 *QRectF)) { + C.QAbstractTextDocumentLayout_connect_updateWithQRectF(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QAbstractTextDocumentLayout_update1 -func miqt_exec_callback_QAbstractTextDocumentLayout_update1(cb C.intptr_t, param1 *C.QRectF) { +//export miqt_exec_callback_QAbstractTextDocumentLayout_updateWithQRectF +func miqt_exec_callback_QAbstractTextDocumentLayout_updateWithQRectF(cb C.intptr_t, param1 *C.QRectF) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 *QRectF)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qabstracttextdocumentlayout.h b/qt/gen_qabstracttextdocumentlayout.h index 03844e72..5bc1027b 100644 --- a/qt/gen_qabstracttextdocumentlayout.h +++ b/qt/gen_qabstracttextdocumentlayout.h @@ -107,8 +107,8 @@ struct miqt_string QAbstractTextDocumentLayout_tr3(const char* s, const char* c, 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); +void QAbstractTextDocumentLayout_updateWithQRectF(QAbstractTextDocumentLayout* self, QRectF* param1); +void QAbstractTextDocumentLayout_connect_updateWithQRectF(QAbstractTextDocumentLayout* self, intptr_t slot); bool QAbstractTextDocumentLayout_override_virtual_draw(void* self, intptr_t slot); void QAbstractTextDocumentLayout_virtualbase_draw(void* self, QPainter* painter, QAbstractTextDocumentLayout__PaintContext* context); bool QAbstractTextDocumentLayout_override_virtual_hitTest(void* self, intptr_t slot); diff --git a/qt/gen_qaccessible.cpp b/qt/gen_qaccessible.cpp index 1c725f78..7bb60ef5 100644 --- a/qt/gen_qaccessible.cpp +++ b/qt/gen_qaccessible.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include "gen_qaccessible.h" diff --git a/qt/gen_qaccessiblewidget.cpp b/qt/gen_qaccessiblewidget.cpp index b8d36279..0ed6cadb 100644 --- a/qt/gen_qaccessiblewidget.cpp +++ b/qt/gen_qaccessiblewidget.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qaction.cpp b/qt/gen_qaction.cpp index 9e19562d..77abf76b 100644 --- a/qt/gen_qaction.cpp +++ b/qt/gen_qaction.cpp @@ -28,7 +28,7 @@ void miqt_exec_callback_QAction_changed(intptr_t); void miqt_exec_callback_QAction_triggered(intptr_t); void miqt_exec_callback_QAction_hovered(intptr_t); void miqt_exec_callback_QAction_toggled(intptr_t, bool); -void miqt_exec_callback_QAction_triggered1(intptr_t, bool); +void miqt_exec_callback_QAction_triggeredWithChecked(intptr_t, bool); bool miqt_exec_callback_QAction_event(QAction*, intptr_t, QEvent*); bool miqt_exec_callback_QAction_eventFilter(QAction*, intptr_t, QObject*, QEvent*); void miqt_exec_callback_QAction_timerEvent(QAction*, intptr_t, QTimerEvent*); @@ -642,18 +642,18 @@ struct miqt_string QAction_trUtf83(const char* s, const char* c, int n) { return _ms; } -bool QAction_showStatusText1(QAction* self, QWidget* widget) { +bool QAction_showStatusTextWithWidget(QAction* self, QWidget* widget) { return self->showStatusText(widget); } -void QAction_triggered1(QAction* self, bool checked) { +void QAction_triggeredWithChecked(QAction* self, bool checked) { self->triggered(checked); } -void QAction_connect_triggered1(QAction* self, intptr_t slot) { +void QAction_connect_triggeredWithChecked(QAction* self, intptr_t slot) { MiqtVirtualQAction::connect(self, static_cast(&QAction::triggered), self, [=](bool checked) { bool sigval1 = checked; - miqt_exec_callback_QAction_triggered1(slot, sigval1); + miqt_exec_callback_QAction_triggeredWithChecked(slot, sigval1); }); } diff --git a/qt/gen_qaction.go b/qt/gen_qaction.go index e9053021..9617ed34 100644 --- a/qt/gen_qaction.go +++ b/qt/gen_qaction.go @@ -565,19 +565,19 @@ func QAction_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QAction) ShowStatusText1(widget *QWidget) bool { - return (bool)(C.QAction_showStatusText1(this.h, widget.cPointer())) +func (this *QAction) ShowStatusTextWithWidget(widget *QWidget) bool { + return (bool)(C.QAction_showStatusTextWithWidget(this.h, widget.cPointer())) } -func (this *QAction) Triggered1(checked bool) { - C.QAction_triggered1(this.h, (C.bool)(checked)) +func (this *QAction) TriggeredWithChecked(checked bool) { + C.QAction_triggeredWithChecked(this.h, (C.bool)(checked)) } -func (this *QAction) OnTriggered1(slot func(checked bool)) { - C.QAction_connect_triggered1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QAction) OnTriggeredWithChecked(slot func(checked bool)) { + C.QAction_connect_triggeredWithChecked(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QAction_triggered1 -func miqt_exec_callback_QAction_triggered1(cb C.intptr_t, checked C.bool) { +//export miqt_exec_callback_QAction_triggeredWithChecked +func miqt_exec_callback_QAction_triggeredWithChecked(cb C.intptr_t, checked C.bool) { gofunc, ok := cgo.Handle(cb).Value().(func(checked bool)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qaction.h b/qt/gen_qaction.h index 6c5dea13..86321dd0 100644 --- a/qt/gen_qaction.h +++ b/qt/gen_qaction.h @@ -128,9 +128,9 @@ 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); +bool QAction_showStatusTextWithWidget(QAction* self, QWidget* widget); +void QAction_triggeredWithChecked(QAction* self, bool checked); +void QAction_connect_triggeredWithChecked(QAction* self, intptr_t slot); bool QAction_override_virtual_event(void* self, intptr_t slot); bool QAction_virtualbase_event(void* self, QEvent* param1); bool QAction_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt/gen_qarraydata.cpp b/qt/gen_qarraydata.cpp index f0a54a8f..061d4b3a 100644 --- a/qt/gen_qarraydata.cpp +++ b/qt/gen_qarraydata.cpp @@ -52,11 +52,11 @@ QArrayData* QArrayData_sharedNull() { return QArrayData::sharedNull(); } -QArrayData* QArrayData_allocate4(size_t objectSize, size_t alignment, size_t capacity, int options) { +QArrayData* QArrayData_allocate2(size_t objectSize, size_t alignment, size_t capacity, int options) { return QArrayData::allocate(static_cast(objectSize), static_cast(alignment), static_cast(capacity), static_cast(options)); } -QArrayData* QArrayData_reallocateUnaligned4(QArrayData* data, size_t objectSize, size_t newCapacity, int newOptions) { +QArrayData* QArrayData_reallocateUnaligned2(QArrayData* data, size_t objectSize, size_t newCapacity, int newOptions) { return QArrayData::reallocateUnaligned(data, static_cast(objectSize), static_cast(newCapacity), static_cast(newOptions)); } diff --git a/qt/gen_qarraydata.go b/qt/gen_qarraydata.go index a586edfa..f1df2572 100644 --- a/qt/gen_qarraydata.go +++ b/qt/gen_qarraydata.go @@ -104,12 +104,12 @@ func QArrayData_SharedNull() *QArrayData { return newQArrayData(C.QArrayData_sharedNull()) } -func QArrayData_Allocate4(objectSize uint64, alignment uint64, capacity uint64, options QArrayData__AllocationOption) *QArrayData { - return newQArrayData(C.QArrayData_allocate4((C.size_t)(objectSize), (C.size_t)(alignment), (C.size_t)(capacity), (C.int)(options))) +func QArrayData_Allocate2(objectSize uint64, alignment uint64, capacity uint64, options QArrayData__AllocationOption) *QArrayData { + return newQArrayData(C.QArrayData_allocate2((C.size_t)(objectSize), (C.size_t)(alignment), (C.size_t)(capacity), (C.int)(options))) } -func QArrayData_ReallocateUnaligned4(data *QArrayData, objectSize uint64, newCapacity uint64, newOptions QArrayData__AllocationOption) *QArrayData { - return newQArrayData(C.QArrayData_reallocateUnaligned4(data.cPointer(), (C.size_t)(objectSize), (C.size_t)(newCapacity), (C.int)(newOptions))) +func QArrayData_ReallocateUnaligned2(data *QArrayData, objectSize uint64, newCapacity uint64, newOptions QArrayData__AllocationOption) *QArrayData { + return newQArrayData(C.QArrayData_reallocateUnaligned2(data.cPointer(), (C.size_t)(objectSize), (C.size_t)(newCapacity), (C.int)(newOptions))) } // Delete this object from C++ memory. diff --git a/qt/gen_qarraydata.h b/qt/gen_qarraydata.h index cab6d8b8..fdfc5a06 100644 --- a/qt/gen_qarraydata.h +++ b/qt/gen_qarraydata.h @@ -30,8 +30,8 @@ QArrayData* QArrayData_allocate(size_t objectSize, size_t alignment, size_t capa QArrayData* QArrayData_reallocateUnaligned(QArrayData* data, size_t objectSize, size_t newCapacity); void QArrayData_deallocate(QArrayData* data, size_t objectSize, size_t alignment); QArrayData* QArrayData_sharedNull(); -QArrayData* QArrayData_allocate4(size_t objectSize, size_t alignment, size_t capacity, int options); -QArrayData* QArrayData_reallocateUnaligned4(QArrayData* data, size_t objectSize, size_t newCapacity, int newOptions); +QArrayData* QArrayData_allocate2(size_t objectSize, size_t alignment, size_t capacity, int options); +QArrayData* QArrayData_reallocateUnaligned2(QArrayData* data, size_t objectSize, size_t newCapacity, int newOptions); void QArrayData_delete(QArrayData* self); #ifdef __cplusplus diff --git a/qt/gen_qbitarray.cpp b/qt/gen_qbitarray.cpp index b64ba80e..de3035f1 100644 --- a/qt/gen_qbitarray.cpp +++ b/qt/gen_qbitarray.cpp @@ -151,7 +151,7 @@ QBitArray* QBitArray_fromBits(const char* data, ptrdiff_t len) { return new QBitArray(QBitArray::fromBits(data, (qsizetype)(len))); } -bool QBitArray_fill22(QBitArray* self, bool val, int size) { +bool QBitArray_fill3(QBitArray* self, bool val, int size) { return self->fill(val, static_cast(size)); } diff --git a/qt/gen_qbitarray.go b/qt/gen_qbitarray.go index e532db5b..37e6a294 100644 --- a/qt/gen_qbitarray.go +++ b/qt/gen_qbitarray.go @@ -202,8 +202,8 @@ func QBitArray_FromBits(data string, lenVal int64) *QBitArray { return _goptr } -func (this *QBitArray) Fill22(val bool, size int) bool { - return (bool)(C.QBitArray_fill22(this.h, (C.bool)(val), (C.int)(size))) +func (this *QBitArray) Fill3(val bool, size int) bool { + return (bool)(C.QBitArray_fill3(this.h, (C.bool)(val), (C.int)(size))) } // Delete this object from C++ memory. diff --git a/qt/gen_qbitarray.h b/qt/gen_qbitarray.h index d9c735d5..08c572c7 100644 --- a/qt/gen_qbitarray.h +++ b/qt/gen_qbitarray.h @@ -57,7 +57,7 @@ void QBitArray_fill2(QBitArray* self, bool val, int first, int last); void QBitArray_truncate(QBitArray* self, int pos); const char* QBitArray_bits(const QBitArray* self); QBitArray* QBitArray_fromBits(const char* data, ptrdiff_t len); -bool QBitArray_fill22(QBitArray* self, bool val, int size); +bool QBitArray_fill3(QBitArray* self, bool val, int size); void QBitArray_delete(QBitArray* self); QBitRef* QBitRef_new(QBitRef* param1); diff --git a/qt/gen_qbitmap.cpp b/qt/gen_qbitmap.cpp index 3264fbc9..e3f82da3 100644 --- a/qt/gen_qbitmap.cpp +++ b/qt/gen_qbitmap.cpp @@ -225,7 +225,7 @@ QBitmap* QBitmap_fromImage2(QImage* image, int flags) { return new QBitmap(QBitmap::fromImage(*image, static_cast(flags))); } -QBitmap* QBitmap_fromData3(QSize* size, const unsigned char* bits, int monoFormat) { +QBitmap* QBitmap_fromData2(QSize* size, const unsigned char* bits, int monoFormat) { return new QBitmap(QBitmap::fromData(*size, static_cast(bits), static_cast(monoFormat))); } diff --git a/qt/gen_qbitmap.go b/qt/gen_qbitmap.go index 5c52a490..4b361403 100644 --- a/qt/gen_qbitmap.go +++ b/qt/gen_qbitmap.go @@ -154,8 +154,8 @@ func QBitmap_FromImage2(image *QImage, flags ImageConversionFlag) *QBitmap { return _goptr } -func QBitmap_FromData3(size *QSize, bits *byte, monoFormat QImage__Format) *QBitmap { - _goptr := newQBitmap(C.QBitmap_fromData3(size.cPointer(), (*C.uchar)(unsafe.Pointer(bits)), (C.int)(monoFormat))) +func QBitmap_FromData2(size *QSize, bits *byte, monoFormat QImage__Format) *QBitmap { + _goptr := newQBitmap(C.QBitmap_fromData2(size.cPointer(), (*C.uchar)(unsafe.Pointer(bits)), (C.int)(monoFormat))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qbitmap.h b/qt/gen_qbitmap.h index 49a72b29..231c47ca 100644 --- a/qt/gen_qbitmap.h +++ b/qt/gen_qbitmap.h @@ -58,7 +58,7 @@ QBitmap* QBitmap_fromData(QSize* size, const unsigned char* bits); QBitmap* QBitmap_transformed(const QBitmap* self, QMatrix* param1); QBitmap* QBitmap_transformedWithMatrix(const QBitmap* self, QTransform* matrix); QBitmap* QBitmap_fromImage2(QImage* image, int flags); -QBitmap* QBitmap_fromData3(QSize* size, const unsigned char* bits, int monoFormat); +QBitmap* QBitmap_fromData2(QSize* size, const unsigned char* bits, int monoFormat); bool QBitmap_override_virtual_devType(void* self, intptr_t slot); int QBitmap_virtualbase_devType(const void* self); bool QBitmap_override_virtual_paintEngine(void* self, intptr_t slot); diff --git a/qt/gen_qboxlayout.cpp b/qt/gen_qboxlayout.cpp index 1cd1a6cc..3537572d 100644 --- a/qt/gen_qboxlayout.cpp +++ b/qt/gen_qboxlayout.cpp @@ -836,7 +836,7 @@ struct miqt_string QBoxLayout_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QBoxLayout_addStretch1(QBoxLayout* self, int stretch) { +void QBoxLayout_addStretchWithStretch(QBoxLayout* self, int stretch) { self->addStretch(static_cast(stretch)); } @@ -856,15 +856,15 @@ void QBoxLayout_insertStretch2(QBoxLayout* self, int index, int stretch) { self->insertStretch(static_cast(index), static_cast(stretch)); } -void QBoxLayout_insertWidget3(QBoxLayout* self, int index, QWidget* widget, int stretch) { +void QBoxLayout_insertWidget2(QBoxLayout* self, int index, QWidget* widget, int stretch) { self->insertWidget(static_cast(index), widget, static_cast(stretch)); } -void QBoxLayout_insertWidget4(QBoxLayout* self, int index, QWidget* widget, int stretch, int alignment) { +void QBoxLayout_insertWidget3(QBoxLayout* self, int index, QWidget* widget, int stretch, int alignment) { self->insertWidget(static_cast(index), widget, static_cast(stretch), static_cast(alignment)); } -void QBoxLayout_insertLayout3(QBoxLayout* self, int index, QLayout* layout, int stretch) { +void QBoxLayout_insertLayout2(QBoxLayout* self, int index, QLayout* layout, int stretch) { self->insertLayout(static_cast(index), layout, static_cast(stretch)); } diff --git a/qt/gen_qboxlayout.go b/qt/gen_qboxlayout.go index 3929d75f..e8ce86dc 100644 --- a/qt/gen_qboxlayout.go +++ b/qt/gen_qboxlayout.go @@ -283,8 +283,8 @@ func QBoxLayout_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QBoxLayout) AddStretch1(stretch int) { - C.QBoxLayout_addStretch1(this.h, (C.int)(stretch)) +func (this *QBoxLayout) AddStretchWithStretch(stretch int) { + C.QBoxLayout_addStretchWithStretch(this.h, (C.int)(stretch)) } func (this *QBoxLayout) AddWidget2(param1 *QWidget, stretch int) { @@ -303,16 +303,16 @@ func (this *QBoxLayout) InsertStretch2(index int, stretch int) { C.QBoxLayout_insertStretch2(this.h, (C.int)(index), (C.int)(stretch)) } -func (this *QBoxLayout) InsertWidget3(index int, widget *QWidget, stretch int) { - C.QBoxLayout_insertWidget3(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch)) +func (this *QBoxLayout) InsertWidget2(index int, widget *QWidget, stretch int) { + C.QBoxLayout_insertWidget2(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch)) } -func (this *QBoxLayout) InsertWidget4(index int, widget *QWidget, stretch int, alignment AlignmentFlag) { - C.QBoxLayout_insertWidget4(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch), (C.int)(alignment)) +func (this *QBoxLayout) InsertWidget3(index int, widget *QWidget, stretch int, alignment AlignmentFlag) { + C.QBoxLayout_insertWidget3(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch), (C.int)(alignment)) } -func (this *QBoxLayout) InsertLayout3(index int, layout *QLayout, stretch int) { - C.QBoxLayout_insertLayout3(this.h, (C.int)(index), layout.cPointer(), (C.int)(stretch)) +func (this *QBoxLayout) InsertLayout2(index int, layout *QLayout, stretch int) { + C.QBoxLayout_insertLayout2(this.h, (C.int)(index), layout.cPointer(), (C.int)(stretch)) } // WidgetEvent can only be called from a QBoxLayout that was directly constructed. diff --git a/qt/gen_qboxlayout.h b/qt/gen_qboxlayout.h index b543dea6..71e07ded 100644 --- a/qt/gen_qboxlayout.h +++ b/qt/gen_qboxlayout.h @@ -92,14 +92,14 @@ 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_addStretchWithStretch(QBoxLayout* self, int stretch); void QBoxLayout_addWidget2(QBoxLayout* self, QWidget* param1, int stretch); void QBoxLayout_addWidget3(QBoxLayout* self, QWidget* param1, int stretch, int alignment); void QBoxLayout_addLayout2(QBoxLayout* self, QLayout* layout, int stretch); void QBoxLayout_insertStretch2(QBoxLayout* self, int index, int stretch); -void QBoxLayout_insertWidget3(QBoxLayout* self, int index, QWidget* widget, int stretch); -void QBoxLayout_insertWidget4(QBoxLayout* self, int index, QWidget* widget, int stretch, int alignment); -void QBoxLayout_insertLayout3(QBoxLayout* self, int index, QLayout* layout, int stretch); +void QBoxLayout_insertWidget2(QBoxLayout* self, int index, QWidget* widget, int stretch); +void QBoxLayout_insertWidget3(QBoxLayout* self, int index, QWidget* widget, int stretch, int alignment); +void QBoxLayout_insertLayout2(QBoxLayout* self, int index, QLayout* layout, int stretch); bool QBoxLayout_override_virtual_addItem(void* self, intptr_t slot); void QBoxLayout_virtualbase_addItem(void* self, QLayoutItem* param1); bool QBoxLayout_override_virtual_sizeHint(void* self, intptr_t slot); diff --git a/qt/gen_qbrush.cpp b/qt/gen_qbrush.cpp index 52165399..50bcbbfa 100644 --- a/qt/gen_qbrush.cpp +++ b/qt/gen_qbrush.cpp @@ -6,7 +6,6 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QGradient__QGradientData #include #include -#include #include #include #include @@ -14,6 +13,7 @@ #include #include #include +#include #include #include "gen_qbrush.h" diff --git a/qt/gen_qbytearraymatcher.cpp b/qt/gen_qbytearraymatcher.cpp index f8da517d..58ba4190 100644 --- a/qt/gen_qbytearraymatcher.cpp +++ b/qt/gen_qbytearraymatcher.cpp @@ -56,12 +56,12 @@ struct miqt_string QByteArrayMatcher_pattern(const QByteArrayMatcher* self) { return _ms; } -int QByteArrayMatcher_indexIn22(const QByteArrayMatcher* self, struct miqt_string ba, int from) { +int QByteArrayMatcher_indexIn3(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 len, int from) { +int QByteArrayMatcher_indexIn4(const QByteArrayMatcher* self, const char* str, int len, int from) { return self->indexIn(str, static_cast(len), static_cast(from)); } diff --git a/qt/gen_qbytearraymatcher.go b/qt/gen_qbytearraymatcher.go index d20348d6..d6c4eb25 100644 --- a/qt/gen_qbytearraymatcher.go +++ b/qt/gen_qbytearraymatcher.go @@ -117,7 +117,7 @@ func (this *QByteArrayMatcher) Pattern() []byte { return _ret } -func (this *QByteArrayMatcher) IndexIn22(ba []byte, from int) int { +func (this *QByteArrayMatcher) IndexIn3(ba []byte, from int) int { ba_alias := C.struct_miqt_string{} if len(ba) > 0 { ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) @@ -125,13 +125,13 @@ func (this *QByteArrayMatcher) IndexIn22(ba []byte, from int) int { ba_alias.data = (*C.char)(unsafe.Pointer(nil)) } ba_alias.len = C.size_t(len(ba)) - return (int)(C.QByteArrayMatcher_indexIn22(this.h, ba_alias, (C.int)(from))) + return (int)(C.QByteArrayMatcher_indexIn3(this.h, ba_alias, (C.int)(from))) } -func (this *QByteArrayMatcher) IndexIn3(str string, lenVal int, from int) int { +func (this *QByteArrayMatcher) IndexIn4(str string, lenVal int, from int) int { str_Cstring := C.CString(str) defer C.free(unsafe.Pointer(str_Cstring)) - return (int)(C.QByteArrayMatcher_indexIn3(this.h, str_Cstring, (C.int)(lenVal), (C.int)(from))) + return (int)(C.QByteArrayMatcher_indexIn4(this.h, str_Cstring, (C.int)(lenVal), (C.int)(from))) } // Delete this object from C++ memory. diff --git a/qt/gen_qbytearraymatcher.h b/qt/gen_qbytearraymatcher.h index 553e5cb3..8d107656 100644 --- a/qt/gen_qbytearraymatcher.h +++ b/qt/gen_qbytearraymatcher.h @@ -31,8 +31,8 @@ void QByteArrayMatcher_setPattern(QByteArrayMatcher* self, struct miqt_string pa int QByteArrayMatcher_indexIn(const QByteArrayMatcher* self, struct miqt_string ba); int QByteArrayMatcher_indexIn2(const QByteArrayMatcher* self, const char* str, int len); 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 len, int from); +int QByteArrayMatcher_indexIn3(const QByteArrayMatcher* self, struct miqt_string ba, int from); +int QByteArrayMatcher_indexIn4(const QByteArrayMatcher* self, const char* str, int len, int from); void QByteArrayMatcher_delete(QByteArrayMatcher* self); void QStaticByteArrayMatcherBase_delete(QStaticByteArrayMatcherBase* self); diff --git a/qt/gen_qcalendar.cpp b/qt/gen_qcalendar.cpp index bc1ec3e1..cd625404 100644 --- a/qt/gen_qcalendar.cpp +++ b/qt/gen_qcalendar.cpp @@ -180,7 +180,7 @@ 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_monthName2(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(); @@ -191,7 +191,7 @@ struct miqt_string QCalendar_monthName3(const QCalendar* self, QLocale* locale, return _ms; } -struct miqt_string QCalendar_monthName4(const QCalendar* self, QLocale* locale, int month, int year, int format) { +struct miqt_string QCalendar_monthName3(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(); @@ -202,7 +202,7 @@ struct miqt_string QCalendar_monthName4(const QCalendar* self, QLocale* locale, return _ms; } -struct miqt_string QCalendar_standaloneMonthName3(const QCalendar* self, QLocale* locale, int month, int year) { +struct miqt_string QCalendar_standaloneMonthName2(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(); @@ -213,7 +213,7 @@ struct miqt_string QCalendar_standaloneMonthName3(const QCalendar* self, QLocale return _ms; } -struct miqt_string QCalendar_standaloneMonthName4(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, 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(); @@ -224,7 +224,7 @@ struct miqt_string QCalendar_standaloneMonthName4(const QCalendar* self, QLocale return _ms; } -struct miqt_string QCalendar_weekDayName3(const QCalendar* self, QLocale* locale, int day, int format) { +struct miqt_string QCalendar_weekDayName2(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(); @@ -235,7 +235,7 @@ struct miqt_string QCalendar_weekDayName3(const QCalendar* self, QLocale* locale return _ms; } -struct miqt_string QCalendar_standaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, int format) { +struct miqt_string QCalendar_standaloneWeekDayName2(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(); diff --git a/qt/gen_qcalendar.go b/qt/gen_qcalendar.go index b90df759..76f0a4a7 100644 --- a/qt/gen_qcalendar.go +++ b/qt/gen_qcalendar.go @@ -209,43 +209,43 @@ func (this *QCalendar) DaysInMonth2(month int, year int) int { return (int)(C.QCalendar_daysInMonth2(this.h, (C.int)(month), (C.int)(year))) } -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)) +func (this *QCalendar) MonthName2(locale *QLocale, month int, year int) string { + var _ms C.struct_miqt_string = C.QCalendar_monthName2(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)) +func (this *QCalendar) MonthName3(locale *QLocale, month int, year int, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QCalendar_monthName3(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)) +func (this *QCalendar) StandaloneMonthName2(locale *QLocale, month int, year int) string { + var _ms C.struct_miqt_string = C.QCalendar_standaloneMonthName2(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)) +func (this *QCalendar) StandaloneMonthName3(locale *QLocale, month int, year int, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QCalendar_standaloneMonthName3(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)) +func (this *QCalendar) WeekDayName2(locale *QLocale, day int, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QCalendar_weekDayName2(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)) +func (this *QCalendar) StandaloneWeekDayName2(locale *QLocale, day int, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QCalendar_standaloneWeekDayName2(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 b997916b..65a72ac7 100644 --- a/qt/gen_qcalendar.h +++ b/qt/gen_qcalendar.h @@ -58,12 +58,12 @@ struct miqt_string QCalendar_weekDayName(const QCalendar* self, QLocale* locale, struct miqt_string QCalendar_standaloneWeekDayName(const QCalendar* self, QLocale* locale, int day); struct miqt_array /* of struct miqt_string */ 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_monthName2(const QCalendar* self, QLocale* locale, int month, int year); +struct miqt_string QCalendar_monthName3(const QCalendar* self, QLocale* locale, int month, int year, int format); +struct miqt_string QCalendar_standaloneMonthName2(const QCalendar* self, QLocale* locale, int month, int year); +struct miqt_string QCalendar_standaloneMonthName3(const QCalendar* self, QLocale* locale, int month, int year, int format); +struct miqt_string QCalendar_weekDayName2(const QCalendar* self, QLocale* locale, int day, int format); +struct miqt_string QCalendar_standaloneWeekDayName2(const QCalendar* self, QLocale* locale, int day, int format); void QCalendar_delete(QCalendar* self); QCalendar__YearMonthDay* QCalendar__YearMonthDay_new(); diff --git a/qt/gen_qchar.cpp b/qt/gen_qchar.cpp index d095c503..a53580ea 100644 --- a/qt/gen_qchar.cpp +++ b/qt/gen_qchar.cpp @@ -26,9 +26,9 @@ char QLatin1Char_toLatin1(const QLatin1Char* self) { return self->toLatin1(); } -uint16_t QLatin1Char_unicode(const QLatin1Char* self) { +unsigned short QLatin1Char_unicode(const QLatin1Char* self) { ushort _ret = self->unicode(); - return static_cast(_ret); + return static_cast(_ret); } void QLatin1Char_delete(QLatin1Char* self) { @@ -39,7 +39,7 @@ QChar* QChar_new() { return new QChar(); } -QChar* QChar_new2(uint16_t rc) { +QChar* QChar_new2(unsigned short rc) { return new QChar(static_cast(rc)); } @@ -47,7 +47,7 @@ QChar* QChar_new3(unsigned char c, unsigned char r) { return new QChar(static_cast(c), static_cast(r)); } -QChar* QChar_new4(int16_t rc) { +QChar* QChar_new4(short rc) { return new QChar(static_cast(rc)); } @@ -161,9 +161,9 @@ char QChar_toLatin1(const QChar* self) { return self->toLatin1(); } -uint16_t QChar_unicode(const QChar* self) { +unsigned short QChar_unicode(const QChar* self) { ushort _ret = self->unicode(); - return static_cast(_ret); + return static_cast(_ret); } QChar* QChar_fromLatin1(char c) { @@ -276,7 +276,7 @@ bool QChar_requiresSurrogates(unsigned int ucs4) { return QChar::requiresSurrogates(static_cast(ucs4)); } -unsigned int QChar_surrogateToUcs4(uint16_t high, uint16_t low) { +unsigned int QChar_surrogateToUcs4(unsigned short high, unsigned short low) { uint _ret = QChar::surrogateToUcs4(static_cast(high), static_cast(low)); return static_cast(_ret); } @@ -286,14 +286,14 @@ unsigned int QChar_surrogateToUcs42(QChar* high, QChar* low) { return static_cast(_ret); } -uint16_t QChar_highSurrogate(unsigned int ucs4) { +unsigned short QChar_highSurrogate(unsigned int ucs4) { ushort _ret = QChar::highSurrogate(static_cast(ucs4)); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QChar_lowSurrogate(unsigned int ucs4) { +unsigned short QChar_lowSurrogate(unsigned int ucs4) { ushort _ret = QChar::lowSurrogate(static_cast(ucs4)); - return static_cast(_ret); + return static_cast(_ret); } int QChar_categoryWithUcs4(unsigned int ucs4) { diff --git a/qt/gen_qchar.go b/qt/gen_qchar.go index 1798880a..ff420824 100644 --- a/qt/gen_qchar.go +++ b/qt/gen_qchar.go @@ -462,7 +462,7 @@ func NewQChar() *QChar { // NewQChar2 constructs a new QChar object. func NewQChar2(rc uint16) *QChar { - return newQChar(C.QChar_new2((C.uint16_t)(rc))) + return newQChar(C.QChar_new2((C.ushort)(rc))) } // NewQChar3 constructs a new QChar object. @@ -474,7 +474,7 @@ func NewQChar3(c byte, r byte) *QChar { // NewQChar4 constructs a new QChar object. func NewQChar4(rc int16) *QChar { - return newQChar(C.QChar_new4((C.int16_t)(rc))) + return newQChar(C.QChar_new4((C.short)(rc))) } // NewQChar5 constructs a new QChar object. @@ -715,7 +715,7 @@ func QChar_RequiresSurrogates(ucs4 uint) bool { } func QChar_SurrogateToUcs4(high uint16, low uint16) uint { - return (uint)(C.QChar_surrogateToUcs4((C.uint16_t)(high), (C.uint16_t)(low))) + return (uint)(C.QChar_surrogateToUcs4((C.ushort)(high), (C.ushort)(low))) } func QChar_SurrogateToUcs42(high QChar, low QChar) uint { diff --git a/qt/gen_qchar.h b/qt/gen_qchar.h index cc672906..f8e98cb7 100644 --- a/qt/gen_qchar.h +++ b/qt/gen_qchar.h @@ -25,13 +25,13 @@ typedef struct QLatin1Char QLatin1Char; QLatin1Char* QLatin1Char_new(char c); QLatin1Char* QLatin1Char_new2(QLatin1Char* param1); char QLatin1Char_toLatin1(const QLatin1Char* self); -uint16_t QLatin1Char_unicode(const QLatin1Char* self); +unsigned short QLatin1Char_unicode(const QLatin1Char* self); void QLatin1Char_delete(QLatin1Char* self); QChar* QChar_new(); -QChar* QChar_new2(uint16_t rc); +QChar* QChar_new2(unsigned short rc); QChar* QChar_new3(unsigned char c, unsigned char r); -QChar* QChar_new4(int16_t rc); +QChar* QChar_new4(short rc); QChar* QChar_new5(unsigned int rc); QChar* QChar_new6(int rc); QChar* QChar_new7(int s); @@ -56,7 +56,7 @@ QChar* QChar_toCaseFolded(const QChar* self); int QChar_script(const QChar* self); int QChar_unicodeVersion(const QChar* self); char QChar_toLatin1(const QChar* self); -uint16_t QChar_unicode(const QChar* self); +unsigned short QChar_unicode(const QChar* self); QChar* QChar_fromLatin1(char c); bool QChar_isNull(const QChar* self); bool QChar_isPrint(const QChar* self); @@ -84,10 +84,10 @@ bool QChar_isHighSurrogateWithUcs4(unsigned int ucs4); bool QChar_isLowSurrogateWithUcs4(unsigned int ucs4); bool QChar_isSurrogateWithUcs4(unsigned int ucs4); bool QChar_requiresSurrogates(unsigned int ucs4); -unsigned int QChar_surrogateToUcs4(uint16_t high, uint16_t low); +unsigned int QChar_surrogateToUcs4(unsigned short high, unsigned short low); unsigned int QChar_surrogateToUcs42(QChar* high, QChar* low); -uint16_t QChar_highSurrogate(unsigned int ucs4); -uint16_t QChar_lowSurrogate(unsigned int ucs4); +unsigned short QChar_highSurrogate(unsigned int ucs4); +unsigned short QChar_lowSurrogate(unsigned int ucs4); int QChar_categoryWithUcs4(unsigned int ucs4); int QChar_directionWithUcs4(unsigned int ucs4); int QChar_joiningTypeWithUcs4(unsigned int ucs4); diff --git a/qt/gen_qcheckbox.cpp b/qt/gen_qcheckbox.cpp index 4b380de5..9d68ed92 100644 --- a/qt/gen_qcheckbox.cpp +++ b/qt/gen_qcheckbox.cpp @@ -1196,7 +1196,7 @@ struct miqt_string QCheckBox_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QCheckBox_setTristate1(QCheckBox* self, bool y) { +void QCheckBox_setTristateWithBool(QCheckBox* self, bool y) { self->setTristate(y); } diff --git a/qt/gen_qcheckbox.go b/qt/gen_qcheckbox.go index 26f8012e..20186efa 100644 --- a/qt/gen_qcheckbox.go +++ b/qt/gen_qcheckbox.go @@ -202,8 +202,8 @@ func QCheckBox_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QCheckBox) SetTristate1(y bool) { - C.QCheckBox_setTristate1(this.h, (C.bool)(y)) +func (this *QCheckBox) SetTristateWithBool(y bool) { + C.QCheckBox_setTristateWithBool(this.h, (C.bool)(y)) } // InitStyleOption can only be called from a QCheckBox that was directly constructed. diff --git a/qt/gen_qcheckbox.h b/qt/gen_qcheckbox.h index cb79e777..b500d131 100644 --- a/qt/gen_qcheckbox.h +++ b/qt/gen_qcheckbox.h @@ -113,7 +113,7 @@ 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_setTristateWithBool(QCheckBox* self, bool y); bool QCheckBox_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QCheckBox_virtualbase_sizeHint(const void* self); bool QCheckBox_override_virtual_minimumSizeHint(void* self, intptr_t slot); diff --git a/qt/gen_qclipboard.cpp b/qt/gen_qclipboard.cpp index 27eec2d2..49d1c4db 100644 --- a/qt/gen_qclipboard.cpp +++ b/qt/gen_qclipboard.cpp @@ -219,11 +219,11 @@ struct miqt_string QClipboard_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QClipboard_clear1(QClipboard* self, int mode) { +void QClipboard_clearWithMode(QClipboard* self, int mode) { self->clear(static_cast(mode)); } -struct miqt_string QClipboard_text1(const QClipboard* self, int mode) { +struct miqt_string QClipboard_textWithMode(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(); @@ -251,7 +251,7 @@ void QClipboard_setText2(QClipboard* self, struct miqt_string param1, int mode) self->setText(param1_QString, static_cast(mode)); } -QMimeData* QClipboard_mimeData1(const QClipboard* self, int mode) { +QMimeData* QClipboard_mimeDataWithMode(const QClipboard* self, int mode) { return (QMimeData*) self->mimeData(static_cast(mode)); } @@ -259,11 +259,11 @@ void QClipboard_setMimeData2(QClipboard* self, QMimeData* data, int mode) { self->setMimeData(data, static_cast(mode)); } -QImage* QClipboard_image1(const QClipboard* self, int mode) { +QImage* QClipboard_imageWithMode(const QClipboard* self, int mode) { return new QImage(self->image(static_cast(mode))); } -QPixmap* QClipboard_pixmap1(const QClipboard* self, int mode) { +QPixmap* QClipboard_pixmapWithMode(const QClipboard* self, int mode) { return new QPixmap(self->pixmap(static_cast(mode))); } diff --git a/qt/gen_qclipboard.go b/qt/gen_qclipboard.go index e2aae65f..a9ce6c59 100644 --- a/qt/gen_qclipboard.go +++ b/qt/gen_qclipboard.go @@ -279,12 +279,12 @@ func QClipboard_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QClipboard) Clear1(mode QClipboard__Mode) { - C.QClipboard_clear1(this.h, (C.int)(mode)) +func (this *QClipboard) ClearWithMode(mode QClipboard__Mode) { + C.QClipboard_clearWithMode(this.h, (C.int)(mode)) } -func (this *QClipboard) Text1(mode QClipboard__Mode) string { - var _ms C.struct_miqt_string = C.QClipboard_text1(this.h, (C.int)(mode)) +func (this *QClipboard) TextWithMode(mode QClipboard__Mode) string { + var _ms C.struct_miqt_string = C.QClipboard_textWithMode(this.h, (C.int)(mode)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -309,22 +309,22 @@ func (this *QClipboard) SetText2(param1 string, mode QClipboard__Mode) { C.QClipboard_setText2(this.h, param1_ms, (C.int)(mode)) } -func (this *QClipboard) MimeData1(mode QClipboard__Mode) *QMimeData { - return newQMimeData(C.QClipboard_mimeData1(this.h, (C.int)(mode))) +func (this *QClipboard) MimeDataWithMode(mode QClipboard__Mode) *QMimeData { + return newQMimeData(C.QClipboard_mimeDataWithMode(this.h, (C.int)(mode))) } func (this *QClipboard) SetMimeData2(data *QMimeData, mode QClipboard__Mode) { C.QClipboard_setMimeData2(this.h, data.cPointer(), (C.int)(mode)) } -func (this *QClipboard) Image1(mode QClipboard__Mode) *QImage { - _goptr := newQImage(C.QClipboard_image1(this.h, (C.int)(mode))) +func (this *QClipboard) ImageWithMode(mode QClipboard__Mode) *QImage { + _goptr := newQImage(C.QClipboard_imageWithMode(this.h, (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QClipboard) Pixmap1(mode QClipboard__Mode) *QPixmap { - _goptr := newQPixmap(C.QClipboard_pixmap1(this.h, (C.int)(mode))) +func (this *QClipboard) PixmapWithMode(mode QClipboard__Mode) *QPixmap { + _goptr := newQPixmap(C.QClipboard_pixmapWithMode(this.h, (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qclipboard.h b/qt/gen_qclipboard.h index 70a81a41..1bdffba9 100644 --- a/qt/gen_qclipboard.h +++ b/qt/gen_qclipboard.h @@ -64,14 +64,14 @@ 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); +void QClipboard_clearWithMode(QClipboard* self, int mode); +struct miqt_string QClipboard_textWithMode(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); +QMimeData* QClipboard_mimeDataWithMode(const QClipboard* self, int mode); void QClipboard_setMimeData2(QClipboard* self, QMimeData* data, int mode); -QImage* QClipboard_image1(const QClipboard* self, int mode); -QPixmap* QClipboard_pixmap1(const QClipboard* self, int mode); +QImage* QClipboard_imageWithMode(const QClipboard* self, int mode); +QPixmap* QClipboard_pixmapWithMode(const QClipboard* self, int mode); void QClipboard_setImage2(QClipboard* self, QImage* param1, int mode); void QClipboard_setPixmap2(QClipboard* self, QPixmap* param1, int mode); diff --git a/qt/gen_qcolor.cpp b/qt/gen_qcolor.cpp index 8a90c5bb..46d0d1e2 100644 --- a/qt/gen_qcolor.cpp +++ b/qt/gen_qcolor.cpp @@ -53,7 +53,7 @@ QColor* QColor_new9(QColor* color) { return new QColor(*color); } -QColor* QColor_new10(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4) { +QColor* QColor_new10(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4) { return new QColor(static_cast(spec), static_cast(a1), static_cast(a2), static_cast(a3), static_cast(a4)); } @@ -61,7 +61,7 @@ QColor* QColor_new11(int r, int g, int b, int a) { return new QColor(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -QColor* QColor_new12(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4, uint16_t a5) { +QColor* QColor_new12(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4, unsigned short a5) { return new QColor(static_cast(spec), static_cast(a1), static_cast(a2), static_cast(a3), static_cast(a4), static_cast(a5)); } @@ -443,7 +443,7 @@ QColor* QColor_fromRgbF(double r, double g, double b) { return new QColor(QColor::fromRgbF(static_cast(r), static_cast(g), static_cast(b))); } -QColor* QColor_fromRgba64(uint16_t r, uint16_t g, uint16_t b) { +QColor* QColor_fromRgba64(unsigned short r, unsigned short g, unsigned short b) { return new QColor(QColor::fromRgba64(static_cast(r), static_cast(g), static_cast(b))); } @@ -508,127 +508,127 @@ bool QColor_isValidColor(struct miqt_string name) { return QColor::isValidColor(name_QString); } -void QColor_getRgb4(const QColor* self, int* r, int* g, int* b, int* a) { +void QColor_getRgb2(const QColor* self, int* r, int* g, int* b, int* a) { self->getRgb(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -void QColor_setRgb4(QColor* self, int r, int g, int b, int a) { +void QColor_setRgb2(QColor* self, int r, int g, int b, int a) { self->setRgb(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -void QColor_getRgbF4(const QColor* self, double* r, double* g, double* b, double* a) { +void QColor_getRgbF2(const QColor* self, double* r, double* g, double* b, double* a) { self->getRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -void QColor_setRgbF4(QColor* self, double r, double g, double b, double a) { +void QColor_setRgbF2(QColor* self, double r, double g, double b, double a) { self->setRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -void QColor_getHsv4(const QColor* self, int* h, int* s, int* v, int* a) { +void QColor_getHsv2(const QColor* self, int* h, int* s, int* v, int* a) { self->getHsv(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); } -void QColor_setHsv4(QColor* self, int h, int s, int v, int a) { +void QColor_setHsv2(QColor* self, int h, int s, int v, int a) { self->setHsv(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); } -void QColor_getHsvF4(const QColor* self, double* h, double* s, double* v, double* a) { +void QColor_getHsvF2(const QColor* self, double* h, double* s, double* v, double* a) { self->getHsvF(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); } -void QColor_setHsvF4(QColor* self, double h, double s, double v, double a) { +void QColor_setHsvF2(QColor* self, double h, double s, double v, double a) { self->setHsvF(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); } -void QColor_getCmyk5(QColor* self, int* c, int* m, int* y, int* k, int* a) { +void QColor_getCmyk3(QColor* self, int* c, int* m, int* y, int* k, int* a) { self->getCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } -void QColor_getCmyk52(const QColor* self, int* c, int* m, int* y, int* k, int* a) { +void QColor_getCmyk4(const QColor* self, int* c, int* m, int* y, int* k, int* a) { self->getCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } -void QColor_setCmyk5(QColor* self, int c, int m, int y, int k, int a) { +void QColor_setCmyk2(QColor* self, int c, int m, int y, int k, int a) { self->setCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } -void QColor_getCmykF5(QColor* self, double* c, double* m, double* y, double* k, double* a) { +void QColor_getCmykF3(QColor* self, double* c, double* m, double* y, double* k, double* a) { self->getCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } -void QColor_getCmykF52(const QColor* self, double* c, double* m, double* y, double* k, double* a) { +void QColor_getCmykF4(const QColor* self, double* c, double* m, double* y, double* k, double* a) { self->getCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } -void QColor_setCmykF5(QColor* self, double c, double m, double y, double k, double a) { +void QColor_setCmykF2(QColor* self, double c, double m, double y, double k, double a) { self->setCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } -void QColor_getHsl4(const QColor* self, int* h, int* s, int* l, int* a) { +void QColor_getHsl2(const QColor* self, int* h, int* s, int* l, int* a) { self->getHsl(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); } -void QColor_setHsl4(QColor* self, int h, int s, int l, int a) { +void QColor_setHsl2(QColor* self, int h, int s, int l, int a) { self->setHsl(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); } -void QColor_getHslF4(const QColor* self, double* h, double* s, double* l, double* a) { +void QColor_getHslF2(const QColor* self, double* h, double* s, double* l, double* a) { self->getHslF(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); } -void QColor_setHslF4(QColor* self, double h, double s, double l, double a) { +void QColor_setHslF2(QColor* self, double h, double s, double l, double a) { self->setHslF(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); } -QColor* QColor_fromRgb4(int r, int g, int b, int a) { +QColor* QColor_fromRgb3(int r, int g, int b, int a) { return new QColor(QColor::fromRgb(static_cast(r), static_cast(g), static_cast(b), static_cast(a))); } -QColor* QColor_fromRgbF4(double r, double g, double b, double a) { +QColor* QColor_fromRgbF2(double r, double g, double b, double a) { return new QColor(QColor::fromRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a))); } -QColor* QColor_fromRgba644(uint16_t r, uint16_t g, uint16_t b, uint16_t a) { +QColor* QColor_fromRgba642(unsigned short r, unsigned short g, unsigned short b, unsigned short a) { return new QColor(QColor::fromRgba64(static_cast(r), static_cast(g), static_cast(b), static_cast(a))); } -QColor* QColor_fromHsv4(int h, int s, int v, int a) { +QColor* QColor_fromHsv2(int h, int s, int v, int a) { return new QColor(QColor::fromHsv(static_cast(h), static_cast(s), static_cast(v), static_cast(a))); } -QColor* QColor_fromHsvF4(double h, double s, double v, double a) { +QColor* QColor_fromHsvF2(double h, double s, double v, double a) { return new QColor(QColor::fromHsvF(static_cast(h), static_cast(s), static_cast(v), static_cast(a))); } -QColor* QColor_fromCmyk5(int c, int m, int y, int k, int a) { +QColor* QColor_fromCmyk2(int c, int m, int y, int k, int a) { return new QColor(QColor::fromCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a))); } -QColor* QColor_fromCmykF5(double c, double m, double y, double k, double a) { +QColor* QColor_fromCmykF2(double c, double m, double y, double k, double a) { return new QColor(QColor::fromCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a))); } -QColor* QColor_fromHsl4(int h, int s, int l, int a) { +QColor* QColor_fromHsl2(int h, int s, int l, int a) { return new QColor(QColor::fromHsl(static_cast(h), static_cast(s), static_cast(l), static_cast(a))); } -QColor* QColor_fromHslF4(double h, double s, double l, double a) { +QColor* QColor_fromHslF2(double h, double s, double l, double a) { return new QColor(QColor::fromHslF(static_cast(h), static_cast(s), static_cast(l), static_cast(a))); } -QColor* QColor_light1(const QColor* self, int f) { +QColor* QColor_lightWithInt(const QColor* self, int f) { return new QColor(self->light(static_cast(f))); } -QColor* QColor_dark1(const QColor* self, int f) { +QColor* QColor_darkWithInt(const QColor* self, int f) { return new QColor(self->dark(static_cast(f))); } -QColor* QColor_lighter1(const QColor* self, int f) { +QColor* QColor_lighterWithInt(const QColor* self, int f) { return new QColor(self->lighter(static_cast(f))); } -QColor* QColor_darker1(const QColor* self, int f) { +QColor* QColor_darkerWithInt(const QColor* self, int f) { return new QColor(self->darker(static_cast(f))); } diff --git a/qt/gen_qcolor.go b/qt/gen_qcolor.go index 9af23cf0..63f0380b 100644 --- a/qt/gen_qcolor.go +++ b/qt/gen_qcolor.go @@ -126,7 +126,7 @@ func NewQColor9(color *QColor) *QColor { // NewQColor10 constructs a new QColor object. func NewQColor10(spec QColor__Spec, a1 uint16, a2 uint16, a3 uint16, a4 uint16) *QColor { - return newQColor(C.QColor_new10((C.int)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4))) + return newQColor(C.QColor_new10((C.int)(spec), (C.ushort)(a1), (C.ushort)(a2), (C.ushort)(a3), (C.ushort)(a4))) } // NewQColor11 constructs a new QColor object. @@ -138,7 +138,7 @@ func NewQColor11(r int, g int, b int, a int) *QColor { // NewQColor12 constructs a new QColor object. func NewQColor12(spec QColor__Spec, a1 uint16, a2 uint16, a3 uint16, a4 uint16, a5 uint16) *QColor { - return newQColor(C.QColor_new12((C.int)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4), (C.uint16_t)(a5))) + return newQColor(C.QColor_new12((C.int)(spec), (C.ushort)(a1), (C.ushort)(a2), (C.ushort)(a3), (C.ushort)(a4), (C.ushort)(a5))) } func (this *QColor) OperatorAssign(param1 *QColor) { @@ -511,7 +511,7 @@ func QColor_FromRgbF(r float64, g float64, b float64) *QColor { } func QColor_FromRgba64(r uint16, g uint16, b uint16) *QColor { - _goptr := newQColor(C.QColor_fromRgba64((C.uint16_t)(r), (C.uint16_t)(g), (C.uint16_t)(b))) + _goptr := newQColor(C.QColor_fromRgba64((C.ushort)(r), (C.ushort)(g), (C.ushort)(b))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -604,152 +604,152 @@ func QColor_IsValidColor(name string) bool { return (bool)(C.QColor_isValidColor(name_ms)) } -func (this *QColor) GetRgb4(r *int, g *int, b *int, a *int) { - C.QColor_getRgb4(this.h, (*C.int)(unsafe.Pointer(r)), (*C.int)(unsafe.Pointer(g)), (*C.int)(unsafe.Pointer(b)), (*C.int)(unsafe.Pointer(a))) +func (this *QColor) GetRgb2(r *int, g *int, b *int, a *int) { + C.QColor_getRgb2(this.h, (*C.int)(unsafe.Pointer(r)), (*C.int)(unsafe.Pointer(g)), (*C.int)(unsafe.Pointer(b)), (*C.int)(unsafe.Pointer(a))) } -func (this *QColor) SetRgb4(r int, g int, b int, a int) { - C.QColor_setRgb4(this.h, (C.int)(r), (C.int)(g), (C.int)(b), (C.int)(a)) +func (this *QColor) SetRgb2(r int, g int, b int, a int) { + C.QColor_setRgb2(this.h, (C.int)(r), (C.int)(g), (C.int)(b), (C.int)(a)) } -func (this *QColor) GetRgbF4(r *float64, g *float64, b *float64, a *float64) { - C.QColor_getRgbF4(this.h, (*C.double)(unsafe.Pointer(r)), (*C.double)(unsafe.Pointer(g)), (*C.double)(unsafe.Pointer(b)), (*C.double)(unsafe.Pointer(a))) +func (this *QColor) GetRgbF2(r *float64, g *float64, b *float64, a *float64) { + C.QColor_getRgbF2(this.h, (*C.double)(unsafe.Pointer(r)), (*C.double)(unsafe.Pointer(g)), (*C.double)(unsafe.Pointer(b)), (*C.double)(unsafe.Pointer(a))) } -func (this *QColor) SetRgbF4(r float64, g float64, b float64, a float64) { - C.QColor_setRgbF4(this.h, (C.double)(r), (C.double)(g), (C.double)(b), (C.double)(a)) +func (this *QColor) SetRgbF2(r float64, g float64, b float64, a float64) { + C.QColor_setRgbF2(this.h, (C.double)(r), (C.double)(g), (C.double)(b), (C.double)(a)) } -func (this *QColor) GetHsv4(h *int, s *int, v *int, a *int) { - C.QColor_getHsv4(this.h, (*C.int)(unsafe.Pointer(h)), (*C.int)(unsafe.Pointer(s)), (*C.int)(unsafe.Pointer(v)), (*C.int)(unsafe.Pointer(a))) +func (this *QColor) GetHsv2(h *int, s *int, v *int, a *int) { + C.QColor_getHsv2(this.h, (*C.int)(unsafe.Pointer(h)), (*C.int)(unsafe.Pointer(s)), (*C.int)(unsafe.Pointer(v)), (*C.int)(unsafe.Pointer(a))) } -func (this *QColor) SetHsv4(h int, s int, v int, a int) { - C.QColor_setHsv4(this.h, (C.int)(h), (C.int)(s), (C.int)(v), (C.int)(a)) +func (this *QColor) SetHsv2(h int, s int, v int, a int) { + C.QColor_setHsv2(this.h, (C.int)(h), (C.int)(s), (C.int)(v), (C.int)(a)) } -func (this *QColor) GetHsvF4(h *float64, s *float64, v *float64, a *float64) { - C.QColor_getHsvF4(this.h, (*C.double)(unsafe.Pointer(h)), (*C.double)(unsafe.Pointer(s)), (*C.double)(unsafe.Pointer(v)), (*C.double)(unsafe.Pointer(a))) +func (this *QColor) GetHsvF2(h *float64, s *float64, v *float64, a *float64) { + C.QColor_getHsvF2(this.h, (*C.double)(unsafe.Pointer(h)), (*C.double)(unsafe.Pointer(s)), (*C.double)(unsafe.Pointer(v)), (*C.double)(unsafe.Pointer(a))) } -func (this *QColor) SetHsvF4(h float64, s float64, v float64, a float64) { - C.QColor_setHsvF4(this.h, (C.double)(h), (C.double)(s), (C.double)(v), (C.double)(a)) +func (this *QColor) SetHsvF2(h float64, s float64, v float64, a float64) { + C.QColor_setHsvF2(this.h, (C.double)(h), (C.double)(s), (C.double)(v), (C.double)(a)) } -func (this *QColor) GetCmyk5(c *int, m *int, y *int, k *int, a *int) { - C.QColor_getCmyk5(this.h, (*C.int)(unsafe.Pointer(c)), (*C.int)(unsafe.Pointer(m)), (*C.int)(unsafe.Pointer(y)), (*C.int)(unsafe.Pointer(k)), (*C.int)(unsafe.Pointer(a))) +func (this *QColor) GetCmyk3(c *int, m *int, y *int, k *int, a *int) { + C.QColor_getCmyk3(this.h, (*C.int)(unsafe.Pointer(c)), (*C.int)(unsafe.Pointer(m)), (*C.int)(unsafe.Pointer(y)), (*C.int)(unsafe.Pointer(k)), (*C.int)(unsafe.Pointer(a))) } -func (this *QColor) GetCmyk52(c *int, m *int, y *int, k *int, a *int) { - C.QColor_getCmyk52(this.h, (*C.int)(unsafe.Pointer(c)), (*C.int)(unsafe.Pointer(m)), (*C.int)(unsafe.Pointer(y)), (*C.int)(unsafe.Pointer(k)), (*C.int)(unsafe.Pointer(a))) +func (this *QColor) GetCmyk4(c *int, m *int, y *int, k *int, a *int) { + C.QColor_getCmyk4(this.h, (*C.int)(unsafe.Pointer(c)), (*C.int)(unsafe.Pointer(m)), (*C.int)(unsafe.Pointer(y)), (*C.int)(unsafe.Pointer(k)), (*C.int)(unsafe.Pointer(a))) } -func (this *QColor) SetCmyk5(c int, m int, y int, k int, a int) { - C.QColor_setCmyk5(this.h, (C.int)(c), (C.int)(m), (C.int)(y), (C.int)(k), (C.int)(a)) +func (this *QColor) SetCmyk2(c int, m int, y int, k int, a int) { + C.QColor_setCmyk2(this.h, (C.int)(c), (C.int)(m), (C.int)(y), (C.int)(k), (C.int)(a)) } -func (this *QColor) GetCmykF5(c *float64, m *float64, y *float64, k *float64, a *float64) { - C.QColor_getCmykF5(this.h, (*C.double)(unsafe.Pointer(c)), (*C.double)(unsafe.Pointer(m)), (*C.double)(unsafe.Pointer(y)), (*C.double)(unsafe.Pointer(k)), (*C.double)(unsafe.Pointer(a))) +func (this *QColor) GetCmykF3(c *float64, m *float64, y *float64, k *float64, a *float64) { + C.QColor_getCmykF3(this.h, (*C.double)(unsafe.Pointer(c)), (*C.double)(unsafe.Pointer(m)), (*C.double)(unsafe.Pointer(y)), (*C.double)(unsafe.Pointer(k)), (*C.double)(unsafe.Pointer(a))) } -func (this *QColor) GetCmykF52(c *float64, m *float64, y *float64, k *float64, a *float64) { - C.QColor_getCmykF52(this.h, (*C.double)(unsafe.Pointer(c)), (*C.double)(unsafe.Pointer(m)), (*C.double)(unsafe.Pointer(y)), (*C.double)(unsafe.Pointer(k)), (*C.double)(unsafe.Pointer(a))) +func (this *QColor) GetCmykF4(c *float64, m *float64, y *float64, k *float64, a *float64) { + C.QColor_getCmykF4(this.h, (*C.double)(unsafe.Pointer(c)), (*C.double)(unsafe.Pointer(m)), (*C.double)(unsafe.Pointer(y)), (*C.double)(unsafe.Pointer(k)), (*C.double)(unsafe.Pointer(a))) } -func (this *QColor) SetCmykF5(c float64, m float64, y float64, k float64, a float64) { - C.QColor_setCmykF5(this.h, (C.double)(c), (C.double)(m), (C.double)(y), (C.double)(k), (C.double)(a)) +func (this *QColor) SetCmykF2(c float64, m float64, y float64, k float64, a float64) { + C.QColor_setCmykF2(this.h, (C.double)(c), (C.double)(m), (C.double)(y), (C.double)(k), (C.double)(a)) } -func (this *QColor) GetHsl4(h *int, s *int, l *int, a *int) { - C.QColor_getHsl4(this.h, (*C.int)(unsafe.Pointer(h)), (*C.int)(unsafe.Pointer(s)), (*C.int)(unsafe.Pointer(l)), (*C.int)(unsafe.Pointer(a))) +func (this *QColor) GetHsl2(h *int, s *int, l *int, a *int) { + C.QColor_getHsl2(this.h, (*C.int)(unsafe.Pointer(h)), (*C.int)(unsafe.Pointer(s)), (*C.int)(unsafe.Pointer(l)), (*C.int)(unsafe.Pointer(a))) } -func (this *QColor) SetHsl4(h int, s int, l int, a int) { - C.QColor_setHsl4(this.h, (C.int)(h), (C.int)(s), (C.int)(l), (C.int)(a)) +func (this *QColor) SetHsl2(h int, s int, l int, a int) { + C.QColor_setHsl2(this.h, (C.int)(h), (C.int)(s), (C.int)(l), (C.int)(a)) } -func (this *QColor) GetHslF4(h *float64, s *float64, l *float64, a *float64) { - C.QColor_getHslF4(this.h, (*C.double)(unsafe.Pointer(h)), (*C.double)(unsafe.Pointer(s)), (*C.double)(unsafe.Pointer(l)), (*C.double)(unsafe.Pointer(a))) +func (this *QColor) GetHslF2(h *float64, s *float64, l *float64, a *float64) { + C.QColor_getHslF2(this.h, (*C.double)(unsafe.Pointer(h)), (*C.double)(unsafe.Pointer(s)), (*C.double)(unsafe.Pointer(l)), (*C.double)(unsafe.Pointer(a))) } -func (this *QColor) SetHslF4(h float64, s float64, l float64, a float64) { - C.QColor_setHslF4(this.h, (C.double)(h), (C.double)(s), (C.double)(l), (C.double)(a)) +func (this *QColor) SetHslF2(h float64, s float64, l float64, a float64) { + C.QColor_setHslF2(this.h, (C.double)(h), (C.double)(s), (C.double)(l), (C.double)(a)) } -func QColor_FromRgb4(r int, g int, b int, a int) *QColor { - _goptr := newQColor(C.QColor_fromRgb4((C.int)(r), (C.int)(g), (C.int)(b), (C.int)(a))) +func QColor_FromRgb3(r int, g int, b int, a int) *QColor { + _goptr := newQColor(C.QColor_fromRgb3((C.int)(r), (C.int)(g), (C.int)(b), (C.int)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromRgbF4(r float64, g float64, b float64, a float64) *QColor { - _goptr := newQColor(C.QColor_fromRgbF4((C.double)(r), (C.double)(g), (C.double)(b), (C.double)(a))) +func QColor_FromRgbF2(r float64, g float64, b float64, a float64) *QColor { + _goptr := newQColor(C.QColor_fromRgbF2((C.double)(r), (C.double)(g), (C.double)(b), (C.double)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromRgba644(r uint16, g uint16, b uint16, a uint16) *QColor { - _goptr := newQColor(C.QColor_fromRgba644((C.uint16_t)(r), (C.uint16_t)(g), (C.uint16_t)(b), (C.uint16_t)(a))) +func QColor_FromRgba642(r uint16, g uint16, b uint16, a uint16) *QColor { + _goptr := newQColor(C.QColor_fromRgba642((C.ushort)(r), (C.ushort)(g), (C.ushort)(b), (C.ushort)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromHsv4(h int, s int, v int, a int) *QColor { - _goptr := newQColor(C.QColor_fromHsv4((C.int)(h), (C.int)(s), (C.int)(v), (C.int)(a))) +func QColor_FromHsv2(h int, s int, v int, a int) *QColor { + _goptr := newQColor(C.QColor_fromHsv2((C.int)(h), (C.int)(s), (C.int)(v), (C.int)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromHsvF4(h float64, s float64, v float64, a float64) *QColor { - _goptr := newQColor(C.QColor_fromHsvF4((C.double)(h), (C.double)(s), (C.double)(v), (C.double)(a))) +func QColor_FromHsvF2(h float64, s float64, v float64, a float64) *QColor { + _goptr := newQColor(C.QColor_fromHsvF2((C.double)(h), (C.double)(s), (C.double)(v), (C.double)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromCmyk5(c int, m int, y int, k int, a int) *QColor { - _goptr := newQColor(C.QColor_fromCmyk5((C.int)(c), (C.int)(m), (C.int)(y), (C.int)(k), (C.int)(a))) +func QColor_FromCmyk2(c int, m int, y int, k int, a int) *QColor { + _goptr := newQColor(C.QColor_fromCmyk2((C.int)(c), (C.int)(m), (C.int)(y), (C.int)(k), (C.int)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromCmykF5(c float64, m float64, y float64, k float64, a float64) *QColor { - _goptr := newQColor(C.QColor_fromCmykF5((C.double)(c), (C.double)(m), (C.double)(y), (C.double)(k), (C.double)(a))) +func QColor_FromCmykF2(c float64, m float64, y float64, k float64, a float64) *QColor { + _goptr := newQColor(C.QColor_fromCmykF2((C.double)(c), (C.double)(m), (C.double)(y), (C.double)(k), (C.double)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromHsl4(h int, s int, l int, a int) *QColor { - _goptr := newQColor(C.QColor_fromHsl4((C.int)(h), (C.int)(s), (C.int)(l), (C.int)(a))) +func QColor_FromHsl2(h int, s int, l int, a int) *QColor { + _goptr := newQColor(C.QColor_fromHsl2((C.int)(h), (C.int)(s), (C.int)(l), (C.int)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromHslF4(h float64, s float64, l float64, a float64) *QColor { - _goptr := newQColor(C.QColor_fromHslF4((C.double)(h), (C.double)(s), (C.double)(l), (C.double)(a))) +func QColor_FromHslF2(h float64, s float64, l float64, a float64) *QColor { + _goptr := newQColor(C.QColor_fromHslF2((C.double)(h), (C.double)(s), (C.double)(l), (C.double)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QColor) Light1(f int) *QColor { - _goptr := newQColor(C.QColor_light1(this.h, (C.int)(f))) +func (this *QColor) LightWithInt(f int) *QColor { + _goptr := newQColor(C.QColor_lightWithInt(this.h, (C.int)(f))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QColor) Dark1(f int) *QColor { - _goptr := newQColor(C.QColor_dark1(this.h, (C.int)(f))) +func (this *QColor) DarkWithInt(f int) *QColor { + _goptr := newQColor(C.QColor_darkWithInt(this.h, (C.int)(f))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QColor) Lighter1(f int) *QColor { - _goptr := newQColor(C.QColor_lighter1(this.h, (C.int)(f))) +func (this *QColor) LighterWithInt(f int) *QColor { + _goptr := newQColor(C.QColor_lighterWithInt(this.h, (C.int)(f))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QColor) Darker1(f int) *QColor { - _goptr := newQColor(C.QColor_darker1(this.h, (C.int)(f))) +func (this *QColor) DarkerWithInt(f int) *QColor { + _goptr := newQColor(C.QColor_darkerWithInt(this.h, (C.int)(f))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qcolor.h b/qt/gen_qcolor.h index 825fcec8..9f498a62 100644 --- a/qt/gen_qcolor.h +++ b/qt/gen_qcolor.h @@ -33,9 +33,9 @@ QColor* QColor_new6(struct miqt_string name); QColor* QColor_new7(const char* aname); QColor* QColor_new8(int spec); QColor* QColor_new9(QColor* color); -QColor* QColor_new10(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4); +QColor* QColor_new10(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4); QColor* QColor_new11(int r, int g, int b, int a); -QColor* QColor_new12(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4, uint16_t a5); +QColor* QColor_new12(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4, unsigned short a5); void QColor_operatorAssign(QColor* self, QColor* param1); void QColor_operatorAssignWithColor(QColor* self, int color); bool QColor_isValid(const QColor* self); @@ -118,7 +118,7 @@ QColor* QColor_fromRgb(unsigned int rgb); QColor* QColor_fromRgba(unsigned int rgba); QColor* QColor_fromRgb2(int r, int g, int b); QColor* QColor_fromRgbF(double r, double g, double b); -QColor* QColor_fromRgba64(uint16_t r, uint16_t g, uint16_t b); +QColor* QColor_fromRgba64(unsigned short r, unsigned short g, unsigned short b); QColor* QColor_fromRgba64WithRgba(QRgba64* rgba); QColor* QColor_fromHsv(int h, int s, int v); QColor* QColor_fromHsvF(double h, double s, double v); @@ -134,37 +134,37 @@ bool QColor_operatorEqual(const QColor* self, QColor* c); bool QColor_operatorNotEqual(const QColor* self, QColor* c); QVariant* QColor_ToQVariant(const QColor* self); 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); -void QColor_setRgbF4(QColor* self, double r, double g, double b, double a); -void QColor_getHsv4(const QColor* self, int* h, int* s, int* v, int* a); -void QColor_setHsv4(QColor* self, int h, int s, int v, int a); -void QColor_getHsvF4(const QColor* self, double* h, double* s, double* v, double* a); -void QColor_setHsvF4(QColor* self, double h, double s, double v, double a); -void QColor_getCmyk5(QColor* self, int* c, int* m, int* y, int* k, int* a); -void QColor_getCmyk52(const QColor* self, int* c, int* m, int* y, int* k, int* a); -void QColor_setCmyk5(QColor* self, int c, int m, int y, int k, int a); -void QColor_getCmykF5(QColor* self, double* c, double* m, double* y, double* k, double* a); -void QColor_getCmykF52(const QColor* self, double* c, double* m, double* y, double* k, double* a); -void QColor_setCmykF5(QColor* self, double c, double m, double y, double k, double a); -void QColor_getHsl4(const QColor* self, int* h, int* s, int* l, int* a); -void QColor_setHsl4(QColor* self, int h, int s, int l, int a); -void QColor_getHslF4(const QColor* self, double* h, double* s, double* l, double* a); -void QColor_setHslF4(QColor* self, double h, double s, double l, double a); -QColor* QColor_fromRgb4(int r, int g, int b, int a); -QColor* QColor_fromRgbF4(double r, double g, double b, double a); -QColor* QColor_fromRgba644(uint16_t r, uint16_t g, uint16_t b, uint16_t a); -QColor* QColor_fromHsv4(int h, int s, int v, int a); -QColor* QColor_fromHsvF4(double h, double s, double v, double a); -QColor* QColor_fromCmyk5(int c, int m, int y, int k, int a); -QColor* QColor_fromCmykF5(double c, double m, double y, double k, double a); -QColor* QColor_fromHsl4(int h, int s, int l, int a); -QColor* QColor_fromHslF4(double h, double s, double l, double a); -QColor* QColor_light1(const QColor* self, int f); -QColor* QColor_dark1(const QColor* self, int f); -QColor* QColor_lighter1(const QColor* self, int f); -QColor* QColor_darker1(const QColor* self, int f); +void QColor_getRgb2(const QColor* self, int* r, int* g, int* b, int* a); +void QColor_setRgb2(QColor* self, int r, int g, int b, int a); +void QColor_getRgbF2(const QColor* self, double* r, double* g, double* b, double* a); +void QColor_setRgbF2(QColor* self, double r, double g, double b, double a); +void QColor_getHsv2(const QColor* self, int* h, int* s, int* v, int* a); +void QColor_setHsv2(QColor* self, int h, int s, int v, int a); +void QColor_getHsvF2(const QColor* self, double* h, double* s, double* v, double* a); +void QColor_setHsvF2(QColor* self, double h, double s, double v, double a); +void QColor_getCmyk3(QColor* self, int* c, int* m, int* y, int* k, int* a); +void QColor_getCmyk4(const QColor* self, int* c, int* m, int* y, int* k, int* a); +void QColor_setCmyk2(QColor* self, int c, int m, int y, int k, int a); +void QColor_getCmykF3(QColor* self, double* c, double* m, double* y, double* k, double* a); +void QColor_getCmykF4(const QColor* self, double* c, double* m, double* y, double* k, double* a); +void QColor_setCmykF2(QColor* self, double c, double m, double y, double k, double a); +void QColor_getHsl2(const QColor* self, int* h, int* s, int* l, int* a); +void QColor_setHsl2(QColor* self, int h, int s, int l, int a); +void QColor_getHslF2(const QColor* self, double* h, double* s, double* l, double* a); +void QColor_setHslF2(QColor* self, double h, double s, double l, double a); +QColor* QColor_fromRgb3(int r, int g, int b, int a); +QColor* QColor_fromRgbF2(double r, double g, double b, double a); +QColor* QColor_fromRgba642(unsigned short r, unsigned short g, unsigned short b, unsigned short a); +QColor* QColor_fromHsv2(int h, int s, int v, int a); +QColor* QColor_fromHsvF2(double h, double s, double v, double a); +QColor* QColor_fromCmyk2(int c, int m, int y, int k, int a); +QColor* QColor_fromCmykF2(double c, double m, double y, double k, double a); +QColor* QColor_fromHsl2(int h, int s, int l, int a); +QColor* QColor_fromHslF2(double h, double s, double l, double a); +QColor* QColor_lightWithInt(const QColor* self, int f); +QColor* QColor_darkWithInt(const QColor* self, int f); +QColor* QColor_lighterWithInt(const QColor* self, int f); +QColor* QColor_darkerWithInt(const QColor* self, int f); void QColor_delete(QColor* self); #ifdef __cplusplus diff --git a/qt/gen_qcolordialog.cpp b/qt/gen_qcolordialog.cpp index ad5e7358..6439a56a 100644 --- a/qt/gen_qcolordialog.cpp +++ b/qt/gen_qcolordialog.cpp @@ -1287,7 +1287,7 @@ void QColorDialog_setOption2(QColorDialog* self, int option, bool on) { self->setOption(static_cast(option), on); } -QColor* QColorDialog_getColor1(QColor* initial) { +QColor* QColorDialog_getColorWithInitial(QColor* initial) { return new QColor(QColorDialog::getColor(*initial)); } @@ -1305,7 +1305,7 @@ QColor* QColorDialog_getColor4(QColor* initial, QWidget* parent, struct miqt_str return new QColor(QColorDialog::getColor(*initial, parent, title_QString, static_cast(options))); } -unsigned int QColorDialog_getRgba1(unsigned int rgba) { +unsigned int QColorDialog_getRgbaWithRgba(unsigned int rgba) { QRgb _ret = QColorDialog::getRgba(static_cast(rgba)); return static_cast(_ret); } diff --git a/qt/gen_qcolordialog.go b/qt/gen_qcolordialog.go index 6c4fec23..9af012bf 100644 --- a/qt/gen_qcolordialog.go +++ b/qt/gen_qcolordialog.go @@ -268,8 +268,8 @@ func (this *QColorDialog) SetOption2(option QColorDialog__ColorDialogOption, on C.QColorDialog_setOption2(this.h, (C.int)(option), (C.bool)(on)) } -func QColorDialog_GetColor1(initial *QColor) *QColor { - _goptr := newQColor(C.QColorDialog_getColor1(initial.cPointer())) +func QColorDialog_GetColorWithInitial(initial *QColor) *QColor { + _goptr := newQColor(C.QColorDialog_getColorWithInitial(initial.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -300,8 +300,8 @@ func QColorDialog_GetColor4(initial *QColor, parent *QWidget, title string, opti return _goptr } -func QColorDialog_GetRgba1(rgba uint) uint { - return (uint)(C.QColorDialog_getRgba1((C.uint)(rgba))) +func QColorDialog_GetRgbaWithRgba(rgba uint) uint { + return (uint)(C.QColorDialog_getRgbaWithRgba((C.uint)(rgba))) } func QColorDialog_GetRgba2(rgba uint, ok *bool) uint { diff --git a/qt/gen_qcolordialog.h b/qt/gen_qcolordialog.h index e24f7c84..a6855ad6 100644 --- a/qt/gen_qcolordialog.h +++ b/qt/gen_qcolordialog.h @@ -121,11 +121,11 @@ 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_getColorWithInitial(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); -unsigned int QColorDialog_getRgba1(unsigned int rgba); +unsigned int QColorDialog_getRgbaWithRgba(unsigned int rgba); unsigned int QColorDialog_getRgba2(unsigned int rgba, bool* ok); unsigned int QColorDialog_getRgba3(unsigned int rgba, bool* ok, QWidget* parent); bool QColorDialog_override_virtual_setVisible(void* self, intptr_t slot); diff --git a/qt/gen_qcolormap.cpp b/qt/gen_qcolormap.cpp index 129bfa7c..e51a4283 100644 --- a/qt/gen_qcolormap.cpp +++ b/qt/gen_qcolormap.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include "gen_qcolormap.h" @@ -67,7 +67,7 @@ struct miqt_array /* of QColor* */ QColormap_colormap(const QColormap* self) { return _out; } -QColormap* QColormap_instance1(int screen) { +QColormap* QColormap_instanceWithScreen(int screen) { return new QColormap(QColormap::instance(static_cast(screen))); } diff --git a/qt/gen_qcolormap.go b/qt/gen_qcolormap.go index 71674563..b9334f5f 100644 --- a/qt/gen_qcolormap.go +++ b/qt/gen_qcolormap.go @@ -111,8 +111,8 @@ func (this *QColormap) Colormap() []QColor { return _ret } -func QColormap_Instance1(screen int) *QColormap { - _goptr := newQColormap(C.QColormap_instance1((C.int)(screen))) +func QColormap_InstanceWithScreen(screen int) *QColormap { + _goptr := newQColormap(C.QColormap_instanceWithScreen((C.int)(screen))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qcolormap.h b/qt/gen_qcolormap.h index fc04dff0..8d057423 100644 --- a/qt/gen_qcolormap.h +++ b/qt/gen_qcolormap.h @@ -33,7 +33,7 @@ int QColormap_size(const QColormap* self); unsigned int QColormap_pixel(const QColormap* self, QColor* color); QColor* QColormap_colorAt(const QColormap* self, unsigned int pixel); struct miqt_array /* of QColor* */ QColormap_colormap(const QColormap* self); -QColormap* QColormap_instance1(int screen); +QColormap* QColormap_instanceWithScreen(int screen); void QColormap_delete(QColormap* self); #ifdef __cplusplus diff --git a/qt/gen_qcolumnview.cpp b/qt/gen_qcolumnview.cpp index 11a5e625..85b934cb 100644 --- a/qt/gen_qcolumnview.cpp +++ b/qt/gen_qcolumnview.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qcombobox.cpp b/qt/gen_qcombobox.cpp index 9f619035..b049497a 100644 --- a/qt/gen_qcombobox.cpp +++ b/qt/gen_qcombobox.cpp @@ -1658,7 +1658,7 @@ int QComboBox_findData3(const QComboBox* self, QVariant* data, int role, int fla return self->findData(*data, static_cast(role), static_cast(flags)); } -QVariant* QComboBox_currentData1(const QComboBox* self, int role) { +QVariant* QComboBox_currentDataWithRole(const QComboBox* self, int role) { return new QVariant(self->currentData(static_cast(role))); } @@ -1666,12 +1666,12 @@ 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) { +void QComboBox_addItem3(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) { +void QComboBox_addItem4(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); } @@ -1686,7 +1686,7 @@ void QComboBox_insertItem4(QComboBox* self, int index, QIcon* icon, struct miqt_ self->insertItem(static_cast(index), *icon, text_QString, *userData); } -void QComboBox_setItemData3(QComboBox* self, int index, QVariant* value, int role) { +void QComboBox_setItemData2(QComboBox* self, int index, QVariant* value, int role) { self->setItemData(static_cast(index), *value, static_cast(role)); } diff --git a/qt/gen_qcombobox.go b/qt/gen_qcombobox.go index b29f36f1..e5ece34e 100644 --- a/qt/gen_qcombobox.go +++ b/qt/gen_qcombobox.go @@ -791,8 +791,8 @@ func (this *QComboBox) FindData3(data *QVariant, role int, flags MatchFlag) int return (int)(C.QComboBox_findData3(this.h, data.cPointer(), (C.int)(role), (C.int)(flags))) } -func (this *QComboBox) CurrentData1(role int) *QVariant { - _goptr := newQVariant(C.QComboBox_currentData1(this.h, (C.int)(role))) +func (this *QComboBox) CurrentDataWithRole(role int) *QVariant { + _goptr := newQVariant(C.QComboBox_currentDataWithRole(this.h, (C.int)(role))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -803,20 +803,20 @@ func (this *QComboBox) ItemData2(index int, role int) *QVariant { return _goptr } -func (this *QComboBox) AddItem22(text string, userData *QVariant) { +func (this *QComboBox) AddItem3(text string, userData *QVariant) { text_ms := C.struct_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()) + C.QComboBox_addItem3(this.h, text_ms, userData.cPointer()) } -func (this *QComboBox) AddItem3(icon *QIcon, text string, userData *QVariant) { +func (this *QComboBox) AddItem4(icon *QIcon, text string, userData *QVariant) { text_ms := C.struct_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()) + C.QComboBox_addItem4(this.h, icon.cPointer(), text_ms, userData.cPointer()) } func (this *QComboBox) InsertItem3(index int, text string, userData *QVariant) { @@ -835,8 +835,8 @@ func (this *QComboBox) InsertItem4(index int, icon *QIcon, text string, userData C.QComboBox_insertItem4(this.h, (C.int)(index), icon.cPointer(), text_ms, userData.cPointer()) } -func (this *QComboBox) SetItemData3(index int, value *QVariant, role int) { - C.QComboBox_setItemData3(this.h, (C.int)(index), value.cPointer(), (C.int)(role)) +func (this *QComboBox) SetItemData2(index int, value *QVariant, role int) { + C.QComboBox_setItemData2(this.h, (C.int)(index), value.cPointer(), (C.int)(role)) } // InitStyleOption can only be called from a QComboBox that was directly constructed. diff --git a/qt/gen_qcombobox.h b/qt/gen_qcombobox.h index 67aff33d..2e217ef8 100644 --- a/qt/gen_qcombobox.h +++ b/qt/gen_qcombobox.h @@ -220,13 +220,13 @@ 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_currentDataWithRole(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_addItem3(QComboBox* self, struct miqt_string text, QVariant* userData); +void QComboBox_addItem4(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_setItemData2(QComboBox* self, int index, QVariant* value, int role); bool QComboBox_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QComboBox_virtualbase_sizeHint(const void* self); bool QComboBox_override_virtual_minimumSizeHint(void* self, intptr_t slot); diff --git a/qt/gen_qcommandlineparser.cpp b/qt/gen_qcommandlineparser.cpp index 83945f08..8137ad5b 100644 --- a/qt/gen_qcommandlineparser.cpp +++ b/qt/gen_qcommandlineparser.cpp @@ -323,7 +323,7 @@ struct miqt_string QCommandLineParser_trUtf83(const char* sourceText, const char return _ms; } -void QCommandLineParser_addPositionalArgument3(QCommandLineParser* self, struct miqt_string name, struct miqt_string description, struct miqt_string syntax) { +void QCommandLineParser_addPositionalArgument2(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); diff --git a/qt/gen_qcommandlineparser.go b/qt/gen_qcommandlineparser.go index ccf0647f..986f3e5b 100644 --- a/qt/gen_qcommandlineparser.go +++ b/qt/gen_qcommandlineparser.go @@ -337,7 +337,7 @@ func QCommandLineParser_TrUtf83(sourceText string, disambiguation string, n int) return _ret } -func (this *QCommandLineParser) AddPositionalArgument3(name string, description string, syntax string) { +func (this *QCommandLineParser) AddPositionalArgument2(name string, description string, syntax string) { name_ms := C.struct_miqt_string{} name_ms.data = C.CString(name) name_ms.len = C.size_t(len(name)) @@ -350,7 +350,7 @@ func (this *QCommandLineParser) AddPositionalArgument3(name string, description 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) + C.QCommandLineParser_addPositionalArgument2(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 803fbce6..ab502a34 100644 --- a/qt/gen_qcommandlineparser.h +++ b/qt/gen_qcommandlineparser.h @@ -55,7 +55,7 @@ struct miqt_string QCommandLineParser_tr2(const char* sourceText, const char* di 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_addPositionalArgument2(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_qcompleter.cpp b/qt/gen_qcompleter.cpp index fe7a5ace..aef9cc51 100644 --- a/qt/gen_qcompleter.cpp +++ b/qt/gen_qcompleter.cpp @@ -601,7 +601,7 @@ struct miqt_string QCompleter_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QCompleter_complete1(QCompleter* self, QRect* rect) { +void QCompleter_completeWithRect(QCompleter* self, QRect* rect) { self->complete(*rect); } diff --git a/qt/gen_qcompleter.go b/qt/gen_qcompleter.go index 5707728d..48759d6c 100644 --- a/qt/gen_qcompleter.go +++ b/qt/gen_qcompleter.go @@ -448,8 +448,8 @@ func QCompleter_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QCompleter) Complete1(rect *QRect) { - C.QCompleter_complete1(this.h, rect.cPointer()) +func (this *QCompleter) CompleteWithRect(rect *QRect) { + C.QCompleter_completeWithRect(this.h, rect.cPointer()) } // Sender can only be called from a QCompleter that was directly constructed. diff --git a/qt/gen_qcompleter.h b/qt/gen_qcompleter.h index a8348a52..9a6dad05 100644 --- a/qt/gen_qcompleter.h +++ b/qt/gen_qcompleter.h @@ -100,7 +100,7 @@ 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_completeWithRect(QCompleter* self, QRect* rect); bool QCompleter_override_virtual_pathFromIndex(void* self, intptr_t slot); struct miqt_string QCompleter_virtualbase_pathFromIndex(const void* self, QModelIndex* index); bool QCompleter_override_virtual_splitPath(void* self, intptr_t slot); diff --git a/qt/gen_qconcatenatetablesproxymodel.cpp b/qt/gen_qconcatenatetablesproxymodel.cpp index 8d9fb6db..94756269 100644 --- a/qt/gen_qconcatenatetablesproxymodel.cpp +++ b/qt/gen_qconcatenatetablesproxymodel.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qcoreapplication.cpp b/qt/gen_qcoreapplication.cpp index 8f0ac441..f3a4a92a 100644 --- a/qt/gen_qcoreapplication.cpp +++ b/qt/gen_qcoreapplication.cpp @@ -606,19 +606,19 @@ void QCoreApplication_setAttribute2(int attribute, bool on) { QCoreApplication::setAttribute(static_cast(attribute), on); } -void QCoreApplication_processEvents1(int flags) { +void QCoreApplication_processEventsWithFlags(int flags) { QCoreApplication::processEvents(static_cast(flags)); } -void QCoreApplication_exit1(int retcode) { +void QCoreApplication_exitWithRetcode(int retcode) { QCoreApplication::exit(static_cast(retcode)); } -void QCoreApplication_postEvent3(QObject* receiver, QEvent* event, int priority) { +void QCoreApplication_postEvent2(QObject* receiver, QEvent* event, int priority) { QCoreApplication::postEvent(receiver, event, static_cast(priority)); } -void QCoreApplication_sendPostedEvents1(QObject* receiver) { +void QCoreApplication_sendPostedEventsWithReceiver(QObject* receiver) { QCoreApplication::sendPostedEvents(receiver); } @@ -630,7 +630,7 @@ 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_translate2(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(); @@ -641,7 +641,7 @@ struct miqt_string QCoreApplication_translate3(const char* context, const char* return _ms; } -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, 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(); diff --git a/qt/gen_qcoreapplication.go b/qt/gen_qcoreapplication.go index 61af1231..d4659243 100644 --- a/qt/gen_qcoreapplication.go +++ b/qt/gen_qcoreapplication.go @@ -483,20 +483,20 @@ func QCoreApplication_SetAttribute2(attribute ApplicationAttribute, on bool) { C.QCoreApplication_setAttribute2((C.int)(attribute), (C.bool)(on)) } -func QCoreApplication_ProcessEvents1(flags QEventLoop__ProcessEventsFlag) { - C.QCoreApplication_processEvents1((C.int)(flags)) +func QCoreApplication_ProcessEventsWithFlags(flags QEventLoop__ProcessEventsFlag) { + C.QCoreApplication_processEventsWithFlags((C.int)(flags)) } -func QCoreApplication_Exit1(retcode int) { - C.QCoreApplication_exit1((C.int)(retcode)) +func QCoreApplication_ExitWithRetcode(retcode int) { + C.QCoreApplication_exitWithRetcode((C.int)(retcode)) } -func QCoreApplication_PostEvent3(receiver *QObject, event *QEvent, priority int) { - C.QCoreApplication_postEvent3(receiver.cPointer(), event.cPointer(), (C.int)(priority)) +func QCoreApplication_PostEvent2(receiver *QObject, event *QEvent, priority int) { + C.QCoreApplication_postEvent2(receiver.cPointer(), event.cPointer(), (C.int)(priority)) } -func QCoreApplication_SendPostedEvents1(receiver *QObject) { - C.QCoreApplication_sendPostedEvents1(receiver.cPointer()) +func QCoreApplication_SendPostedEventsWithReceiver(receiver *QObject) { + C.QCoreApplication_sendPostedEventsWithReceiver(receiver.cPointer()) } func QCoreApplication_SendPostedEvents2(receiver *QObject, event_type int) { @@ -507,27 +507,27 @@ func QCoreApplication_RemovePostedEvents2(receiver *QObject, eventType int) { C.QCoreApplication_removePostedEvents2(receiver.cPointer(), (C.int)(eventType)) } -func QCoreApplication_Translate3(context string, key string, disambiguation string) string { +func QCoreApplication_Translate2(context string, key string, disambiguation string) string { context_Cstring := C.CString(context) defer C.free(unsafe.Pointer(context_Cstring)) key_Cstring := C.CString(key) 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) + var _ms C.struct_miqt_string = C.QCoreApplication_translate2(context_Cstring, key_Cstring, disambiguation_Cstring) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func QCoreApplication_Translate4(context string, key string, disambiguation string, n int) string { +func QCoreApplication_Translate3(context string, key string, disambiguation string, n int) string { context_Cstring := C.CString(context) defer C.free(unsafe.Pointer(context_Cstring)) key_Cstring := C.CString(key) 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)) + var _ms C.struct_miqt_string = C.QCoreApplication_translate3(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 bad72af4..681f1ea3 100644 --- a/qt/gen_qcoreapplication.h +++ b/qt/gen_qcoreapplication.h @@ -103,14 +103,14 @@ 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); -void QCoreApplication_postEvent3(QObject* receiver, QEvent* event, int priority); -void QCoreApplication_sendPostedEvents1(QObject* receiver); +void QCoreApplication_processEventsWithFlags(int flags); +void QCoreApplication_exitWithRetcode(int retcode); +void QCoreApplication_postEvent2(QObject* receiver, QEvent* event, int priority); +void QCoreApplication_sendPostedEventsWithReceiver(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_translate2(const char* context, const char* key, const char* disambiguation); +struct miqt_string QCoreApplication_translate3(const char* context, const char* key, const char* disambiguation, int n); bool QCoreApplication_override_virtual_notify(void* self, intptr_t slot); bool QCoreApplication_virtualbase_notify(void* self, QObject* param1, QEvent* param2); bool QCoreApplication_override_virtual_event(void* self, intptr_t slot); diff --git a/qt/gen_qcoreevent.cpp b/qt/gen_qcoreevent.cpp index 97719c49..444eff9c 100644 --- a/qt/gen_qcoreevent.cpp +++ b/qt/gen_qcoreevent.cpp @@ -56,7 +56,7 @@ int QEvent_registerEventType() { return QEvent::registerEventType(); } -int QEvent_registerEventType1(int hint) { +int QEvent_registerEventTypeWithHint(int hint) { return QEvent::registerEventType(static_cast(hint)); } diff --git a/qt/gen_qcoreevent.go b/qt/gen_qcoreevent.go index 1e5731ff..d2542214 100644 --- a/qt/gen_qcoreevent.go +++ b/qt/gen_qcoreevent.go @@ -266,8 +266,8 @@ func QEvent_RegisterEventType() int { return (int)(C.QEvent_registerEventType()) } -func QEvent_RegisterEventType1(hint int) int { - return (int)(C.QEvent_registerEventType1((C.int)(hint))) +func QEvent_RegisterEventTypeWithHint(hint int) int { + return (int)(C.QEvent_registerEventTypeWithHint((C.int)(hint))) } // Delete this object from C++ memory. diff --git a/qt/gen_qcoreevent.h b/qt/gen_qcoreevent.h index a0cb0182..dc426653 100644 --- a/qt/gen_qcoreevent.h +++ b/qt/gen_qcoreevent.h @@ -38,7 +38,7 @@ bool QEvent_isAccepted(const QEvent* self); void QEvent_accept(QEvent* self); void QEvent_ignore(QEvent* self); int QEvent_registerEventType(); -int QEvent_registerEventType1(int hint); +int QEvent_registerEventTypeWithHint(int hint); void QEvent_delete(QEvent* self); QTimerEvent* QTimerEvent_new(int timerId); diff --git a/qt/gen_qdatastream.cpp b/qt/gen_qdatastream.cpp index 35c4451c..f1f0d752 100644 --- a/qt/gen_qdatastream.cpp +++ b/qt/gen_qdatastream.cpp @@ -88,11 +88,11 @@ void QDataStream_operatorShiftRightWithQuint8(QDataStream* self, unsigned char* self->operator>>(static_cast(*i)); } -void QDataStream_operatorShiftRightWithQint16(QDataStream* self, int16_t* i) { +void QDataStream_operatorShiftRightWithQint16(QDataStream* self, short* i) { self->operator>>(static_cast(*i)); } -void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, uint16_t* i) { +void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, unsigned short* i) { self->operator>>(static_cast(*i)); } @@ -136,11 +136,11 @@ void QDataStream_operatorShiftLeftWithQuint8(QDataStream* self, unsigned char i) self->operator<<(static_cast(i)); } -void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, int16_t i) { +void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, short i) { self->operator<<(static_cast(i)); } -void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, uint16_t i) { +void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, unsigned short i) { self->operator<<(static_cast(i)); } diff --git a/qt/gen_qdatastream.go b/qt/gen_qdatastream.go index 929013e5..f83596f0 100644 --- a/qt/gen_qdatastream.go +++ b/qt/gen_qdatastream.go @@ -192,11 +192,11 @@ func (this *QDataStream) OperatorShiftRightWithQuint8(i *byte) { } func (this *QDataStream) OperatorShiftRightWithQint16(i *int16) { - C.QDataStream_operatorShiftRightWithQint16(this.h, (*C.int16_t)(unsafe.Pointer(i))) + C.QDataStream_operatorShiftRightWithQint16(this.h, (*C.short)(unsafe.Pointer(i))) } func (this *QDataStream) OperatorShiftRightWithQuint16(i *uint16) { - C.QDataStream_operatorShiftRightWithQuint16(this.h, (*C.uint16_t)(unsafe.Pointer(i))) + C.QDataStream_operatorShiftRightWithQuint16(this.h, (*C.ushort)(unsafe.Pointer(i))) } func (this *QDataStream) OperatorShiftRightWithQint32(i *int) { @@ -242,11 +242,11 @@ func (this *QDataStream) OperatorShiftLeftWithQuint8(i byte) { } func (this *QDataStream) OperatorShiftLeftWithQint16(i int16) { - C.QDataStream_operatorShiftLeftWithQint16(this.h, (C.int16_t)(i)) + C.QDataStream_operatorShiftLeftWithQint16(this.h, (C.short)(i)) } func (this *QDataStream) OperatorShiftLeftWithQuint16(i uint16) { - C.QDataStream_operatorShiftLeftWithQuint16(this.h, (C.uint16_t)(i)) + C.QDataStream_operatorShiftLeftWithQuint16(this.h, (C.ushort)(i)) } func (this *QDataStream) OperatorShiftLeftWithQint32(i int) { diff --git a/qt/gen_qdatastream.h b/qt/gen_qdatastream.h index e4a5bdf5..c785c561 100644 --- a/qt/gen_qdatastream.h +++ b/qt/gen_qdatastream.h @@ -40,8 +40,8 @@ int QDataStream_version(const QDataStream* self); void QDataStream_setVersion(QDataStream* self, int version); void QDataStream_operatorShiftRight(QDataStream* self, signed char* i); void QDataStream_operatorShiftRightWithQuint8(QDataStream* self, unsigned char* i); -void QDataStream_operatorShiftRightWithQint16(QDataStream* self, int16_t* i); -void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, uint16_t* i); +void QDataStream_operatorShiftRightWithQint16(QDataStream* self, short* i); +void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, unsigned short* i); void QDataStream_operatorShiftRightWithQint32(QDataStream* self, int* i); void QDataStream_operatorShiftRightWithQuint32(QDataStream* self, unsigned int* i); void QDataStream_operatorShiftRightWithQint64(QDataStream* self, long long* i); @@ -52,8 +52,8 @@ void QDataStream_operatorShiftRightWithDouble(QDataStream* self, double* f); void QDataStream_operatorShiftRightWithStr(QDataStream* self, char* str); void QDataStream_operatorShiftLeft(QDataStream* self, signed char i); void QDataStream_operatorShiftLeftWithQuint8(QDataStream* self, unsigned char i); -void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, int16_t i); -void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, uint16_t i); +void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, short i); +void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, unsigned short i); void QDataStream_operatorShiftLeftWithQint32(QDataStream* self, int i); void QDataStream_operatorShiftLeftWithQuint32(QDataStream* self, unsigned int i); void QDataStream_operatorShiftLeftWithQint64(QDataStream* self, long long i); diff --git a/qt/gen_qdatetime.cpp b/qt/gen_qdatetime.cpp index b47536a5..97c35fe7 100644 --- a/qt/gen_qdatetime.cpp +++ b/qt/gen_qdatetime.cpp @@ -310,11 +310,11 @@ long long QDate_toJulianDay(const QDate* self) { return static_cast(_ret); } -int QDate_weekNumber1(const QDate* self, int* yearNum) { +int QDate_weekNumberWithYearNum(const QDate* self, int* yearNum) { return self->weekNumber(static_cast(yearNum)); } -QDateTime* QDate_startOfDay1(const QDate* self, int spec) { +QDateTime* QDate_startOfDayWithSpec(const QDate* self, int spec) { return new QDateTime(self->startOfDay(static_cast(spec))); } @@ -322,7 +322,7 @@ QDateTime* QDate_startOfDay2(const QDate* self, int spec, int offsetSeconds) { return new QDateTime(self->startOfDay(static_cast(spec), static_cast(offsetSeconds))); } -QDateTime* QDate_endOfDay1(const QDate* self, int spec) { +QDateTime* QDate_endOfDayWithSpec(const QDate* self, int spec) { return new QDateTime(self->endOfDay(static_cast(spec))); } @@ -374,7 +374,7 @@ struct miqt_string QDate_longDayName2(int weekday, int type) { return _ms; } -struct miqt_string QDate_toString1(const QDate* self, int format) { +struct miqt_string QDate_toString6(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(); @@ -385,7 +385,7 @@ struct miqt_string QDate_toString1(const QDate* self, int format) { return _ms; } -QDate* QDate_fromString22(struct miqt_string s, int f) { +QDate* QDate_fromString4(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))); } @@ -544,7 +544,7 @@ int QTime_elapsed(const QTime* self) { return self->elapsed(); } -struct miqt_string QTime_toString1(const QTime* self, int f) { +struct miqt_string QTime_toStringWithQtDateFormat(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(); @@ -555,16 +555,16 @@ struct miqt_string QTime_toString1(const QTime* self, int f) { return _ms; } -bool QTime_setHMS4(QTime* self, int h, int m, int s, int ms) { +bool QTime_setHMS2(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) { +QTime* QTime_fromString3(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))); } -bool QTime_isValid4(int h, int m, int s, int ms) { +bool QTime_isValid3(int h, int m, int s, int ms) { return QTime::isValid(static_cast(h), static_cast(m), static_cast(s), static_cast(ms)); } @@ -884,7 +884,7 @@ long long QDateTime_currentSecsSinceEpoch() { return static_cast(_ret); } -struct miqt_string QDateTime_toString1(const QDateTime* self, int format) { +struct miqt_string QDateTime_toString5(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(); @@ -895,24 +895,24 @@ struct miqt_string QDateTime_toString1(const QDateTime* self, int format) { return _ms; } -QDateTime* QDateTime_fromString22(struct miqt_string s, int f) { +QDateTime* QDateTime_fromString4(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))); } -QDateTime* QDateTime_fromTimeT32(unsigned int secsSince1Jan1970UTC, int spec, int offsetFromUtc) { +QDateTime* QDateTime_fromTimeT4(unsigned int secsSince1Jan1970UTC, int spec, int offsetFromUtc) { return new QDateTime(QDateTime::fromTime_t(static_cast(secsSince1Jan1970UTC), static_cast(spec), static_cast(offsetFromUtc))); } -QDateTime* QDateTime_fromMSecsSinceEpoch32(long long msecs, int spec, int offsetFromUtc) { +QDateTime* QDateTime_fromMSecsSinceEpoch4(long long msecs, int spec, int offsetFromUtc) { return new QDateTime(QDateTime::fromMSecsSinceEpoch(static_cast(msecs), static_cast(spec), static_cast(offsetFromUtc))); } -QDateTime* QDateTime_fromSecsSinceEpoch22(long long secs, int spe) { +QDateTime* QDateTime_fromSecsSinceEpoch3(long long secs, int spe) { return new QDateTime(QDateTime::fromSecsSinceEpoch(static_cast(secs), static_cast(spe))); } -QDateTime* QDateTime_fromSecsSinceEpoch3(long long secs, int spe, int offsetFromUtc) { +QDateTime* QDateTime_fromSecsSinceEpoch4(long long secs, int spe, int offsetFromUtc) { return new QDateTime(QDateTime::fromSecsSinceEpoch(static_cast(secs), static_cast(spe), static_cast(offsetFromUtc))); } diff --git a/qt/gen_qdatetime.go b/qt/gen_qdatetime.go index fe053d1a..0697e0ee 100644 --- a/qt/gen_qdatetime.go +++ b/qt/gen_qdatetime.go @@ -375,12 +375,12 @@ func (this *QDate) ToJulianDay() int64 { return (int64)(C.QDate_toJulianDay(this.h)) } -func (this *QDate) WeekNumber1(yearNum *int) int { - return (int)(C.QDate_weekNumber1(this.h, (*C.int)(unsafe.Pointer(yearNum)))) +func (this *QDate) WeekNumberWithYearNum(yearNum *int) int { + return (int)(C.QDate_weekNumberWithYearNum(this.h, (*C.int)(unsafe.Pointer(yearNum)))) } -func (this *QDate) StartOfDay1(spec TimeSpec) *QDateTime { - _goptr := newQDateTime(C.QDate_startOfDay1(this.h, (C.int)(spec))) +func (this *QDate) StartOfDayWithSpec(spec TimeSpec) *QDateTime { + _goptr := newQDateTime(C.QDate_startOfDayWithSpec(this.h, (C.int)(spec))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -391,8 +391,8 @@ func (this *QDate) StartOfDay2(spec TimeSpec, offsetSeconds int) *QDateTime { return _goptr } -func (this *QDate) EndOfDay1(spec TimeSpec) *QDateTime { - _goptr := newQDateTime(C.QDate_endOfDay1(this.h, (C.int)(spec))) +func (this *QDate) EndOfDayWithSpec(spec TimeSpec) *QDateTime { + _goptr := newQDateTime(C.QDate_endOfDayWithSpec(this.h, (C.int)(spec))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -431,19 +431,19 @@ func QDate_LongDayName2(weekday int, typeVal QDate__MonthNameType) string { return _ret } -func (this *QDate) ToString1(format DateFormat) string { - var _ms C.struct_miqt_string = C.QDate_toString1(this.h, (C.int)(format)) +func (this *QDate) ToString6(format DateFormat) string { + var _ms C.struct_miqt_string = C.QDate_toString6(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 { +func QDate_FromString4(s string, f DateFormat) *QDate { 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)) - _goptr := newQDate(C.QDate_fromString22(s_ms, (C.int)(f))) + _goptr := newQDate(C.QDate_fromString4(s_ms, (C.int)(f))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -670,29 +670,29 @@ func (this *QTime) Elapsed() int { return (int)(C.QTime_elapsed(this.h)) } -func (this *QTime) ToString1(f DateFormat) string { - var _ms C.struct_miqt_string = C.QTime_toString1(this.h, (C.int)(f)) +func (this *QTime) ToStringWithQtDateFormat(f DateFormat) string { + var _ms C.struct_miqt_string = C.QTime_toStringWithQtDateFormat(this.h, (C.int)(f)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QTime) SetHMS4(h int, m int, s int, ms int) bool { - return (bool)(C.QTime_setHMS4(this.h, (C.int)(h), (C.int)(m), (C.int)(s), (C.int)(ms))) +func (this *QTime) SetHMS2(h int, m int, s int, ms int) bool { + return (bool)(C.QTime_setHMS2(this.h, (C.int)(h), (C.int)(m), (C.int)(s), (C.int)(ms))) } -func QTime_FromString22(s string, f DateFormat) *QTime { +func QTime_FromString3(s string, f DateFormat) *QTime { 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)) - _goptr := newQTime(C.QTime_fromString22(s_ms, (C.int)(f))) + _goptr := newQTime(C.QTime_fromString3(s_ms, (C.int)(f))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QTime_IsValid4(h int, m int, s int, ms int) bool { - return (bool)(C.QTime_isValid4((C.int)(h), (C.int)(m), (C.int)(s), (C.int)(ms))) +func QTime_IsValid3(h int, m int, s int, ms int) bool { + return (bool)(C.QTime_isValid3((C.int)(h), (C.int)(m), (C.int)(s), (C.int)(ms))) } // Delete this object from C++ memory. @@ -1113,43 +1113,43 @@ func QDateTime_CurrentSecsSinceEpoch() int64 { return (int64)(C.QDateTime_currentSecsSinceEpoch()) } -func (this *QDateTime) ToString1(format DateFormat) string { - var _ms C.struct_miqt_string = C.QDateTime_toString1(this.h, (C.int)(format)) +func (this *QDateTime) ToString5(format DateFormat) string { + var _ms C.struct_miqt_string = C.QDateTime_toString5(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 { +func QDateTime_FromString4(s string, f DateFormat) *QDateTime { 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)) - _goptr := newQDateTime(C.QDateTime_fromString22(s_ms, (C.int)(f))) + _goptr := newQDateTime(C.QDateTime_fromString4(s_ms, (C.int)(f))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QDateTime_FromTimeT32(secsSince1Jan1970UTC uint, spec TimeSpec, offsetFromUtc int) *QDateTime { - _goptr := newQDateTime(C.QDateTime_fromTimeT32((C.uint)(secsSince1Jan1970UTC), (C.int)(spec), (C.int)(offsetFromUtc))) +func QDateTime_FromTimeT4(secsSince1Jan1970UTC uint, spec TimeSpec, offsetFromUtc int) *QDateTime { + _goptr := newQDateTime(C.QDateTime_fromTimeT4((C.uint)(secsSince1Jan1970UTC), (C.int)(spec), (C.int)(offsetFromUtc))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QDateTime_FromMSecsSinceEpoch32(msecs int64, spec TimeSpec, offsetFromUtc int) *QDateTime { - _goptr := newQDateTime(C.QDateTime_fromMSecsSinceEpoch32((C.longlong)(msecs), (C.int)(spec), (C.int)(offsetFromUtc))) +func QDateTime_FromMSecsSinceEpoch4(msecs int64, spec TimeSpec, offsetFromUtc int) *QDateTime { + _goptr := newQDateTime(C.QDateTime_fromMSecsSinceEpoch4((C.longlong)(msecs), (C.int)(spec), (C.int)(offsetFromUtc))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QDateTime_FromSecsSinceEpoch22(secs int64, spe TimeSpec) *QDateTime { - _goptr := newQDateTime(C.QDateTime_fromSecsSinceEpoch22((C.longlong)(secs), (C.int)(spe))) +func QDateTime_FromSecsSinceEpoch3(secs int64, spe TimeSpec) *QDateTime { + _goptr := newQDateTime(C.QDateTime_fromSecsSinceEpoch3((C.longlong)(secs), (C.int)(spe))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QDateTime_FromSecsSinceEpoch3(secs int64, spe TimeSpec, offsetFromUtc int) *QDateTime { - _goptr := newQDateTime(C.QDateTime_fromSecsSinceEpoch3((C.longlong)(secs), (C.int)(spe), (C.int)(offsetFromUtc))) +func QDateTime_FromSecsSinceEpoch4(secs int64, spe TimeSpec, offsetFromUtc int) *QDateTime { + _goptr := newQDateTime(C.QDateTime_fromSecsSinceEpoch4((C.longlong)(secs), (C.int)(spe), (C.int)(offsetFromUtc))) _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 a1c6dbb3..38ab7743 100644 --- a/qt/gen_qdatetime.h +++ b/qt/gen_qdatetime.h @@ -85,17 +85,17 @@ bool QDate_isValid2(int y, int m, int d); bool QDate_isLeapYear(int year); QDate* QDate_fromJulianDay(long long jd_); long long QDate_toJulianDay(const QDate* self); -int QDate_weekNumber1(const QDate* self, int* yearNum); -QDateTime* QDate_startOfDay1(const QDate* self, int spec); +int QDate_weekNumberWithYearNum(const QDate* self, int* yearNum); +QDateTime* QDate_startOfDayWithSpec(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_endOfDayWithSpec(const QDate* self, int spec); QDateTime* QDate_endOfDay2(const QDate* self, int spec, int offsetSeconds); struct miqt_string QDate_shortMonthName2(int month, int type); struct miqt_string QDate_shortDayName2(int weekday, int type); struct miqt_string QDate_longMonthName2(int month, int type); struct miqt_string QDate_longDayName2(int weekday, int type); -struct miqt_string QDate_toString1(const QDate* self, int format); -QDate* QDate_fromString22(struct miqt_string s, int f); +struct miqt_string QDate_toString6(const QDate* self, int format); +QDate* QDate_fromString4(struct miqt_string s, int f); void QDate_delete(QDate* self); QTime* QTime_new(); @@ -131,10 +131,10 @@ 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); -bool QTime_setHMS4(QTime* self, int h, int m, int s, int ms); -QTime* QTime_fromString22(struct miqt_string s, int f); -bool QTime_isValid4(int h, int m, int s, int ms); +struct miqt_string QTime_toStringWithQtDateFormat(const QTime* self, int f); +bool QTime_setHMS2(QTime* self, int h, int m, int s, int ms); +QTime* QTime_fromString3(struct miqt_string s, int f); +bool QTime_isValid3(int h, int m, int s, int ms); void QTime_delete(QTime* self); QDateTime* QDateTime_new(QDate* param1); @@ -204,12 +204,12 @@ 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); -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); -QDateTime* QDateTime_fromSecsSinceEpoch3(long long secs, int spe, int offsetFromUtc); +struct miqt_string QDateTime_toString5(const QDateTime* self, int format); +QDateTime* QDateTime_fromString4(struct miqt_string s, int f); +QDateTime* QDateTime_fromTimeT4(unsigned int secsSince1Jan1970UTC, int spec, int offsetFromUtc); +QDateTime* QDateTime_fromMSecsSinceEpoch4(long long msecs, int spec, int offsetFromUtc); +QDateTime* QDateTime_fromSecsSinceEpoch3(long long secs, int spe); +QDateTime* QDateTime_fromSecsSinceEpoch4(long long secs, int spe, int offsetFromUtc); void QDateTime_delete(QDateTime* self); #ifdef __cplusplus diff --git a/qt/gen_qdeadlinetimer.cpp b/qt/gen_qdeadlinetimer.cpp index 9c20a735..f3a05034 100644 --- a/qt/gen_qdeadlinetimer.cpp +++ b/qt/gen_qdeadlinetimer.cpp @@ -143,7 +143,7 @@ void QDeadlineTimer_setPreciseDeadline3(QDeadlineTimer* self, long long secs, lo self->setPreciseDeadline(static_cast(secs), static_cast(nsecs), static_cast(type)); } -QDeadlineTimer* QDeadlineTimer_current1(int timerType) { +QDeadlineTimer* QDeadlineTimer_currentWithTimerType(int timerType) { return new QDeadlineTimer(QDeadlineTimer::current(static_cast(timerType))); } diff --git a/qt/gen_qdeadlinetimer.go b/qt/gen_qdeadlinetimer.go index 105848c7..280f7d76 100644 --- a/qt/gen_qdeadlinetimer.go +++ b/qt/gen_qdeadlinetimer.go @@ -193,8 +193,8 @@ func (this *QDeadlineTimer) SetPreciseDeadline3(secs int64, nsecs int64, typeVal C.QDeadlineTimer_setPreciseDeadline3(this.h, (C.longlong)(secs), (C.longlong)(nsecs), (C.int)(typeVal)) } -func QDeadlineTimer_Current1(timerType TimerType) *QDeadlineTimer { - _goptr := newQDeadlineTimer(C.QDeadlineTimer_current1((C.int)(timerType))) +func QDeadlineTimer_CurrentWithTimerType(timerType TimerType) *QDeadlineTimer { + _goptr := newQDeadlineTimer(C.QDeadlineTimer_currentWithTimerType((C.int)(timerType))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qdeadlinetimer.h b/qt/gen_qdeadlinetimer.h index b9dc9f5b..c695f5e7 100644 --- a/qt/gen_qdeadlinetimer.h +++ b/qt/gen_qdeadlinetimer.h @@ -51,7 +51,7 @@ void QDeadlineTimer_setPreciseRemainingTime3(QDeadlineTimer* self, long long sec void QDeadlineTimer_setDeadline2(QDeadlineTimer* self, long long msecs, int timerType); void QDeadlineTimer_setPreciseDeadline2(QDeadlineTimer* self, long long secs, long long nsecs); void QDeadlineTimer_setPreciseDeadline3(QDeadlineTimer* self, long long secs, long long nsecs, int type); -QDeadlineTimer* QDeadlineTimer_current1(int timerType); +QDeadlineTimer* QDeadlineTimer_currentWithTimerType(int timerType); void QDeadlineTimer_delete(QDeadlineTimer* self); #ifdef __cplusplus diff --git a/qt/gen_qdebug.cpp b/qt/gen_qdebug.cpp index 96e3bb5d..f6a9357d 100644 --- a/qt/gen_qdebug.cpp +++ b/qt/gen_qdebug.cpp @@ -116,13 +116,13 @@ QDebug* QDebug_operatorShiftLeftWithChar(QDebug* self, char t) { return &_ret; } -QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, int16_t t) { +QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, short t) { QDebug& _ret = self->operator<<(static_cast(t)); // Cast returned reference into pointer return &_ret; } -QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, uint16_t t) { +QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, unsigned short t) { QDebug& _ret = self->operator<<(static_cast(t)); // Cast returned reference into pointer return &_ret; @@ -202,7 +202,7 @@ QDebug* QDebug_operatorShiftLeftWithVoid(QDebug* self, const void* t) { return &_ret; } -QDebug* QDebug_maybeQuote1(QDebug* self, char c) { +QDebug* QDebug_maybeQuoteWithChar(QDebug* self, char c) { QDebug& _ret = self->maybeQuote(static_cast(c)); // Cast returned reference into pointer return &_ret; @@ -262,7 +262,7 @@ QNoDebug* QNoDebug_verbosity(QNoDebug* self, int param1) { return &_ret; } -QNoDebug* QNoDebug_maybeQuote1(QNoDebug* self, const char param1) { +QNoDebug* QNoDebug_maybeQuoteWithChar(QNoDebug* self, const char param1) { QNoDebug& _ret = self->maybeQuote(static_cast(param1)); // Cast returned reference into pointer return &_ret; diff --git a/qt/gen_qdebug.go b/qt/gen_qdebug.go index 32ae04a0..33341faf 100644 --- a/qt/gen_qdebug.go +++ b/qt/gen_qdebug.go @@ -134,11 +134,11 @@ func (this *QDebug) OperatorShiftLeftWithChar(t int8) *QDebug { } func (this *QDebug) OperatorShiftLeftWithShort(t int16) *QDebug { - return newQDebug(C.QDebug_operatorShiftLeftWithShort(this.h, (C.int16_t)(t))) + return newQDebug(C.QDebug_operatorShiftLeftWithShort(this.h, (C.short)(t))) } func (this *QDebug) OperatorShiftLeftWithUnsignedshort(t uint16) *QDebug { - return newQDebug(C.QDebug_operatorShiftLeftWithUnsignedshort(this.h, (C.uint16_t)(t))) + return newQDebug(C.QDebug_operatorShiftLeftWithUnsignedshort(this.h, (C.ushort)(t))) } func (this *QDebug) OperatorShiftLeftWithInt(t int) *QDebug { @@ -202,8 +202,8 @@ func (this *QDebug) OperatorShiftLeftWithVoid(t unsafe.Pointer) *QDebug { return newQDebug(C.QDebug_operatorShiftLeftWithVoid(this.h, t)) } -func (this *QDebug) MaybeQuote1(c int8) *QDebug { - return newQDebug(C.QDebug_maybeQuote1(this.h, (C.char)(c))) +func (this *QDebug) MaybeQuoteWithChar(c int8) *QDebug { + return newQDebug(C.QDebug_maybeQuoteWithChar(this.h, (C.char)(c))) } // Delete this object from C++ memory. @@ -332,8 +332,8 @@ func (this *QNoDebug) Verbosity(param1 int) *QNoDebug { return newQNoDebug(C.QNoDebug_verbosity(this.h, (C.int)(param1))) } -func (this *QNoDebug) MaybeQuote1(param1 int8) *QNoDebug { - return newQNoDebug(C.QNoDebug_maybeQuote1(this.h, (C.const_char)(param1))) +func (this *QNoDebug) MaybeQuoteWithChar(param1 int8) *QNoDebug { + return newQNoDebug(C.QNoDebug_maybeQuoteWithChar(this.h, (C.const_char)(param1))) } // Delete this object from C++ memory. diff --git a/qt/gen_qdebug.h b/qt/gen_qdebug.h index 29e9cd8c..00b2242f 100644 --- a/qt/gen_qdebug.h +++ b/qt/gen_qdebug.h @@ -47,8 +47,8 @@ QDebug* QDebug_maybeQuote(QDebug* self); QDebug* QDebug_operatorShiftLeft(QDebug* self, QChar* t); QDebug* QDebug_operatorShiftLeftWithBool(QDebug* self, bool t); QDebug* QDebug_operatorShiftLeftWithChar(QDebug* self, char t); -QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, int16_t t); -QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, uint16_t t); +QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, short t); +QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, unsigned short t); QDebug* QDebug_operatorShiftLeftWithInt(QDebug* self, int t); QDebug* QDebug_operatorShiftLeftWithUnsignedint(QDebug* self, unsigned int t); QDebug* QDebug_operatorShiftLeftWithLong(QDebug* self, long t); @@ -61,7 +61,7 @@ QDebug* QDebug_operatorShiftLeft2(QDebug* self, const char* 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); +QDebug* QDebug_maybeQuoteWithChar(QDebug* self, char c); void QDebug_delete(QDebug* self); QDebugStateSaver* QDebugStateSaver_new(QDebug* dbg); @@ -74,7 +74,7 @@ QNoDebug* QNoDebug_quote(QNoDebug* self); QNoDebug* QNoDebug_noquote(QNoDebug* self); QNoDebug* QNoDebug_maybeQuote(QNoDebug* self); QNoDebug* QNoDebug_verbosity(QNoDebug* self, int param1); -QNoDebug* QNoDebug_maybeQuote1(QNoDebug* self, const char param1); +QNoDebug* QNoDebug_maybeQuoteWithChar(QNoDebug* self, const char param1); void QNoDebug_delete(QNoDebug* self); #ifdef __cplusplus diff --git a/qt/gen_qdesktopwidget.cpp b/qt/gen_qdesktopwidget.cpp index 0043dd8c..137e84f0 100644 --- a/qt/gen_qdesktopwidget.cpp +++ b/qt/gen_qdesktopwidget.cpp @@ -1180,19 +1180,19 @@ struct miqt_string QDesktopWidget_trUtf83(const char* s, const char* c, int n) { return _ms; } -int QDesktopWidget_screenNumber1(const QDesktopWidget* self, QWidget* widget) { +int QDesktopWidget_screenNumberWithWidget(const QDesktopWidget* self, QWidget* widget) { return self->screenNumber(widget); } -QWidget* QDesktopWidget_screen1(QDesktopWidget* self, int screen) { +QWidget* QDesktopWidget_screenWithScreen(QDesktopWidget* self, int screen) { return self->screen(static_cast(screen)); } -QRect* QDesktopWidget_screenGeometry1(const QDesktopWidget* self, int screen) { +QRect* QDesktopWidget_screenGeometryWithScreen(const QDesktopWidget* self, int screen) { return new QRect(self->screenGeometry(static_cast(screen))); } -QRect* QDesktopWidget_availableGeometry1(const QDesktopWidget* self, int screen) { +QRect* QDesktopWidget_availableGeometryWithScreen(const QDesktopWidget* self, int screen) { return new QRect(self->availableGeometry(static_cast(screen))); } diff --git a/qt/gen_qdesktopwidget.go b/qt/gen_qdesktopwidget.go index 728acb78..1784ce26 100644 --- a/qt/gen_qdesktopwidget.go +++ b/qt/gen_qdesktopwidget.go @@ -269,22 +269,22 @@ func QDesktopWidget_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QDesktopWidget) ScreenNumber1(widget *QWidget) int { - return (int)(C.QDesktopWidget_screenNumber1(this.h, widget.cPointer())) +func (this *QDesktopWidget) ScreenNumberWithWidget(widget *QWidget) int { + return (int)(C.QDesktopWidget_screenNumberWithWidget(this.h, widget.cPointer())) } -func (this *QDesktopWidget) Screen1(screen int) *QWidget { - return newQWidget(C.QDesktopWidget_screen1(this.h, (C.int)(screen))) +func (this *QDesktopWidget) ScreenWithScreen(screen int) *QWidget { + return newQWidget(C.QDesktopWidget_screenWithScreen(this.h, (C.int)(screen))) } -func (this *QDesktopWidget) ScreenGeometry1(screen int) *QRect { - _goptr := newQRect(C.QDesktopWidget_screenGeometry1(this.h, (C.int)(screen))) +func (this *QDesktopWidget) ScreenGeometryWithScreen(screen int) *QRect { + _goptr := newQRect(C.QDesktopWidget_screenGeometryWithScreen(this.h, (C.int)(screen))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QDesktopWidget) AvailableGeometry1(screen int) *QRect { - _goptr := newQRect(C.QDesktopWidget_availableGeometry1(this.h, (C.int)(screen))) +func (this *QDesktopWidget) AvailableGeometryWithScreen(screen int) *QRect { + _goptr := newQRect(C.QDesktopWidget_availableGeometryWithScreen(this.h, (C.int)(screen))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qdesktopwidget.h b/qt/gen_qdesktopwidget.h index 1c0dd080..7ae2ec70 100644 --- a/qt/gen_qdesktopwidget.h +++ b/qt/gen_qdesktopwidget.h @@ -116,10 +116,10 @@ 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); -QRect* QDesktopWidget_availableGeometry1(const QDesktopWidget* self, int screen); +int QDesktopWidget_screenNumberWithWidget(const QDesktopWidget* self, QWidget* widget); +QWidget* QDesktopWidget_screenWithScreen(QDesktopWidget* self, int screen); +QRect* QDesktopWidget_screenGeometryWithScreen(const QDesktopWidget* self, int screen); +QRect* QDesktopWidget_availableGeometryWithScreen(const QDesktopWidget* self, int screen); bool QDesktopWidget_override_virtual_resizeEvent(void* self, intptr_t slot); void QDesktopWidget_virtualbase_resizeEvent(void* self, QResizeEvent* e); bool QDesktopWidget_override_virtual_devType(void* self, intptr_t slot); diff --git a/qt/gen_qdir.cpp b/qt/gen_qdir.cpp index 153d27d2..88c123e6 100644 --- a/qt/gen_qdir.cpp +++ b/qt/gen_qdir.cpp @@ -594,11 +594,11 @@ void QDir_refresh(const QDir* self) { self->refresh(); } -bool QDir_isEmpty1(const QDir* self, int filters) { +bool QDir_isEmptyWithFilters(const QDir* self, int filters) { return self->isEmpty(static_cast(filters)); } -struct miqt_array /* of struct miqt_string */ QDir_entryList1(const QDir* self, int filters) { +struct miqt_array /* of struct miqt_string */ QDir_entryListWithFilters(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())); @@ -638,7 +638,7 @@ struct miqt_array /* of struct miqt_string */ QDir_entryList2(const QDir* self, return _out; } -struct miqt_array /* of struct miqt_string */ QDir_entryList22(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters) { +struct miqt_array /* of struct miqt_string */ QDir_entryList3(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); @@ -665,7 +665,7 @@ struct miqt_array /* of struct miqt_string */ QDir_entryList22(const QDir* self return _out; } -struct miqt_array /* of struct miqt_string */ QDir_entryList3(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters, int sort) { +struct miqt_array /* of struct miqt_string */ QDir_entryList4(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); @@ -692,7 +692,7 @@ struct miqt_array /* of struct miqt_string */ QDir_entryList3(const QDir* self, return _out; } -struct miqt_array /* of QFileInfo* */ QDir_entryInfoList1(const QDir* self, int filters) { +struct miqt_array /* of QFileInfo* */ QDir_entryInfoListWithFilters(const QDir* self, int filters) { QFileInfoList _ret = self->entryInfoList(static_cast(filters)); // Convert QList<> from C++ memory to manually-managed C memory QFileInfo** _arr = static_cast(malloc(sizeof(QFileInfo*) * _ret.length())); @@ -718,7 +718,7 @@ struct miqt_array /* of QFileInfo* */ QDir_entryInfoList2(const QDir* self, int return _out; } -struct miqt_array /* of QFileInfo* */ QDir_entryInfoList22(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters) { +struct miqt_array /* of QFileInfo* */ QDir_entryInfoList3(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); @@ -738,7 +738,7 @@ struct miqt_array /* of QFileInfo* */ QDir_entryInfoList22(const QDir* self, st return _out; } -struct miqt_array /* of QFileInfo* */ QDir_entryInfoList3(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters, int sort) { +struct miqt_array /* of QFileInfo* */ QDir_entryInfoList4(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); diff --git a/qt/gen_qdir.go b/qt/gen_qdir.go index a97bd4fa..6633b43c 100644 --- a/qt/gen_qdir.go +++ b/qt/gen_qdir.go @@ -711,12 +711,12 @@ func (this *QDir) Refresh() { C.QDir_refresh(this.h) } -func (this *QDir) IsEmpty1(filters QDir__Filter) bool { - return (bool)(C.QDir_isEmpty1(this.h, (C.int)(filters))) +func (this *QDir) IsEmptyWithFilters(filters QDir__Filter) bool { + return (bool)(C.QDir_isEmptyWithFilters(this.h, (C.int)(filters))) } -func (this *QDir) EntryList1(filters QDir__Filter) []string { - var _ma C.struct_miqt_array = C.QDir_entryList1(this.h, (C.int)(filters)) +func (this *QDir) EntryListWithFilters(filters QDir__Filter) []string { + var _ma C.struct_miqt_array = C.QDir_entryListWithFilters(this.h, (C.int)(filters)) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -741,7 +741,7 @@ func (this *QDir) EntryList2(filters QDir__Filter, sort QDir__SortFlag) []string return _ret } -func (this *QDir) EntryList22(nameFilters []string, filters QDir__Filter) []string { +func (this *QDir) EntryList3(nameFilters []string, filters QDir__Filter) []string { nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(int(unsafe.Sizeof(C.struct_miqt_string{})) * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { @@ -752,7 +752,7 @@ func (this *QDir) EntryList22(nameFilters []string, filters QDir__Filter) []stri nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} - var _ma C.struct_miqt_array = C.QDir_entryList22(this.h, nameFilters_ma, (C.int)(filters)) + var _ma C.struct_miqt_array = C.QDir_entryList3(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 for i := 0; i < int(_ma.len); i++ { @@ -764,7 +764,7 @@ func (this *QDir) EntryList22(nameFilters []string, filters QDir__Filter) []stri return _ret } -func (this *QDir) EntryList3(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag) []string { +func (this *QDir) EntryList4(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag) []string { nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(int(unsafe.Sizeof(C.struct_miqt_string{})) * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { @@ -775,7 +775,7 @@ func (this *QDir) EntryList3(nameFilters []string, filters QDir__Filter, sort QD nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} - var _ma C.struct_miqt_array = C.QDir_entryList3(this.h, nameFilters_ma, (C.int)(filters), (C.int)(sort)) + var _ma C.struct_miqt_array = C.QDir_entryList4(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 for i := 0; i < int(_ma.len); i++ { @@ -787,8 +787,8 @@ func (this *QDir) EntryList3(nameFilters []string, filters QDir__Filter, sort QD return _ret } -func (this *QDir) EntryInfoList1(filters QDir__Filter) []QFileInfo { - var _ma C.struct_miqt_array = C.QDir_entryInfoList1(this.h, (C.int)(filters)) +func (this *QDir) EntryInfoListWithFilters(filters QDir__Filter) []QFileInfo { + var _ma C.struct_miqt_array = C.QDir_entryInfoListWithFilters(this.h, (C.int)(filters)) _ret := make([]QFileInfo, int(_ma.len)) _outCast := (*[0xffff]*C.QFileInfo)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -811,7 +811,7 @@ func (this *QDir) EntryInfoList2(filters QDir__Filter, sort QDir__SortFlag) []QF return _ret } -func (this *QDir) EntryInfoList22(nameFilters []string, filters QDir__Filter) []QFileInfo { +func (this *QDir) EntryInfoList3(nameFilters []string, filters QDir__Filter) []QFileInfo { nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(int(unsafe.Sizeof(C.struct_miqt_string{})) * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { @@ -822,7 +822,7 @@ func (this *QDir) EntryInfoList22(nameFilters []string, filters QDir__Filter) [] nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} - var _ma C.struct_miqt_array = C.QDir_entryInfoList22(this.h, nameFilters_ma, (C.int)(filters)) + var _ma C.struct_miqt_array = C.QDir_entryInfoList3(this.h, nameFilters_ma, (C.int)(filters)) _ret := make([]QFileInfo, int(_ma.len)) _outCast := (*[0xffff]*C.QFileInfo)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -833,7 +833,7 @@ func (this *QDir) EntryInfoList22(nameFilters []string, filters QDir__Filter) [] return _ret } -func (this *QDir) EntryInfoList3(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag) []QFileInfo { +func (this *QDir) EntryInfoList4(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag) []QFileInfo { nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(int(unsafe.Sizeof(C.struct_miqt_string{})) * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { @@ -844,7 +844,7 @@ func (this *QDir) EntryInfoList3(nameFilters []string, filters QDir__Filter, sor nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} - var _ma C.struct_miqt_array = C.QDir_entryInfoList3(this.h, nameFilters_ma, (C.int)(filters), (C.int)(sort)) + var _ma C.struct_miqt_array = C.QDir_entryInfoList4(this.h, nameFilters_ma, (C.int)(filters), (C.int)(sort)) _ret := make([]QFileInfo, int(_ma.len)) _outCast := (*[0xffff]*C.QFileInfo)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qdir.h b/qt/gen_qdir.h index 41c629ff..61912e69 100644 --- a/qt/gen_qdir.h +++ b/qt/gen_qdir.h @@ -97,15 +97,15 @@ bool QDir_match(struct miqt_array /* of struct miqt_string */ filters, struct m 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 /* of struct miqt_string */ QDir_entryList1(const QDir* self, int filters); +bool QDir_isEmptyWithFilters(const QDir* self, int filters); +struct miqt_array /* of struct miqt_string */ QDir_entryListWithFilters(const QDir* self, int filters); struct miqt_array /* of struct miqt_string */ QDir_entryList2(const QDir* self, int filters, int sort); -struct miqt_array /* of struct miqt_string */ QDir_entryList22(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters); -struct miqt_array /* of struct miqt_string */ QDir_entryList3(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters, int sort); -struct miqt_array /* of QFileInfo* */ QDir_entryInfoList1(const QDir* self, int filters); +struct miqt_array /* of struct miqt_string */ QDir_entryList3(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters); +struct miqt_array /* of struct miqt_string */ QDir_entryList4(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters, int sort); +struct miqt_array /* of QFileInfo* */ QDir_entryInfoListWithFilters(const QDir* self, int filters); struct miqt_array /* of QFileInfo* */ QDir_entryInfoList2(const QDir* self, int filters, int sort); -struct miqt_array /* of QFileInfo* */ QDir_entryInfoList22(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters); -struct miqt_array /* of QFileInfo* */ QDir_entryInfoList3(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters, int sort); +struct miqt_array /* of QFileInfo* */ QDir_entryInfoList3(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters); +struct miqt_array /* of QFileInfo* */ QDir_entryInfoList4(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_qdirmodel.cpp b/qt/gen_qdirmodel.cpp index bac3798b..896535cb 100644 --- a/qt/gen_qdirmodel.cpp +++ b/qt/gen_qdirmodel.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -1341,7 +1342,7 @@ QModelIndex* QDirModel_index2(const QDirModel* self, struct miqt_string path, in return new QModelIndex(self->index(path_QString, static_cast(column))); } -void QDirModel_refresh1(QDirModel* self, QModelIndex* parent) { +void QDirModel_refreshWithParent(QDirModel* self, QModelIndex* parent) { self->refresh(*parent); } diff --git a/qt/gen_qdirmodel.go b/qt/gen_qdirmodel.go index 8b20582b..0b6ea682 100644 --- a/qt/gen_qdirmodel.go +++ b/qt/gen_qdirmodel.go @@ -400,8 +400,8 @@ func (this *QDirModel) Index2(path string, column int) *QModelIndex { return _goptr } -func (this *QDirModel) Refresh1(parent *QModelIndex) { - C.QDirModel_refresh1(this.h, parent.cPointer()) +func (this *QDirModel) RefreshWithParent(parent *QModelIndex) { + C.QDirModel_refreshWithParent(this.h, parent.cPointer()) } // ResetInternalData can only be called from a QDirModel that was directly constructed. diff --git a/qt/gen_qdirmodel.h b/qt/gen_qdirmodel.h index 35467173..05cecd58 100644 --- a/qt/gen_qdirmodel.h +++ b/qt/gen_qdirmodel.h @@ -102,7 +102,7 @@ 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_index2(const QDirModel* self, struct miqt_string path, int column); -void QDirModel_refresh1(QDirModel* self, QModelIndex* parent); +void QDirModel_refreshWithParent(QDirModel* self, QModelIndex* parent); bool QDirModel_override_virtual_index(void* self, intptr_t slot); QModelIndex* QDirModel_virtualbase_index(const void* self, int row, int column, QModelIndex* parent); bool QDirModel_override_virtual_parent(void* self, intptr_t slot); diff --git a/qt/gen_qdrag.cpp b/qt/gen_qdrag.cpp index 48c6f55b..bfd70e67 100644 --- a/qt/gen_qdrag.cpp +++ b/qt/gen_qdrag.cpp @@ -355,12 +355,12 @@ struct miqt_string QDrag_trUtf83(const char* s, const char* c, int n) { return _ms; } -int QDrag_start1(QDrag* self, int supportedActions) { +int QDrag_startWithSupportedActions(QDrag* self, int supportedActions) { Qt::DropAction _ret = self->start(static_cast(supportedActions)); return static_cast(_ret); } -int QDrag_exec1(QDrag* self, int supportedActions) { +int QDrag_execWithSupportedActions(QDrag* self, int supportedActions) { Qt::DropAction _ret = self->exec(static_cast(supportedActions)); return static_cast(_ret); } diff --git a/qt/gen_qdrag.go b/qt/gen_qdrag.go index d44fdd90..0eacbe70 100644 --- a/qt/gen_qdrag.go +++ b/qt/gen_qdrag.go @@ -238,12 +238,12 @@ func QDrag_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QDrag) Start1(supportedActions DropAction) DropAction { - return (DropAction)(C.QDrag_start1(this.h, (C.int)(supportedActions))) +func (this *QDrag) StartWithSupportedActions(supportedActions DropAction) DropAction { + return (DropAction)(C.QDrag_startWithSupportedActions(this.h, (C.int)(supportedActions))) } -func (this *QDrag) Exec1(supportedActions DropAction) DropAction { - return (DropAction)(C.QDrag_exec1(this.h, (C.int)(supportedActions))) +func (this *QDrag) ExecWithSupportedActions(supportedActions DropAction) DropAction { + return (DropAction)(C.QDrag_execWithSupportedActions(this.h, (C.int)(supportedActions))) } // Sender can only be called from a QDrag that was directly constructed. diff --git a/qt/gen_qdrag.h b/qt/gen_qdrag.h index c27a10fa..5e642e79 100644 --- a/qt/gen_qdrag.h +++ b/qt/gen_qdrag.h @@ -68,8 +68,8 @@ 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); +int QDrag_startWithSupportedActions(QDrag* self, int supportedActions); +int QDrag_execWithSupportedActions(QDrag* self, int supportedActions); bool QDrag_override_virtual_event(void* self, intptr_t slot); bool QDrag_virtualbase_event(void* self, QEvent* event); bool QDrag_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt/gen_qeasingcurve.cpp b/qt/gen_qeasingcurve.cpp index 16ed2027..b1028a80 100644 --- a/qt/gen_qeasingcurve.cpp +++ b/qt/gen_qeasingcurve.cpp @@ -1,6 +1,6 @@ #include -#include #include +#include #include #include "gen_qeasingcurve.h" diff --git a/qt/gen_qevent.cpp b/qt/gen_qevent.cpp index 75aa766e..475604ee 100644 --- a/qt/gen_qevent.cpp +++ b/qt/gen_qevent.cpp @@ -56,6 +56,7 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QTouchEvent__TouchPoint #include #include +#include #include #include #include @@ -639,7 +640,7 @@ QKeyEvent* QKeyEvent_new5(int type, int key, int modifiers, struct miqt_string t return new QKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), text_QString, autorep); } -QKeyEvent* QKeyEvent_new6(int type, int key, int modifiers, struct miqt_string text, bool autorep, uint16_t count) { +QKeyEvent* QKeyEvent_new6(int type, int key, int modifiers, struct miqt_string text, bool autorep, unsigned short count) { QString text_QString = QString::fromUtf8(text.data, text.len); return new QKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), text_QString, autorep, static_cast(count)); } @@ -654,7 +655,7 @@ QKeyEvent* QKeyEvent_new8(int type, int key, int modifiers, unsigned int nativeS return new QKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep); } -QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count) { +QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, unsigned short count) { QString text_QString = QString::fromUtf8(text.data, text.len); return new QKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep, static_cast(count)); } diff --git a/qt/gen_qevent.go b/qt/gen_qevent.go index 8bf18584..66e3199e 100644 --- a/qt/gen_qevent.go +++ b/qt/gen_qevent.go @@ -1039,7 +1039,7 @@ func NewQKeyEvent6(typeVal QEvent__Type, key int, modifiers KeyboardModifier, te text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - return newQKeyEvent(C.QKeyEvent_new6((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), text_ms, (C.bool)(autorep), (C.uint16_t)(count))) + return newQKeyEvent(C.QKeyEvent_new6((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), text_ms, (C.bool)(autorep), (C.ushort)(count))) } // NewQKeyEvent7 constructs a new QKeyEvent object. @@ -1069,7 +1069,7 @@ func NewQKeyEvent9(typeVal QEvent__Type, key int, modifiers KeyboardModifier, na text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - return newQKeyEvent(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(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.ushort)(count))) } func (this *QKeyEvent) Key() int { diff --git a/qt/gen_qevent.h b/qt/gen_qevent.h index e29b41ab..2ac70dc8 100644 --- a/qt/gen_qevent.h +++ b/qt/gen_qevent.h @@ -281,10 +281,10 @@ QKeyEvent* QKeyEvent_new2(int type, int key, int modifiers, unsigned int nativeS QKeyEvent* QKeyEvent_new3(QKeyEvent* param1); QKeyEvent* QKeyEvent_new4(int type, int key, int modifiers, struct miqt_string text); QKeyEvent* QKeyEvent_new5(int type, int key, int modifiers, struct miqt_string text, bool autorep); -QKeyEvent* QKeyEvent_new6(int type, int key, int modifiers, struct miqt_string text, bool autorep, uint16_t count); +QKeyEvent* QKeyEvent_new6(int type, int key, int modifiers, struct miqt_string text, bool autorep, unsigned short count); QKeyEvent* QKeyEvent_new7(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text); QKeyEvent* QKeyEvent_new8(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep); -QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count); +QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, unsigned short count); void QKeyEvent_virtbase(QKeyEvent* src, QInputEvent** outptr_QInputEvent); int QKeyEvent_key(const QKeyEvent* self); bool QKeyEvent_matches(const QKeyEvent* self, int key); diff --git a/qt/gen_qeventloop.cpp b/qt/gen_qeventloop.cpp index 2e894a58..43efb1b4 100644 --- a/qt/gen_qeventloop.cpp +++ b/qt/gen_qeventloop.cpp @@ -297,15 +297,15 @@ struct miqt_string QEventLoop_trUtf83(const char* s, const char* c, int n) { return _ms; } -bool QEventLoop_processEvents1(QEventLoop* self, int flags) { +bool QEventLoop_processEventsWithFlags(QEventLoop* self, int flags) { return self->processEvents(static_cast(flags)); } -int QEventLoop_exec1(QEventLoop* self, int flags) { +int QEventLoop_execWithFlags(QEventLoop* self, int flags) { return self->exec(static_cast(flags)); } -void QEventLoop_exit1(QEventLoop* self, int returnCode) { +void QEventLoop_exitWithReturnCode(QEventLoop* self, int returnCode) { self->exit(static_cast(returnCode)); } diff --git a/qt/gen_qeventloop.go b/qt/gen_qeventloop.go index 07c86aa8..58254a90 100644 --- a/qt/gen_qeventloop.go +++ b/qt/gen_qeventloop.go @@ -178,16 +178,16 @@ func QEventLoop_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QEventLoop) ProcessEvents1(flags QEventLoop__ProcessEventsFlag) bool { - return (bool)(C.QEventLoop_processEvents1(this.h, (C.int)(flags))) +func (this *QEventLoop) ProcessEventsWithFlags(flags QEventLoop__ProcessEventsFlag) bool { + return (bool)(C.QEventLoop_processEventsWithFlags(this.h, (C.int)(flags))) } -func (this *QEventLoop) Exec1(flags QEventLoop__ProcessEventsFlag) int { - return (int)(C.QEventLoop_exec1(this.h, (C.int)(flags))) +func (this *QEventLoop) ExecWithFlags(flags QEventLoop__ProcessEventsFlag) int { + return (int)(C.QEventLoop_execWithFlags(this.h, (C.int)(flags))) } -func (this *QEventLoop) Exit1(returnCode int) { - C.QEventLoop_exit1(this.h, (C.int)(returnCode)) +func (this *QEventLoop) ExitWithReturnCode(returnCode int) { + C.QEventLoop_exitWithReturnCode(this.h, (C.int)(returnCode)) } // Sender can only be called from a QEventLoop that was directly constructed. diff --git a/qt/gen_qeventloop.h b/qt/gen_qeventloop.h index 79bd72c3..ef84d5fc 100644 --- a/qt/gen_qeventloop.h +++ b/qt/gen_qeventloop.h @@ -55,9 +55,9 @@ 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); +bool QEventLoop_processEventsWithFlags(QEventLoop* self, int flags); +int QEventLoop_execWithFlags(QEventLoop* self, int flags); +void QEventLoop_exitWithReturnCode(QEventLoop* self, int returnCode); bool QEventLoop_override_virtual_event(void* self, intptr_t slot); bool QEventLoop_virtualbase_event(void* self, QEvent* event); bool QEventLoop_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt/gen_qfile.cpp b/qt/gen_qfile.cpp index c002a827..27d016f7 100644 --- a/qt/gen_qfile.cpp +++ b/qt/gen_qfile.cpp @@ -858,7 +858,7 @@ struct miqt_string QFile_trUtf83(const char* s, const char* c, int n) { return _ms; } -bool QFile_open33(QFile* self, int fd, int ioFlags, int handleFlags) { +bool QFile_open5(QFile* self, int fd, int ioFlags, int handleFlags) { return self->open(static_cast(fd), static_cast(ioFlags), static_cast(handleFlags)); } diff --git a/qt/gen_qfile.go b/qt/gen_qfile.go index adea8fe3..6b64860e 100644 --- a/qt/gen_qfile.go +++ b/qt/gen_qfile.go @@ -383,8 +383,8 @@ func QFile_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QFile) Open33(fd int, ioFlags QIODevice__OpenModeFlag, handleFlags QFileDevice__FileHandleFlag) bool { - return (bool)(C.QFile_open33(this.h, (C.int)(fd), (C.int)(ioFlags), (C.int)(handleFlags))) +func (this *QFile) Open5(fd int, ioFlags QIODevice__OpenModeFlag, handleFlags QFileDevice__FileHandleFlag) bool { + return (bool)(C.QFile_open5(this.h, (C.int)(fd), (C.int)(ioFlags), (C.int)(handleFlags))) } // SetOpenMode can only be called from a QFile that was directly constructed. diff --git a/qt/gen_qfile.h b/qt/gen_qfile.h index b3565148..c775f1b6 100644 --- a/qt/gen_qfile.h +++ b/qt/gen_qfile.h @@ -79,7 +79,7 @@ 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); +bool QFile_open5(QFile* self, int fd, int ioFlags, int handleFlags); bool QFile_override_virtual_fileName(void* self, intptr_t slot); struct miqt_string QFile_virtualbase_fileName(const void* self); bool QFile_override_virtual_open(void* self, intptr_t slot); diff --git a/qt/gen_qfiledevice.cpp b/qt/gen_qfiledevice.cpp index bb63ffb4..0cb5cf02 100644 --- a/qt/gen_qfiledevice.cpp +++ b/qt/gen_qfiledevice.cpp @@ -180,7 +180,7 @@ struct miqt_string QFileDevice_trUtf83(const char* s, const char* c, int n) { return _ms; } -unsigned char* QFileDevice_map3(QFileDevice* self, long long offset, long long size, int flags) { +unsigned char* QFileDevice_map2(QFileDevice* self, long long offset, long long size, int flags) { uchar* _ret = self->map(static_cast(offset), static_cast(size), static_cast(flags)); return static_cast(_ret); } diff --git a/qt/gen_qfiledevice.go b/qt/gen_qfiledevice.go index 5b24acab..cf75a7f1 100644 --- a/qt/gen_qfiledevice.go +++ b/qt/gen_qfiledevice.go @@ -258,8 +258,8 @@ func QFileDevice_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QFileDevice) Map3(offset int64, size int64, flags QFileDevice__MemoryMapFlags) *byte { - return (*byte)(unsafe.Pointer(C.QFileDevice_map3(this.h, (C.longlong)(offset), (C.longlong)(size), (C.int)(flags)))) +func (this *QFileDevice) Map2(offset int64, size int64, flags QFileDevice__MemoryMapFlags) *byte { + return (*byte)(unsafe.Pointer(C.QFileDevice_map2(this.h, (C.longlong)(offset), (C.longlong)(size), (C.int)(flags)))) } // Delete this object from C++ memory. diff --git a/qt/gen_qfiledevice.h b/qt/gen_qfiledevice.h index b097a5e2..3b5eaaec 100644 --- a/qt/gen_qfiledevice.h +++ b/qt/gen_qfiledevice.h @@ -60,7 +60,7 @@ 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); +unsigned char* QFileDevice_map2(QFileDevice* self, long long offset, long long size, int flags); void QFileDevice_delete(QFileDevice* self); #ifdef __cplusplus diff --git a/qt/gen_qfiledialog.cpp b/qt/gen_qfiledialog.cpp index d37a19a4..107bb70d 100644 --- a/qt/gen_qfiledialog.cpp +++ b/qt/gen_qfiledialog.cpp @@ -1892,7 +1892,7 @@ 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_getOpenFileNameWithParent(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(); @@ -1942,7 +1942,7 @@ struct miqt_string QFileDialog_getOpenFileName4(QWidget* parent, struct miqt_str return _ms; } -QUrl* QFileDialog_getOpenFileUrl1(QWidget* parent) { +QUrl* QFileDialog_getOpenFileUrlWithParent(QWidget* parent) { return new QUrl(QFileDialog::getOpenFileUrl(parent)); } @@ -1962,7 +1962,7 @@ QUrl* QFileDialog_getOpenFileUrl4(QWidget* parent, struct miqt_string caption, Q return new QUrl(QFileDialog::getOpenFileUrl(parent, caption_QString, *dir, filter_QString)); } -struct miqt_string QFileDialog_getSaveFileName1(QWidget* parent) { +struct miqt_string QFileDialog_getSaveFileNameWithParent(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(); @@ -2012,7 +2012,7 @@ struct miqt_string QFileDialog_getSaveFileName4(QWidget* parent, struct miqt_str return _ms; } -QUrl* QFileDialog_getSaveFileUrl1(QWidget* parent) { +QUrl* QFileDialog_getSaveFileUrlWithParent(QWidget* parent) { return new QUrl(QFileDialog::getSaveFileUrl(parent)); } @@ -2032,7 +2032,7 @@ QUrl* QFileDialog_getSaveFileUrl4(QWidget* parent, struct miqt_string caption, Q return new QUrl(QFileDialog::getSaveFileUrl(parent, caption_QString, *dir, filter_QString)); } -struct miqt_string QFileDialog_getExistingDirectory1(QWidget* parent) { +struct miqt_string QFileDialog_getExistingDirectoryWithParent(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(); @@ -2081,7 +2081,7 @@ struct miqt_string QFileDialog_getExistingDirectory4(QWidget* parent, struct miq return _ms; } -QUrl* QFileDialog_getExistingDirectoryUrl1(QWidget* parent) { +QUrl* QFileDialog_getExistingDirectoryUrlWithParent(QWidget* parent) { return new QUrl(QFileDialog::getExistingDirectoryUrl(parent)); } @@ -2112,7 +2112,7 @@ QUrl* QFileDialog_getExistingDirectoryUrl5(QWidget* parent, struct miqt_string c return new QUrl(QFileDialog::getExistingDirectoryUrl(parent, caption_QString, *dir, static_cast(options), supportedSchemes_QList)); } -struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNames1(QWidget* parent) { +struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNamesWithParent(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())); @@ -2198,7 +2198,7 @@ struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNames4(QWi return _out; } -struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrls1(QWidget* parent) { +struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrlsWithParent(QWidget* parent) { QList _ret = QFileDialog::getOpenFileUrls(parent); // Convert QList<> from C++ memory to manually-managed C memory QUrl** _arr = static_cast(malloc(sizeof(QUrl*) * _ret.length())); diff --git a/qt/gen_qfiledialog.go b/qt/gen_qfiledialog.go index c5f2a398..ac930cec 100644 --- a/qt/gen_qfiledialog.go +++ b/qt/gen_qfiledialog.go @@ -942,8 +942,8 @@ func (this *QFileDialog) SetOption2(option QFileDialog__Option, on bool) { C.QFileDialog_setOption2(this.h, (C.int)(option), (C.bool)(on)) } -func QFileDialog_GetOpenFileName1(parent *QWidget) string { - var _ms C.struct_miqt_string = C.QFileDialog_getOpenFileName1(parent.cPointer()) +func QFileDialog_GetOpenFileNameWithParent(parent *QWidget) string { + var _ms C.struct_miqt_string = C.QFileDialog_getOpenFileNameWithParent(parent.cPointer()) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -994,8 +994,8 @@ func QFileDialog_GetOpenFileName4(parent *QWidget, caption string, dir string, f return _ret } -func QFileDialog_GetOpenFileUrl1(parent *QWidget) *QUrl { - _goptr := newQUrl(C.QFileDialog_getOpenFileUrl1(parent.cPointer())) +func QFileDialog_GetOpenFileUrlWithParent(parent *QWidget) *QUrl { + _goptr := newQUrl(C.QFileDialog_getOpenFileUrlWithParent(parent.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1034,8 +1034,8 @@ func QFileDialog_GetOpenFileUrl4(parent *QWidget, caption string, dir *QUrl, fil return _goptr } -func QFileDialog_GetSaveFileName1(parent *QWidget) string { - var _ms C.struct_miqt_string = C.QFileDialog_getSaveFileName1(parent.cPointer()) +func QFileDialog_GetSaveFileNameWithParent(parent *QWidget) string { + var _ms C.struct_miqt_string = C.QFileDialog_getSaveFileNameWithParent(parent.cPointer()) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1086,8 +1086,8 @@ func QFileDialog_GetSaveFileName4(parent *QWidget, caption string, dir string, f return _ret } -func QFileDialog_GetSaveFileUrl1(parent *QWidget) *QUrl { - _goptr := newQUrl(C.QFileDialog_getSaveFileUrl1(parent.cPointer())) +func QFileDialog_GetSaveFileUrlWithParent(parent *QWidget) *QUrl { + _goptr := newQUrl(C.QFileDialog_getSaveFileUrlWithParent(parent.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1126,8 +1126,8 @@ func QFileDialog_GetSaveFileUrl4(parent *QWidget, caption string, dir *QUrl, fil return _goptr } -func QFileDialog_GetExistingDirectory1(parent *QWidget) string { - var _ms C.struct_miqt_string = C.QFileDialog_getExistingDirectory1(parent.cPointer()) +func QFileDialog_GetExistingDirectoryWithParent(parent *QWidget) string { + var _ms C.struct_miqt_string = C.QFileDialog_getExistingDirectoryWithParent(parent.cPointer()) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1174,8 +1174,8 @@ func QFileDialog_GetExistingDirectory4(parent *QWidget, caption string, dir stri return _ret } -func QFileDialog_GetExistingDirectoryUrl1(parent *QWidget) *QUrl { - _goptr := newQUrl(C.QFileDialog_getExistingDirectoryUrl1(parent.cPointer())) +func QFileDialog_GetExistingDirectoryUrlWithParent(parent *QWidget) *QUrl { + _goptr := newQUrl(C.QFileDialog_getExistingDirectoryUrlWithParent(parent.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1230,8 +1230,8 @@ func QFileDialog_GetExistingDirectoryUrl5(parent *QWidget, caption string, dir * return _goptr } -func QFileDialog_GetOpenFileNames1(parent *QWidget) []string { - var _ma C.struct_miqt_array = C.QFileDialog_getOpenFileNames1(parent.cPointer()) +func QFileDialog_GetOpenFileNamesWithParent(parent *QWidget) []string { + var _ma C.struct_miqt_array = C.QFileDialog_getOpenFileNamesWithParent(parent.cPointer()) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1306,8 +1306,8 @@ func QFileDialog_GetOpenFileNames4(parent *QWidget, caption string, dir string, return _ret } -func QFileDialog_GetOpenFileUrls1(parent *QWidget) []QUrl { - var _ma C.struct_miqt_array = C.QFileDialog_getOpenFileUrls1(parent.cPointer()) +func QFileDialog_GetOpenFileUrlsWithParent(parent *QWidget) []QUrl { + var _ma C.struct_miqt_array = C.QFileDialog_getOpenFileUrlsWithParent(parent.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++ { diff --git a/qt/gen_qfiledialog.h b/qt/gen_qfiledialog.h index 6248ea6c..e4f1f2cb 100644 --- a/qt/gen_qfiledialog.h +++ b/qt/gen_qfiledialog.h @@ -197,36 +197,36 @@ 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_getOpenFileNameWithParent(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_getOpenFileUrlWithParent(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_getSaveFileNameWithParent(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_getSaveFileUrlWithParent(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_getExistingDirectoryWithParent(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_getExistingDirectoryUrlWithParent(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); -struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNames1(QWidget* parent); +struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNamesWithParent(QWidget* parent); struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNames2(QWidget* parent, struct miqt_string caption); struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNames3(QWidget* parent, struct miqt_string caption, struct miqt_string dir); struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNames4(QWidget* parent, struct miqt_string caption, struct miqt_string dir, struct miqt_string filter); -struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrls1(QWidget* parent); +struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrlsWithParent(QWidget* parent); struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrls2(QWidget* parent, struct miqt_string caption); struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrls3(QWidget* parent, struct miqt_string caption, QUrl* dir); struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrls4(QWidget* parent, struct miqt_string caption, QUrl* dir, struct miqt_string filter); diff --git a/qt/gen_qfilesystemmodel.cpp b/qt/gen_qfilesystemmodel.cpp index b7e62981..f74a3a32 100644 --- a/qt/gen_qfilesystemmodel.cpp +++ b/qt/gen_qfilesystemmodel.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -1462,7 +1463,7 @@ QModelIndex* QFileSystemModel_index2(const QFileSystemModel* self, struct miqt_s return new QModelIndex(self->index(path_QString, static_cast(column))); } -QVariant* QFileSystemModel_myComputer1(const QFileSystemModel* self, int role) { +QVariant* QFileSystemModel_myComputerWithRole(const QFileSystemModel* self, int role) { return new QVariant(self->myComputer(static_cast(role))); } diff --git a/qt/gen_qfilesystemmodel.go b/qt/gen_qfilesystemmodel.go index c060eecb..000c89d2 100644 --- a/qt/gen_qfilesystemmodel.go +++ b/qt/gen_qfilesystemmodel.go @@ -542,8 +542,8 @@ func (this *QFileSystemModel) Index2(path string, column int) *QModelIndex { return _goptr } -func (this *QFileSystemModel) MyComputer1(role int) *QVariant { - _goptr := newQVariant(C.QFileSystemModel_myComputer1(this.h, (C.int)(role))) +func (this *QFileSystemModel) MyComputerWithRole(role int) *QVariant { + _goptr := newQVariant(C.QFileSystemModel_myComputerWithRole(this.h, (C.int)(role))) _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 091f4089..5a068099 100644 --- a/qt/gen_qfilesystemmodel.h +++ b/qt/gen_qfilesystemmodel.h @@ -124,7 +124,7 @@ 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_index2(const QFileSystemModel* self, struct miqt_string path, int column); -QVariant* QFileSystemModel_myComputer1(const QFileSystemModel* self, int role); +QVariant* QFileSystemModel_myComputerWithRole(const QFileSystemModel* self, int role); void QFileSystemModel_setOption2(QFileSystemModel* self, int option, bool on); bool QFileSystemModel_override_virtual_index(void* self, intptr_t slot); QModelIndex* QFileSystemModel_virtualbase_index(const void* self, int row, int column, QModelIndex* parent); diff --git a/qt/gen_qfontdatabase.cpp b/qt/gen_qfontdatabase.cpp index 8c8a4410..51563ee5 100644 --- a/qt/gen_qfontdatabase.cpp +++ b/qt/gen_qfontdatabase.cpp @@ -277,7 +277,7 @@ QFont* QFontDatabase_systemFont(int type) { return new QFont(QFontDatabase::systemFont(static_cast(type))); } -struct miqt_array /* of struct miqt_string */ QFontDatabase_families1(const QFontDatabase* self, int writingSystem) { +struct miqt_array /* of struct miqt_string */ QFontDatabase_familiesWithWritingSystem(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())); diff --git a/qt/gen_qfontdatabase.go b/qt/gen_qfontdatabase.go index 37b3520a..3843828e 100644 --- a/qt/gen_qfontdatabase.go +++ b/qt/gen_qfontdatabase.go @@ -373,8 +373,8 @@ func QFontDatabase_SystemFont(typeVal QFontDatabase__SystemFont) *QFont { return _goptr } -func (this *QFontDatabase) Families1(writingSystem QFontDatabase__WritingSystem) []string { - var _ma C.struct_miqt_array = C.QFontDatabase_families1(this.h, (C.int)(writingSystem)) +func (this *QFontDatabase) FamiliesWithWritingSystem(writingSystem QFontDatabase__WritingSystem) []string { + var _ma C.struct_miqt_array = C.QFontDatabase_familiesWithWritingSystem(this.h, (C.int)(writingSystem)) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qfontdatabase.h b/qt/gen_qfontdatabase.h index 74389436..8ee14de2 100644 --- a/qt/gen_qfontdatabase.h +++ b/qt/gen_qfontdatabase.h @@ -53,7 +53,7 @@ bool QFontDatabase_removeApplicationFont(int id); bool QFontDatabase_removeAllApplicationFonts(); bool QFontDatabase_supportsThreadedFontRendering(); QFont* QFontDatabase_systemFont(int type); -struct miqt_array /* of struct miqt_string */ QFontDatabase_families1(const QFontDatabase* self, int writingSystem); +struct miqt_array /* of struct miqt_string */ QFontDatabase_familiesWithWritingSystem(const QFontDatabase* self, int writingSystem); struct miqt_array /* of int */ 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); diff --git a/qt/gen_qfontdialog.cpp b/qt/gen_qfontdialog.cpp index 7a890561..adfc07e4 100644 --- a/qt/gen_qfontdialog.cpp +++ b/qt/gen_qfontdialog.cpp @@ -1266,20 +1266,20 @@ void QFontDialog_setOption2(QFontDialog* self, int option, bool on) { self->setOption(static_cast(option), on); } -QFont* QFontDialog_getFont22(bool* ok, QWidget* parent) { +QFont* QFontDialog_getFont3(bool* ok, QWidget* parent) { return new QFont(QFontDialog::getFont(ok, parent)); } -QFont* QFontDialog_getFont3(bool* ok, QFont* initial, QWidget* parent) { +QFont* QFontDialog_getFont4(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) { +QFont* QFontDialog_getFont5(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) { +QFont* QFontDialog_getFont6(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 fa238523..a2aca50d 100644 --- a/qt/gen_qfontdialog.go +++ b/qt/gen_qfontdialog.go @@ -249,34 +249,34 @@ func (this *QFontDialog) SetOption2(option QFontDialog__FontDialogOption, on boo C.QFontDialog_setOption2(this.h, (C.int)(option), (C.bool)(on)) } -func QFontDialog_GetFont22(ok *bool, parent *QWidget) *QFont { - _goptr := newQFont(C.QFontDialog_getFont22((*C.bool)(unsafe.Pointer(ok)), parent.cPointer())) +func QFontDialog_GetFont3(ok *bool, parent *QWidget) *QFont { + _goptr := newQFont(C.QFontDialog_getFont3((*C.bool)(unsafe.Pointer(ok)), parent.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QFontDialog_GetFont3(ok *bool, initial *QFont, parent *QWidget) *QFont { - _goptr := newQFont(C.QFontDialog_getFont3((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer())) +func QFontDialog_GetFont4(ok *bool, initial *QFont, parent *QWidget) *QFont { + _goptr := newQFont(C.QFontDialog_getFont4((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QFontDialog_GetFont4(ok *bool, initial *QFont, parent *QWidget, title string) *QFont { +func QFontDialog_GetFont5(ok *bool, initial *QFont, parent *QWidget, title string) *QFont { 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)) - _goptr := newQFont(C.QFontDialog_getFont4((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), title_ms)) + _goptr := newQFont(C.QFontDialog_getFont5((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), title_ms)) _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 { +func QFontDialog_GetFont6(ok *bool, initial *QFont, parent *QWidget, title string, options QFontDialog__FontDialogOption) *QFont { 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)) - _goptr := newQFont(C.QFontDialog_getFont5((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), title_ms, (C.int)(options))) + _goptr := newQFont(C.QFontDialog_getFont6((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), title_ms, (C.int)(options))) _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 36486163..cc94be21 100644 --- a/qt/gen_qfontdialog.h +++ b/qt/gen_qfontdialog.h @@ -117,10 +117,10 @@ 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_getFont3(bool* ok, QWidget* parent); +QFont* QFontDialog_getFont4(bool* ok, QFont* initial, QWidget* parent); +QFont* QFontDialog_getFont5(bool* ok, QFont* initial, QWidget* parent, struct miqt_string title); +QFont* QFontDialog_getFont6(bool* ok, QFont* initial, QWidget* parent, struct miqt_string title, int options); bool QFontDialog_override_virtual_setVisible(void* self, intptr_t slot); void QFontDialog_virtualbase_setVisible(void* self, bool visible); bool QFontDialog_override_virtual_changeEvent(void* self, intptr_t slot); diff --git a/qt/gen_qfontmetrics.cpp b/qt/gen_qfontmetrics.cpp index af856591..06032f0e 100644 --- a/qt/gen_qfontmetrics.cpp +++ b/qt/gen_qfontmetrics.cpp @@ -199,7 +199,7 @@ bool QFontMetrics_operatorNotEqual(const QFontMetrics* self, QFontMetrics* other return (*self != *other); } -int QFontMetrics_width22(const QFontMetrics* self, struct miqt_string param1, int len) { +int QFontMetrics_width3(const QFontMetrics* self, struct miqt_string param1, int len) { QString param1_QString = QString::fromUtf8(param1.data, param1.len); return self->width(param1_QString, static_cast(len)); } @@ -219,27 +219,27 @@ QRect* QFontMetrics_boundingRect5(const QFontMetrics* self, QRect* r, int flags, 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) { +QRect* QFontMetrics_boundingRect6(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) { +QRect* QFontMetrics_boundingRect7(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) { +QSize* QFontMetrics_size2(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) { +QSize* QFontMetrics_size3(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) { +struct miqt_string QFontMetrics_elidedText2(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 @@ -453,27 +453,27 @@ double QFontMetricsF_horizontalAdvance2(const QFontMetricsF* self, struct miqt_s return static_cast(_ret); } -QRectF* QFontMetricsF_boundingRect4(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string string, int tabstops) { +QRectF* QFontMetricsF_boundingRect3(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string string, int tabstops) { QString string_QString = QString::fromUtf8(string.data, string.len); return new QRectF(self->boundingRect(*r, static_cast(flags), string_QString, static_cast(tabstops))); } -QRectF* QFontMetricsF_boundingRect5(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string string, int tabstops, int* tabarray) { +QRectF* QFontMetricsF_boundingRect4(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string string, int tabstops, int* tabarray) { QString string_QString = QString::fromUtf8(string.data, string.len); return new QRectF(self->boundingRect(*r, static_cast(flags), string_QString, static_cast(tabstops), static_cast(tabarray))); } -QSizeF* QFontMetricsF_size3(const QFontMetricsF* self, int flags, struct miqt_string str, int tabstops) { +QSizeF* QFontMetricsF_size2(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) { +QSizeF* QFontMetricsF_size3(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) { +struct miqt_string QFontMetricsF_elidedText2(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 diff --git a/qt/gen_qfontmetrics.go b/qt/gen_qfontmetrics.go index c401ed62..cde25463 100644 --- a/qt/gen_qfontmetrics.go +++ b/qt/gen_qfontmetrics.go @@ -266,12 +266,12 @@ func (this *QFontMetrics) OperatorNotEqual(other *QFontMetrics) bool { return (bool)(C.QFontMetrics_operatorNotEqual(this.h, other.cPointer())) } -func (this *QFontMetrics) Width22(param1 string, lenVal int) int { +func (this *QFontMetrics) Width3(param1 string, lenVal int) int { 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))) + return (int)(C.QFontMetrics_width3(this.h, param1_ms, (C.int)(lenVal))) } func (this *QFontMetrics) HorizontalAdvance2(param1 string, lenVal int) int { @@ -302,52 +302,52 @@ func (this *QFontMetrics) BoundingRect5(r *QRect, flags int, text string, tabsto return _goptr } -func (this *QFontMetrics) BoundingRect7(x int, y int, w int, h int, flags int, text string, tabstops int) *QRect { +func (this *QFontMetrics) BoundingRect6(x int, y int, w int, h int, flags int, text string, tabstops int) *QRect { text_ms := C.struct_miqt_string{} text_ms.data = C.CString(text) text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - _goptr := newQRect(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(C.QFontMetrics_boundingRect6(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), text_ms, (C.int)(tabstops))) _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 { +func (this *QFontMetrics) BoundingRect7(x int, y int, w int, h int, flags int, text string, tabstops int, tabarray *int) *QRect { text_ms := C.struct_miqt_string{} text_ms.data = C.CString(text) text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - _goptr := newQRect(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(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), (*C.int)(unsafe.Pointer(tabarray)))) _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 { +func (this *QFontMetrics) Size2(flags int, str string, tabstops int) *QSize { 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)) - _goptr := newQSize(C.QFontMetrics_size3(this.h, (C.int)(flags), str_ms, (C.int)(tabstops))) + _goptr := newQSize(C.QFontMetrics_size2(this.h, (C.int)(flags), str_ms, (C.int)(tabstops))) _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 { +func (this *QFontMetrics) Size3(flags int, str string, tabstops int, tabarray *int) *QSize { 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)) - _goptr := newQSize(C.QFontMetrics_size4(this.h, (C.int)(flags), str_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray)))) + _goptr := newQSize(C.QFontMetrics_size3(this.h, (C.int)(flags), str_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray)))) _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 { +func (this *QFontMetrics) ElidedText2(text string, mode TextElideMode, width int, flags int) string { text_ms := C.struct_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)) + var _ms C.struct_miqt_string = C.QFontMetrics_elidedText2(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 @@ -612,52 +612,52 @@ func (this *QFontMetricsF) HorizontalAdvance2(stringVal string, length int) floa 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 { +func (this *QFontMetricsF) BoundingRect3(r *QRectF, flags int, stringVal string, tabstops int) *QRectF { 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)) - _goptr := newQRectF(C.QFontMetricsF_boundingRect4(this.h, r.cPointer(), (C.int)(flags), stringVal_ms, (C.int)(tabstops))) + _goptr := newQRectF(C.QFontMetricsF_boundingRect3(this.h, r.cPointer(), (C.int)(flags), stringVal_ms, (C.int)(tabstops))) _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 { +func (this *QFontMetricsF) BoundingRect4(r *QRectF, flags int, stringVal string, tabstops int, tabarray *int) *QRectF { 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)) - _goptr := newQRectF(C.QFontMetricsF_boundingRect5(this.h, r.cPointer(), (C.int)(flags), stringVal_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray)))) + _goptr := newQRectF(C.QFontMetricsF_boundingRect4(this.h, r.cPointer(), (C.int)(flags), stringVal_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray)))) _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 { +func (this *QFontMetricsF) Size2(flags int, str string, tabstops int) *QSizeF { 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)) - _goptr := newQSizeF(C.QFontMetricsF_size3(this.h, (C.int)(flags), str_ms, (C.int)(tabstops))) + _goptr := newQSizeF(C.QFontMetricsF_size2(this.h, (C.int)(flags), str_ms, (C.int)(tabstops))) _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 { +func (this *QFontMetricsF) Size3(flags int, str string, tabstops int, tabarray *int) *QSizeF { 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)) - _goptr := newQSizeF(C.QFontMetricsF_size4(this.h, (C.int)(flags), str_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray)))) + _goptr := newQSizeF(C.QFontMetricsF_size3(this.h, (C.int)(flags), str_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray)))) _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 { +func (this *QFontMetricsF) ElidedText2(text string, mode TextElideMode, width float64, flags int) string { text_ms := C.struct_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)) + var _ms C.struct_miqt_string = C.QFontMetricsF_elidedText2(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 8e7a0445..c995c803 100644 --- a/qt/gen_qfontmetrics.h +++ b/qt/gen_qfontmetrics.h @@ -76,15 +76,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 len); +int QFontMetrics_width3(const QFontMetrics* self, struct miqt_string param1, int len); int QFontMetrics_horizontalAdvance2(const QFontMetrics* self, struct miqt_string param1, int len); 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); +QRect* QFontMetrics_boundingRect6(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string text, int tabstops); +QRect* QFontMetrics_boundingRect7(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string text, int tabstops, int* tabarray); +QSize* QFontMetrics_size2(const QFontMetrics* self, int flags, struct miqt_string str, int tabstops); +QSize* QFontMetrics_size3(const QFontMetrics* self, int flags, struct miqt_string str, int tabstops, int* tabarray); +struct miqt_string QFontMetrics_elidedText2(const QFontMetrics* self, struct miqt_string text, int mode, int width, int flags); void QFontMetrics_delete(QFontMetrics* self); QFontMetricsF* QFontMetricsF_new(QFont* font); @@ -127,11 +127,11 @@ 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 string, int length); -QRectF* QFontMetricsF_boundingRect4(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string string, int tabstops); -QRectF* QFontMetricsF_boundingRect5(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string string, 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); +QRectF* QFontMetricsF_boundingRect3(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string string, int tabstops); +QRectF* QFontMetricsF_boundingRect4(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string string, int tabstops, int* tabarray); +QSizeF* QFontMetricsF_size2(const QFontMetricsF* self, int flags, struct miqt_string str, int tabstops); +QSizeF* QFontMetricsF_size3(const QFontMetricsF* self, int flags, struct miqt_string str, int tabstops, int* tabarray); +struct miqt_string QFontMetricsF_elidedText2(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_qglyphrun.cpp b/qt/gen_qglyphrun.cpp index b41e9b91..c96a26b0 100644 --- a/qt/gen_qglyphrun.cpp +++ b/qt/gen_qglyphrun.cpp @@ -1,8 +1,8 @@ #include -#include #include #include #include +#include #include #include "gen_qglyphrun.h" diff --git a/qt/gen_qgraphicsanchorlayout.cpp b/qt/gen_qgraphicsanchorlayout.cpp index 02164d2c..2729261a 100644 --- a/qt/gen_qgraphicsanchorlayout.cpp +++ b/qt/gen_qgraphicsanchorlayout.cpp @@ -398,7 +398,7 @@ void QGraphicsAnchorLayout_invalidate(QGraphicsAnchorLayout* self) { self->invalidate(); } -void QGraphicsAnchorLayout_addAnchors3(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, QGraphicsLayoutItem* secondItem, int orientations) { +void QGraphicsAnchorLayout_addAnchors2(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, QGraphicsLayoutItem* secondItem, int orientations) { self->addAnchors(firstItem, secondItem, static_cast(orientations)); } diff --git a/qt/gen_qgraphicsanchorlayout.go b/qt/gen_qgraphicsanchorlayout.go index 7fb23cc2..30fbd716 100644 --- a/qt/gen_qgraphicsanchorlayout.go +++ b/qt/gen_qgraphicsanchorlayout.go @@ -260,8 +260,8 @@ func (this *QGraphicsAnchorLayout) Invalidate() { C.QGraphicsAnchorLayout_invalidate(this.h) } -func (this *QGraphicsAnchorLayout) AddAnchors3(firstItem *QGraphicsLayoutItem, secondItem *QGraphicsLayoutItem, orientations Orientation) { - C.QGraphicsAnchorLayout_addAnchors3(this.h, firstItem.cPointer(), secondItem.cPointer(), (C.int)(orientations)) +func (this *QGraphicsAnchorLayout) AddAnchors2(firstItem *QGraphicsLayoutItem, secondItem *QGraphicsLayoutItem, orientations Orientation) { + C.QGraphicsAnchorLayout_addAnchors2(this.h, firstItem.cPointer(), secondItem.cPointer(), (C.int)(orientations)) } // AddChildLayoutItem can only be called from a QGraphicsAnchorLayout that was directly constructed. diff --git a/qt/gen_qgraphicsanchorlayout.h b/qt/gen_qgraphicsanchorlayout.h index a95bc532..f09d75d3 100644 --- a/qt/gen_qgraphicsanchorlayout.h +++ b/qt/gen_qgraphicsanchorlayout.h @@ -74,7 +74,7 @@ int QGraphicsAnchorLayout_count(const QGraphicsAnchorLayout* self); QGraphicsLayoutItem* QGraphicsAnchorLayout_itemAt(const QGraphicsAnchorLayout* self, int index); void QGraphicsAnchorLayout_invalidate(QGraphicsAnchorLayout* self); QSizeF* QGraphicsAnchorLayout_sizeHint(const QGraphicsAnchorLayout* self, int which, QSizeF* constraint); -void QGraphicsAnchorLayout_addAnchors3(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, QGraphicsLayoutItem* secondItem, int orientations); +void QGraphicsAnchorLayout_addAnchors2(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, QGraphicsLayoutItem* secondItem, int orientations); bool QGraphicsAnchorLayout_override_virtual_removeAt(void* self, intptr_t slot); void QGraphicsAnchorLayout_virtualbase_removeAt(void* self, int index); bool QGraphicsAnchorLayout_override_virtual_setGeometry(void* self, intptr_t slot); diff --git a/qt/gen_qgraphicseffect.cpp b/qt/gen_qgraphicseffect.cpp index 541899d2..f0514995 100644 --- a/qt/gen_qgraphicseffect.cpp +++ b/qt/gen_qgraphicseffect.cpp @@ -296,8 +296,8 @@ public: friend QRectF* QGraphicsEffect_protectedbase_sourceBoundingRect(bool* _dynamic_cast_ok, const void* self); friend void QGraphicsEffect_protectedbase_drawSource(bool* _dynamic_cast_ok, void* self, QPainter* painter); friend QPixmap* QGraphicsEffect_protectedbase_sourcePixmap(bool* _dynamic_cast_ok, const void* self); - friend QRectF* QGraphicsEffect_protectedbase_sourceBoundingRect1(bool* _dynamic_cast_ok, const void* self, int system); - friend QPixmap* QGraphicsEffect_protectedbase_sourcePixmap1(bool* _dynamic_cast_ok, const void* self, int system); + friend QRectF* QGraphicsEffect_protectedbase_sourceBoundingRectWithSystem(bool* _dynamic_cast_ok, const void* self, int system); + friend QPixmap* QGraphicsEffect_protectedbase_sourcePixmapWithSystem(bool* _dynamic_cast_ok, const void* self, int system); friend QPixmap* QGraphicsEffect_protectedbase_sourcePixmap2(bool* _dynamic_cast_ok, const void* self, int system, QPoint* offset); friend QPixmap* QGraphicsEffect_protectedbase_sourcePixmap3(bool* _dynamic_cast_ok, const void* self, int system, QPoint* offset, int mode); friend QObject* QGraphicsEffect_protectedbase_sender(bool* _dynamic_cast_ok, const void* self); @@ -642,7 +642,7 @@ QPixmap* QGraphicsEffect_protectedbase_sourcePixmap(bool* _dynamic_cast_ok, cons } -QRectF* QGraphicsEffect_protectedbase_sourceBoundingRect1(bool* _dynamic_cast_ok, const void* self, int system) { +QRectF* QGraphicsEffect_protectedbase_sourceBoundingRectWithSystem(bool* _dynamic_cast_ok, const void* self, int system) { MiqtVirtualQGraphicsEffect* self_cast = dynamic_cast( (QGraphicsEffect*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -655,7 +655,7 @@ QRectF* QGraphicsEffect_protectedbase_sourceBoundingRect1(bool* _dynamic_cast_ok } -QPixmap* QGraphicsEffect_protectedbase_sourcePixmap1(bool* _dynamic_cast_ok, const void* self, int system) { +QPixmap* QGraphicsEffect_protectedbase_sourcePixmapWithSystem(bool* _dynamic_cast_ok, const void* self, int system) { MiqtVirtualQGraphicsEffect* self_cast = dynamic_cast( (QGraphicsEffect*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt/gen_qgraphicseffect.go b/qt/gen_qgraphicseffect.go index 444b2736..8f305765 100644 --- a/qt/gen_qgraphicseffect.go +++ b/qt/gen_qgraphicseffect.go @@ -273,11 +273,11 @@ func (this *QGraphicsEffect) SourcePixmap() QPixmap { } -// SourceBoundingRect1 can only be called from a QGraphicsEffect that was directly constructed. -func (this *QGraphicsEffect) SourceBoundingRect1(system CoordinateSystem) QRectF { +// SourceBoundingRectWithSystem can only be called from a QGraphicsEffect that was directly constructed. +func (this *QGraphicsEffect) SourceBoundingRectWithSystem(system CoordinateSystem) QRectF { var _dynamic_cast_ok C.bool = false - _goptr := newQRectF(C.QGraphicsEffect_protectedbase_sourceBoundingRect1(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.int)(system))) + _goptr := newQRectF(C.QGraphicsEffect_protectedbase_sourceBoundingRectWithSystem(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.int)(system))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer _method_ret := *_goptr @@ -289,11 +289,11 @@ func (this *QGraphicsEffect) SourceBoundingRect1(system CoordinateSystem) QRectF } -// SourcePixmap1 can only be called from a QGraphicsEffect that was directly constructed. -func (this *QGraphicsEffect) SourcePixmap1(system CoordinateSystem) QPixmap { +// SourcePixmapWithSystem can only be called from a QGraphicsEffect that was directly constructed. +func (this *QGraphicsEffect) SourcePixmapWithSystem(system CoordinateSystem) QPixmap { var _dynamic_cast_ok C.bool = false - _goptr := newQPixmap(C.QGraphicsEffect_protectedbase_sourcePixmap1(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.int)(system))) + _goptr := newQPixmap(C.QGraphicsEffect_protectedbase_sourcePixmapWithSystem(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.int)(system))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer _method_ret := *_goptr diff --git a/qt/gen_qgraphicseffect.h b/qt/gen_qgraphicseffect.h index 40aa4fe1..c2209663 100644 --- a/qt/gen_qgraphicseffect.h +++ b/qt/gen_qgraphicseffect.h @@ -99,8 +99,8 @@ bool QGraphicsEffect_protectedbase_sourceIsPixmap(bool* _dynamic_cast_ok, const QRectF* QGraphicsEffect_protectedbase_sourceBoundingRect(bool* _dynamic_cast_ok, const void* self); void QGraphicsEffect_protectedbase_drawSource(bool* _dynamic_cast_ok, void* self, QPainter* painter); QPixmap* QGraphicsEffect_protectedbase_sourcePixmap(bool* _dynamic_cast_ok, const void* self); -QRectF* QGraphicsEffect_protectedbase_sourceBoundingRect1(bool* _dynamic_cast_ok, const void* self, int system); -QPixmap* QGraphicsEffect_protectedbase_sourcePixmap1(bool* _dynamic_cast_ok, const void* self, int system); +QRectF* QGraphicsEffect_protectedbase_sourceBoundingRectWithSystem(bool* _dynamic_cast_ok, const void* self, int system); +QPixmap* QGraphicsEffect_protectedbase_sourcePixmapWithSystem(bool* _dynamic_cast_ok, const void* self, int system); QPixmap* QGraphicsEffect_protectedbase_sourcePixmap2(bool* _dynamic_cast_ok, const void* self, int system, QPoint* offset); QPixmap* QGraphicsEffect_protectedbase_sourcePixmap3(bool* _dynamic_cast_ok, const void* self, int system, QPoint* offset, int mode); QObject* QGraphicsEffect_protectedbase_sender(bool* _dynamic_cast_ok, const void* self); diff --git a/qt/gen_qgraphicsgridlayout.cpp b/qt/gen_qgraphicsgridlayout.cpp index 693c91eb..9242d638 100644 --- a/qt/gen_qgraphicsgridlayout.cpp +++ b/qt/gen_qgraphicsgridlayout.cpp @@ -422,7 +422,7 @@ QSizeF* QGraphicsGridLayout_sizeHint(const QGraphicsGridLayout* self, int which, return new QSizeF(self->sizeHint(static_cast(which), *constraint)); } -void QGraphicsGridLayout_addItem6(QGraphicsGridLayout* self, QGraphicsLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int alignment) { +void QGraphicsGridLayout_addItem3(QGraphicsGridLayout* self, QGraphicsLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int alignment) { self->addItem(item, static_cast(row), static_cast(column), static_cast(rowSpan), static_cast(columnSpan), static_cast(alignment)); } diff --git a/qt/gen_qgraphicsgridlayout.go b/qt/gen_qgraphicsgridlayout.go index 88bda8d4..1ebb2242 100644 --- a/qt/gen_qgraphicsgridlayout.go +++ b/qt/gen_qgraphicsgridlayout.go @@ -244,8 +244,8 @@ func (this *QGraphicsGridLayout) SizeHint(which SizeHint, constraint *QSizeF) *Q return _goptr } -func (this *QGraphicsGridLayout) AddItem6(item *QGraphicsLayoutItem, row int, column int, rowSpan int, columnSpan int, alignment AlignmentFlag) { - C.QGraphicsGridLayout_addItem6(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(alignment)) +func (this *QGraphicsGridLayout) AddItem3(item *QGraphicsLayoutItem, row int, column int, rowSpan int, columnSpan int, alignment AlignmentFlag) { + C.QGraphicsGridLayout_addItem3(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(alignment)) } func (this *QGraphicsGridLayout) AddItem4(item *QGraphicsLayoutItem, row int, column int, alignment AlignmentFlag) { diff --git a/qt/gen_qgraphicsgridlayout.h b/qt/gen_qgraphicsgridlayout.h index 70fdcaf6..44f21ee0 100644 --- a/qt/gen_qgraphicsgridlayout.h +++ b/qt/gen_qgraphicsgridlayout.h @@ -80,7 +80,7 @@ void QGraphicsGridLayout_removeItem(QGraphicsGridLayout* self, QGraphicsLayoutIt void QGraphicsGridLayout_invalidate(QGraphicsGridLayout* self); void QGraphicsGridLayout_setGeometry(QGraphicsGridLayout* self, QRectF* rect); QSizeF* QGraphicsGridLayout_sizeHint(const QGraphicsGridLayout* self, int which, QSizeF* constraint); -void QGraphicsGridLayout_addItem6(QGraphicsGridLayout* self, QGraphicsLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int alignment); +void QGraphicsGridLayout_addItem3(QGraphicsGridLayout* self, QGraphicsLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int alignment); void QGraphicsGridLayout_addItem4(QGraphicsGridLayout* self, QGraphicsLayoutItem* item, int row, int column, int alignment); bool QGraphicsGridLayout_override_virtual_count(void* self, intptr_t slot); int QGraphicsGridLayout_virtualbase_count(const void* self); diff --git a/qt/gen_qgraphicsitem.cpp b/qt/gen_qgraphicsitem.cpp index db493bff..7eb57c4c 100644 --- a/qt/gen_qgraphicsitem.cpp +++ b/qt/gen_qgraphicsitem.cpp @@ -1921,19 +1921,19 @@ void QGraphicsItem_setCacheMode2(QGraphicsItem* self, int mode, QSize* cacheSize self->setCacheMode(static_cast(mode), *cacheSize); } -void QGraphicsItem_setFocus1(QGraphicsItem* self, int focusReason) { +void QGraphicsItem_setFocusWithFocusReason(QGraphicsItem* self, int focusReason) { self->setFocus(static_cast(focusReason)); } -void QGraphicsItem_ensureVisible1(QGraphicsItem* self, QRectF* rect) { +void QGraphicsItem_ensureVisibleWithRect(QGraphicsItem* self, QRectF* rect) { self->ensureVisible(*rect); } -void QGraphicsItem_ensureVisible22(QGraphicsItem* self, QRectF* rect, int xmargin) { +void QGraphicsItem_ensureVisible3(QGraphicsItem* self, QRectF* rect, int xmargin) { self->ensureVisible(*rect, static_cast(xmargin)); } -void QGraphicsItem_ensureVisible3(QGraphicsItem* self, QRectF* rect, int xmargin, int ymargin) { +void QGraphicsItem_ensureVisible4(QGraphicsItem* self, QRectF* rect, int xmargin, int ymargin) { self->ensureVisible(*rect, static_cast(xmargin), static_cast(ymargin)); } @@ -1957,7 +1957,7 @@ void QGraphicsItem_setTransform2(QGraphicsItem* self, QTransform* matrix, bool c self->setTransform(*matrix, combine); } -struct miqt_array /* of QGraphicsItem* */ QGraphicsItem_collidingItems1(const QGraphicsItem* self, int mode) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsItem_collidingItemsWithMode(const QGraphicsItem* self, int mode) { QList _ret = self->collidingItems(static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1970,15 +1970,15 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsItem_collidingItems1(const Q return _out; } -bool QGraphicsItem_isObscured1(const QGraphicsItem* self, QRectF* rect) { +bool QGraphicsItem_isObscuredWithRect(const QGraphicsItem* self, QRectF* rect) { return self->isObscured(*rect); } -void QGraphicsItem_update1(QGraphicsItem* self, QRectF* rect) { +void QGraphicsItem_updateWithRect(QGraphicsItem* self, QRectF* rect) { self->update(*rect); } -void QGraphicsItem_scroll3(QGraphicsItem* self, double dx, double dy, QRectF* rect) { +void QGraphicsItem_scroll2(QGraphicsItem* self, double dx, double dy, QRectF* rect) { self->scroll(static_cast(dx), static_cast(dy), *rect); } diff --git a/qt/gen_qgraphicsitem.go b/qt/gen_qgraphicsitem.go index dfcfd56f..511e02fc 100644 --- a/qt/gen_qgraphicsitem.go +++ b/qt/gen_qgraphicsitem.go @@ -1004,20 +1004,20 @@ func (this *QGraphicsItem) SetCacheMode2(mode QGraphicsItem__CacheMode, cacheSiz C.QGraphicsItem_setCacheMode2(this.h, (C.int)(mode), cacheSize.cPointer()) } -func (this *QGraphicsItem) SetFocus1(focusReason FocusReason) { - C.QGraphicsItem_setFocus1(this.h, (C.int)(focusReason)) +func (this *QGraphicsItem) SetFocusWithFocusReason(focusReason FocusReason) { + C.QGraphicsItem_setFocusWithFocusReason(this.h, (C.int)(focusReason)) } -func (this *QGraphicsItem) EnsureVisible1(rect *QRectF) { - C.QGraphicsItem_ensureVisible1(this.h, rect.cPointer()) +func (this *QGraphicsItem) EnsureVisibleWithRect(rect *QRectF) { + C.QGraphicsItem_ensureVisibleWithRect(this.h, rect.cPointer()) } -func (this *QGraphicsItem) EnsureVisible22(rect *QRectF, xmargin int) { - C.QGraphicsItem_ensureVisible22(this.h, rect.cPointer(), (C.int)(xmargin)) +func (this *QGraphicsItem) EnsureVisible3(rect *QRectF, xmargin int) { + C.QGraphicsItem_ensureVisible3(this.h, rect.cPointer(), (C.int)(xmargin)) } -func (this *QGraphicsItem) EnsureVisible3(rect *QRectF, xmargin int, ymargin int) { - C.QGraphicsItem_ensureVisible3(this.h, rect.cPointer(), (C.int)(xmargin), (C.int)(ymargin)) +func (this *QGraphicsItem) EnsureVisible4(rect *QRectF, xmargin int, ymargin int) { + C.QGraphicsItem_ensureVisible4(this.h, rect.cPointer(), (C.int)(xmargin), (C.int)(ymargin)) } func (this *QGraphicsItem) EnsureVisible5(x float64, y float64, w float64, h float64, xmargin int) { @@ -1042,8 +1042,8 @@ func (this *QGraphicsItem) SetTransform2(matrix *QTransform, combine bool) { C.QGraphicsItem_setTransform2(this.h, matrix.cPointer(), (C.bool)(combine)) } -func (this *QGraphicsItem) CollidingItems1(mode ItemSelectionMode) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsItem_collidingItems1(this.h, (C.int)(mode)) +func (this *QGraphicsItem) CollidingItemsWithMode(mode ItemSelectionMode) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsItem_collidingItemsWithMode(this.h, (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1052,16 +1052,16 @@ func (this *QGraphicsItem) CollidingItems1(mode ItemSelectionMode) []*QGraphicsI return _ret } -func (this *QGraphicsItem) IsObscured1(rect *QRectF) bool { - return (bool)(C.QGraphicsItem_isObscured1(this.h, rect.cPointer())) +func (this *QGraphicsItem) IsObscuredWithRect(rect *QRectF) bool { + return (bool)(C.QGraphicsItem_isObscuredWithRect(this.h, rect.cPointer())) } -func (this *QGraphicsItem) Update1(rect *QRectF) { - C.QGraphicsItem_update1(this.h, rect.cPointer()) +func (this *QGraphicsItem) UpdateWithRect(rect *QRectF) { + C.QGraphicsItem_updateWithRect(this.h, rect.cPointer()) } -func (this *QGraphicsItem) Scroll3(dx float64, dy float64, rect *QRectF) { - C.QGraphicsItem_scroll3(this.h, (C.double)(dx), (C.double)(dy), rect.cPointer()) +func (this *QGraphicsItem) Scroll2(dx float64, dy float64, rect *QRectF) { + C.QGraphicsItem_scroll2(this.h, (C.double)(dx), (C.double)(dy), rect.cPointer()) } // UpdateMicroFocus can only be called from a QGraphicsItem that was directly constructed. diff --git a/qt/gen_qgraphicsitem.h b/qt/gen_qgraphicsitem.h index d6d63917..1e7415d7 100644 --- a/qt/gen_qgraphicsitem.h +++ b/qt/gen_qgraphicsitem.h @@ -312,19 +312,19 @@ void QGraphicsItem_setExtension(QGraphicsItem* self, int extension, QVariant* va QVariant* QGraphicsItem_extension(const QGraphicsItem* self, QVariant* variant); void QGraphicsItem_setFlag2(QGraphicsItem* self, int flag, bool enabled); void QGraphicsItem_setCacheMode2(QGraphicsItem* self, int mode, QSize* cacheSize); -void QGraphicsItem_setFocus1(QGraphicsItem* self, int focusReason); -void QGraphicsItem_ensureVisible1(QGraphicsItem* self, QRectF* rect); -void QGraphicsItem_ensureVisible22(QGraphicsItem* self, QRectF* rect, int xmargin); -void QGraphicsItem_ensureVisible3(QGraphicsItem* self, QRectF* rect, int xmargin, int ymargin); +void QGraphicsItem_setFocusWithFocusReason(QGraphicsItem* self, int focusReason); +void QGraphicsItem_ensureVisibleWithRect(QGraphicsItem* self, QRectF* rect); +void QGraphicsItem_ensureVisible3(QGraphicsItem* self, QRectF* rect, int xmargin); +void QGraphicsItem_ensureVisible4(QGraphicsItem* self, QRectF* rect, int xmargin, int ymargin); void QGraphicsItem_ensureVisible5(QGraphicsItem* self, double x, double y, double w, double h, int xmargin); void QGraphicsItem_ensureVisible6(QGraphicsItem* self, double x, double y, double w, double h, int xmargin, int ymargin); void QGraphicsItem_setMatrix2(QGraphicsItem* self, QMatrix* matrix, bool combine); QTransform* QGraphicsItem_itemTransform2(const QGraphicsItem* self, QGraphicsItem* other, bool* ok); void QGraphicsItem_setTransform2(QGraphicsItem* self, QTransform* matrix, bool combine); -struct miqt_array /* of QGraphicsItem* */ QGraphicsItem_collidingItems1(const QGraphicsItem* self, int mode); -bool QGraphicsItem_isObscured1(const QGraphicsItem* self, QRectF* rect); -void QGraphicsItem_update1(QGraphicsItem* self, QRectF* rect); -void QGraphicsItem_scroll3(QGraphicsItem* self, double dx, double dy, QRectF* rect); +struct miqt_array /* of QGraphicsItem* */ QGraphicsItem_collidingItemsWithMode(const QGraphicsItem* self, int mode); +bool QGraphicsItem_isObscuredWithRect(const QGraphicsItem* self, QRectF* rect); +void QGraphicsItem_updateWithRect(QGraphicsItem* self, QRectF* rect); +void QGraphicsItem_scroll2(QGraphicsItem* self, double dx, double dy, QRectF* rect); bool QGraphicsItem_override_virtual_advance(void* self, intptr_t slot); void QGraphicsItem_virtualbase_advance(void* self, int phase); bool QGraphicsItem_override_virtual_boundingRect(void* self, intptr_t slot); diff --git a/qt/gen_qgraphicslinearlayout.cpp b/qt/gen_qgraphicslinearlayout.cpp index 62cebb9b..aa9e7a16 100644 --- a/qt/gen_qgraphicslinearlayout.cpp +++ b/qt/gen_qgraphicslinearlayout.cpp @@ -331,7 +331,7 @@ void QGraphicsLinearLayout_dump(const QGraphicsLinearLayout* self) { self->dump(); } -void QGraphicsLinearLayout_addStretch1(QGraphicsLinearLayout* self, int stretch) { +void QGraphicsLinearLayout_addStretchWithStretch(QGraphicsLinearLayout* self, int stretch) { self->addStretch(static_cast(stretch)); } @@ -339,7 +339,7 @@ void QGraphicsLinearLayout_insertStretch2(QGraphicsLinearLayout* self, int index self->insertStretch(static_cast(index), static_cast(stretch)); } -void QGraphicsLinearLayout_dump1(const QGraphicsLinearLayout* self, int indent) { +void QGraphicsLinearLayout_dumpWithIndent(const QGraphicsLinearLayout* self, int indent) { self->dump(static_cast(indent)); } diff --git a/qt/gen_qgraphicslinearlayout.go b/qt/gen_qgraphicslinearlayout.go index ca3e76e4..80f56ee7 100644 --- a/qt/gen_qgraphicslinearlayout.go +++ b/qt/gen_qgraphicslinearlayout.go @@ -164,16 +164,16 @@ func (this *QGraphicsLinearLayout) Dump() { C.QGraphicsLinearLayout_dump(this.h) } -func (this *QGraphicsLinearLayout) AddStretch1(stretch int) { - C.QGraphicsLinearLayout_addStretch1(this.h, (C.int)(stretch)) +func (this *QGraphicsLinearLayout) AddStretchWithStretch(stretch int) { + C.QGraphicsLinearLayout_addStretchWithStretch(this.h, (C.int)(stretch)) } func (this *QGraphicsLinearLayout) InsertStretch2(index int, stretch int) { C.QGraphicsLinearLayout_insertStretch2(this.h, (C.int)(index), (C.int)(stretch)) } -func (this *QGraphicsLinearLayout) Dump1(indent int) { - C.QGraphicsLinearLayout_dump1(this.h, (C.int)(indent)) +func (this *QGraphicsLinearLayout) DumpWithIndent(indent int) { + C.QGraphicsLinearLayout_dumpWithIndent(this.h, (C.int)(indent)) } // AddChildLayoutItem can only be called from a QGraphicsLinearLayout that was directly constructed. diff --git a/qt/gen_qgraphicslinearlayout.h b/qt/gen_qgraphicslinearlayout.h index 749164f0..19eb0f73 100644 --- a/qt/gen_qgraphicslinearlayout.h +++ b/qt/gen_qgraphicslinearlayout.h @@ -59,9 +59,9 @@ QGraphicsLayoutItem* QGraphicsLinearLayout_itemAt(const QGraphicsLinearLayout* s void QGraphicsLinearLayout_invalidate(QGraphicsLinearLayout* self); QSizeF* QGraphicsLinearLayout_sizeHint(const QGraphicsLinearLayout* self, int which, QSizeF* constraint); void QGraphicsLinearLayout_dump(const QGraphicsLinearLayout* self); -void QGraphicsLinearLayout_addStretch1(QGraphicsLinearLayout* self, int stretch); +void QGraphicsLinearLayout_addStretchWithStretch(QGraphicsLinearLayout* self, int stretch); void QGraphicsLinearLayout_insertStretch2(QGraphicsLinearLayout* self, int index, int stretch); -void QGraphicsLinearLayout_dump1(const QGraphicsLinearLayout* self, int indent); +void QGraphicsLinearLayout_dumpWithIndent(const QGraphicsLinearLayout* self, int indent); bool QGraphicsLinearLayout_override_virtual_removeAt(void* self, intptr_t slot); void QGraphicsLinearLayout_virtualbase_removeAt(void* self, int index); bool QGraphicsLinearLayout_override_virtual_setGeometry(void* self, intptr_t slot); diff --git a/qt/gen_qgraphicsscene.cpp b/qt/gen_qgraphicsscene.cpp index 606f1a7f..336b7895 100644 --- a/qt/gen_qgraphicsscene.cpp +++ b/qt/gen_qgraphicsscene.cpp @@ -1180,7 +1180,7 @@ void QGraphicsScene_render4(QGraphicsScene* self, QPainter* painter, QRectF* tar self->render(painter, *target, *source, static_cast(aspectRatioMode)); } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items1(const QGraphicsScene* self, int order) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_itemsWithOrder(const QGraphicsScene* self, int order) { QList _ret = self->items(static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1193,7 +1193,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items1(const QGraphics return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items22(const QGraphicsScene* self, QPointF* pos, int mode) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items3(const QGraphicsScene* self, QPointF* pos, int mode) { QList _ret = self->items(*pos, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1206,7 +1206,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items22(const QGraphic return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items3(const QGraphicsScene* self, QPointF* pos, int mode, int order) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items4(const QGraphicsScene* self, QPointF* pos, int mode, int order) { QList _ret = self->items(*pos, static_cast(mode), static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1219,7 +1219,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items3(const QGraphics return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items4(const QGraphicsScene* self, QPointF* pos, int mode, int order, QTransform* deviceTransform) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items5(const QGraphicsScene* self, QPointF* pos, int mode, int order, QTransform* deviceTransform) { QList _ret = self->items(*pos, static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1232,7 +1232,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items4(const QGraphics return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items23(const QGraphicsScene* self, QRectF* rect, int mode) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items6(const QGraphicsScene* self, QRectF* rect, int mode) { QList _ret = self->items(*rect, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1245,7 +1245,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items23(const QGraphic return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items32(const QGraphicsScene* self, QRectF* rect, int mode, int order) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items7(const QGraphicsScene* self, QRectF* rect, int mode, int order) { QList _ret = self->items(*rect, static_cast(mode), static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1258,7 +1258,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items32(const QGraphic return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items42(const QGraphicsScene* self, QRectF* rect, int mode, int order, QTransform* deviceTransform) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items8(const QGraphicsScene* self, QRectF* rect, int mode, int order, QTransform* deviceTransform) { QList _ret = self->items(*rect, static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1271,7 +1271,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items42(const QGraphic return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items25(const QGraphicsScene* self, QPainterPath* path, int mode) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items12(const QGraphicsScene* self, QPainterPath* path, int mode) { QList _ret = self->items(*path, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1284,7 +1284,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items25(const QGraphic return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items34(const QGraphicsScene* self, QPainterPath* path, int mode, int order) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items13(const QGraphicsScene* self, QPainterPath* path, int mode, int order) { QList _ret = self->items(*path, static_cast(mode), static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1297,7 +1297,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items34(const QGraphic return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items44(const QGraphicsScene* self, QPainterPath* path, int mode, int order, QTransform* deviceTransform) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items14(const QGraphicsScene* self, QPainterPath* path, int mode, int order, QTransform* deviceTransform) { QList _ret = self->items(*path, static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1323,7 +1323,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_collidingItems2(const return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items7(const QGraphicsScene* self, double x, double y, double w, double h, int mode, int order, QTransform* deviceTransform) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items15(const QGraphicsScene* self, double x, double y, double w, double h, int mode, int order, QTransform* deviceTransform) { QList _ret = self->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1336,31 +1336,31 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items7(const QGraphics return _out; } -void QGraphicsScene_setSelectionArea22(QGraphicsScene* self, QPainterPath* path, int mode) { +void QGraphicsScene_setSelectionArea3(QGraphicsScene* self, QPainterPath* path, int mode) { self->setSelectionArea(*path, static_cast(mode)); } -void QGraphicsScene_setSelectionArea3(QGraphicsScene* self, QPainterPath* path, int mode, QTransform* deviceTransform) { +void QGraphicsScene_setSelectionArea4(QGraphicsScene* self, QPainterPath* path, int mode, QTransform* deviceTransform) { self->setSelectionArea(*path, static_cast(mode), *deviceTransform); } -void QGraphicsScene_setSelectionArea32(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode) { +void QGraphicsScene_setSelectionArea5(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode) { self->setSelectionArea(*path, static_cast(selectionOperation), static_cast(mode)); } -void QGraphicsScene_setSelectionArea4(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode, QTransform* deviceTransform) { +void QGraphicsScene_setSelectionArea6(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode, QTransform* deviceTransform) { self->setSelectionArea(*path, static_cast(selectionOperation), static_cast(mode), *deviceTransform); } -QGraphicsEllipseItem* QGraphicsScene_addEllipse22(QGraphicsScene* self, QRectF* rect, QPen* pen) { +QGraphicsEllipseItem* QGraphicsScene_addEllipse3(QGraphicsScene* self, QRectF* rect, QPen* pen) { return self->addEllipse(*rect, *pen); } -QGraphicsEllipseItem* QGraphicsScene_addEllipse3(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush) { +QGraphicsEllipseItem* QGraphicsScene_addEllipse4(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush) { return self->addEllipse(*rect, *pen, *brush); } -QGraphicsLineItem* QGraphicsScene_addLine22(QGraphicsScene* self, QLineF* line, QPen* pen) { +QGraphicsLineItem* QGraphicsScene_addLine3(QGraphicsScene* self, QLineF* line, QPen* pen) { return self->addLine(*line, *pen); } @@ -1372,11 +1372,11 @@ QGraphicsPathItem* QGraphicsScene_addPath3(QGraphicsScene* self, QPainterPath* p return self->addPath(*path, *pen, *brush); } -QGraphicsRectItem* QGraphicsScene_addRect22(QGraphicsScene* self, QRectF* rect, QPen* pen) { +QGraphicsRectItem* QGraphicsScene_addRect3(QGraphicsScene* self, QRectF* rect, QPen* pen) { return self->addRect(*rect, *pen); } -QGraphicsRectItem* QGraphicsScene_addRect3(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush) { +QGraphicsRectItem* QGraphicsScene_addRect4(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush) { return self->addRect(*rect, *pen, *brush); } @@ -1402,7 +1402,7 @@ QGraphicsEllipseItem* QGraphicsScene_addEllipse6(QGraphicsScene* self, double x, return self->addEllipse(static_cast(x), static_cast(y), static_cast(w), static_cast(h), *pen, *brush); } -QGraphicsLineItem* QGraphicsScene_addLine5(QGraphicsScene* self, double x1, double y1, double x2, double y2, QPen* pen) { +QGraphicsLineItem* QGraphicsScene_addLine4(QGraphicsScene* self, double x1, double y1, double x2, double y2, QPen* pen) { return self->addLine(static_cast(x1), static_cast(y1), static_cast(x2), static_cast(y2), *pen); } @@ -1418,23 +1418,23 @@ void QGraphicsScene_setFocusItem2(QGraphicsScene* self, QGraphicsItem* item, int self->setFocusItem(item, static_cast(focusReason)); } -void QGraphicsScene_setFocus1(QGraphicsScene* self, int focusReason) { +void QGraphicsScene_setFocusWithFocusReason(QGraphicsScene* self, int focusReason) { self->setFocus(static_cast(focusReason)); } -void QGraphicsScene_invalidate5(QGraphicsScene* self, double x, double y, double w, double h, int layers) { +void QGraphicsScene_invalidate3(QGraphicsScene* self, double x, double y, double w, double h, int layers) { self->invalidate(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(layers)); } -void QGraphicsScene_update1(QGraphicsScene* self, QRectF* rect) { +void QGraphicsScene_updateWithRect(QGraphicsScene* self, QRectF* rect) { self->update(*rect); } -void QGraphicsScene_invalidate1(QGraphicsScene* self, QRectF* rect) { +void QGraphicsScene_invalidateWithRect(QGraphicsScene* self, QRectF* rect) { self->invalidate(*rect); } -void QGraphicsScene_invalidate22(QGraphicsScene* self, QRectF* rect, int layers) { +void QGraphicsScene_invalidate4(QGraphicsScene* self, QRectF* rect, int layers) { self->invalidate(*rect, static_cast(layers)); } diff --git a/qt/gen_qgraphicsscene.go b/qt/gen_qgraphicsscene.go index 4b8802b6..5f6ce597 100644 --- a/qt/gen_qgraphicsscene.go +++ b/qt/gen_qgraphicsscene.go @@ -671,8 +671,8 @@ func (this *QGraphicsScene) Render4(painter *QPainter, target *QRectF, source *Q C.QGraphicsScene_render4(this.h, painter.cPointer(), target.cPointer(), source.cPointer(), (C.int)(aspectRatioMode)) } -func (this *QGraphicsScene) Items1(order SortOrder) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items1(this.h, (C.int)(order)) +func (this *QGraphicsScene) ItemsWithOrder(order SortOrder) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_itemsWithOrder(this.h, (C.int)(order)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -681,8 +681,8 @@ func (this *QGraphicsScene) Items1(order SortOrder) []*QGraphicsItem { return _ret } -func (this *QGraphicsScene) Items22(pos *QPointF, mode ItemSelectionMode) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items22(this.h, pos.cPointer(), (C.int)(mode)) +func (this *QGraphicsScene) Items3(pos *QPointF, mode ItemSelectionMode) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items3(this.h, pos.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -691,8 +691,8 @@ func (this *QGraphicsScene) Items22(pos *QPointF, mode ItemSelectionMode) []*QGr return _ret } -func (this *QGraphicsScene) Items3(pos *QPointF, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items3(this.h, pos.cPointer(), (C.int)(mode), (C.int)(order)) +func (this *QGraphicsScene) Items4(pos *QPointF, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items4(this.h, pos.cPointer(), (C.int)(mode), (C.int)(order)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -701,8 +701,8 @@ func (this *QGraphicsScene) Items3(pos *QPointF, mode ItemSelectionMode, order S return _ret } -func (this *QGraphicsScene) Items4(pos *QPointF, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items4(this.h, pos.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) +func (this *QGraphicsScene) Items5(pos *QPointF, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items5(this.h, pos.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -711,8 +711,8 @@ func (this *QGraphicsScene) Items4(pos *QPointF, mode ItemSelectionMode, order S return _ret } -func (this *QGraphicsScene) Items23(rect *QRectF, mode ItemSelectionMode) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items23(this.h, rect.cPointer(), (C.int)(mode)) +func (this *QGraphicsScene) Items6(rect *QRectF, mode ItemSelectionMode) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items6(this.h, rect.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -721,8 +721,8 @@ func (this *QGraphicsScene) Items23(rect *QRectF, mode ItemSelectionMode) []*QGr return _ret } -func (this *QGraphicsScene) Items32(rect *QRectF, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items32(this.h, rect.cPointer(), (C.int)(mode), (C.int)(order)) +func (this *QGraphicsScene) Items7(rect *QRectF, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items7(this.h, rect.cPointer(), (C.int)(mode), (C.int)(order)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -731,8 +731,8 @@ func (this *QGraphicsScene) Items32(rect *QRectF, mode ItemSelectionMode, order return _ret } -func (this *QGraphicsScene) Items42(rect *QRectF, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items42(this.h, rect.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) +func (this *QGraphicsScene) Items8(rect *QRectF, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items8(this.h, rect.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -741,8 +741,8 @@ func (this *QGraphicsScene) Items42(rect *QRectF, mode ItemSelectionMode, order return _ret } -func (this *QGraphicsScene) Items25(path *QPainterPath, mode ItemSelectionMode) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items25(this.h, path.cPointer(), (C.int)(mode)) +func (this *QGraphicsScene) Items12(path *QPainterPath, mode ItemSelectionMode) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items12(this.h, path.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -751,8 +751,8 @@ func (this *QGraphicsScene) Items25(path *QPainterPath, mode ItemSelectionMode) return _ret } -func (this *QGraphicsScene) Items34(path *QPainterPath, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items34(this.h, path.cPointer(), (C.int)(mode), (C.int)(order)) +func (this *QGraphicsScene) Items13(path *QPainterPath, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items13(this.h, path.cPointer(), (C.int)(mode), (C.int)(order)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -761,8 +761,8 @@ func (this *QGraphicsScene) Items34(path *QPainterPath, mode ItemSelectionMode, return _ret } -func (this *QGraphicsScene) Items44(path *QPainterPath, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items44(this.h, path.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) +func (this *QGraphicsScene) Items14(path *QPainterPath, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items14(this.h, path.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -781,8 +781,8 @@ func (this *QGraphicsScene) CollidingItems2(item *QGraphicsItem, mode ItemSelect return _ret } -func (this *QGraphicsScene) Items7(x float64, y float64, w float64, h float64, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items7(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) +func (this *QGraphicsScene) Items15(x float64, y float64, w float64, h float64, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items15(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -791,32 +791,32 @@ func (this *QGraphicsScene) Items7(x float64, y float64, w float64, h float64, m return _ret } -func (this *QGraphicsScene) SetSelectionArea22(path *QPainterPath, mode ItemSelectionMode) { - C.QGraphicsScene_setSelectionArea22(this.h, path.cPointer(), (C.int)(mode)) +func (this *QGraphicsScene) SetSelectionArea3(path *QPainterPath, mode ItemSelectionMode) { + C.QGraphicsScene_setSelectionArea3(this.h, path.cPointer(), (C.int)(mode)) } -func (this *QGraphicsScene) SetSelectionArea3(path *QPainterPath, mode ItemSelectionMode, deviceTransform *QTransform) { - C.QGraphicsScene_setSelectionArea3(this.h, path.cPointer(), (C.int)(mode), deviceTransform.cPointer()) +func (this *QGraphicsScene) SetSelectionArea4(path *QPainterPath, mode ItemSelectionMode, deviceTransform *QTransform) { + C.QGraphicsScene_setSelectionArea4(this.h, path.cPointer(), (C.int)(mode), deviceTransform.cPointer()) } -func (this *QGraphicsScene) SetSelectionArea32(path *QPainterPath, selectionOperation ItemSelectionOperation, mode ItemSelectionMode) { - C.QGraphicsScene_setSelectionArea32(this.h, path.cPointer(), (C.int)(selectionOperation), (C.int)(mode)) +func (this *QGraphicsScene) SetSelectionArea5(path *QPainterPath, selectionOperation ItemSelectionOperation, mode ItemSelectionMode) { + C.QGraphicsScene_setSelectionArea5(this.h, path.cPointer(), (C.int)(selectionOperation), (C.int)(mode)) } -func (this *QGraphicsScene) SetSelectionArea4(path *QPainterPath, selectionOperation ItemSelectionOperation, mode ItemSelectionMode, deviceTransform *QTransform) { - C.QGraphicsScene_setSelectionArea4(this.h, path.cPointer(), (C.int)(selectionOperation), (C.int)(mode), deviceTransform.cPointer()) +func (this *QGraphicsScene) SetSelectionArea6(path *QPainterPath, selectionOperation ItemSelectionOperation, mode ItemSelectionMode, deviceTransform *QTransform) { + C.QGraphicsScene_setSelectionArea6(this.h, path.cPointer(), (C.int)(selectionOperation), (C.int)(mode), deviceTransform.cPointer()) } -func (this *QGraphicsScene) AddEllipse22(rect *QRectF, pen *QPen) *QGraphicsEllipseItem { - return newQGraphicsEllipseItem(C.QGraphicsScene_addEllipse22(this.h, rect.cPointer(), pen.cPointer())) +func (this *QGraphicsScene) AddEllipse3(rect *QRectF, pen *QPen) *QGraphicsEllipseItem { + return newQGraphicsEllipseItem(C.QGraphicsScene_addEllipse3(this.h, rect.cPointer(), pen.cPointer())) } -func (this *QGraphicsScene) AddEllipse3(rect *QRectF, pen *QPen, brush *QBrush) *QGraphicsEllipseItem { - return newQGraphicsEllipseItem(C.QGraphicsScene_addEllipse3(this.h, rect.cPointer(), pen.cPointer(), brush.cPointer())) +func (this *QGraphicsScene) AddEllipse4(rect *QRectF, pen *QPen, brush *QBrush) *QGraphicsEllipseItem { + return newQGraphicsEllipseItem(C.QGraphicsScene_addEllipse4(this.h, rect.cPointer(), pen.cPointer(), brush.cPointer())) } -func (this *QGraphicsScene) AddLine22(line *QLineF, pen *QPen) *QGraphicsLineItem { - return newQGraphicsLineItem(C.QGraphicsScene_addLine22(this.h, line.cPointer(), pen.cPointer())) +func (this *QGraphicsScene) AddLine3(line *QLineF, pen *QPen) *QGraphicsLineItem { + return newQGraphicsLineItem(C.QGraphicsScene_addLine3(this.h, line.cPointer(), pen.cPointer())) } func (this *QGraphicsScene) AddPath2(path *QPainterPath, pen *QPen) *QGraphicsPathItem { @@ -827,12 +827,12 @@ func (this *QGraphicsScene) AddPath3(path *QPainterPath, pen *QPen, brush *QBrus return newQGraphicsPathItem(C.QGraphicsScene_addPath3(this.h, path.cPointer(), pen.cPointer(), brush.cPointer())) } -func (this *QGraphicsScene) AddRect22(rect *QRectF, pen *QPen) *QGraphicsRectItem { - return newQGraphicsRectItem(C.QGraphicsScene_addRect22(this.h, rect.cPointer(), pen.cPointer())) +func (this *QGraphicsScene) AddRect3(rect *QRectF, pen *QPen) *QGraphicsRectItem { + return newQGraphicsRectItem(C.QGraphicsScene_addRect3(this.h, rect.cPointer(), pen.cPointer())) } -func (this *QGraphicsScene) AddRect3(rect *QRectF, pen *QPen, brush *QBrush) *QGraphicsRectItem { - return newQGraphicsRectItem(C.QGraphicsScene_addRect3(this.h, rect.cPointer(), pen.cPointer(), brush.cPointer())) +func (this *QGraphicsScene) AddRect4(rect *QRectF, pen *QPen, brush *QBrush) *QGraphicsRectItem { + return newQGraphicsRectItem(C.QGraphicsScene_addRect4(this.h, rect.cPointer(), pen.cPointer(), brush.cPointer())) } func (this *QGraphicsScene) AddText2(text string, font *QFont) *QGraphicsTextItem { @@ -863,8 +863,8 @@ func (this *QGraphicsScene) AddEllipse6(x float64, y float64, w float64, h float return newQGraphicsEllipseItem(C.QGraphicsScene_addEllipse6(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), pen.cPointer(), brush.cPointer())) } -func (this *QGraphicsScene) AddLine5(x1 float64, y1 float64, x2 float64, y2 float64, pen *QPen) *QGraphicsLineItem { - return newQGraphicsLineItem(C.QGraphicsScene_addLine5(this.h, (C.double)(x1), (C.double)(y1), (C.double)(x2), (C.double)(y2), pen.cPointer())) +func (this *QGraphicsScene) AddLine4(x1 float64, y1 float64, x2 float64, y2 float64, pen *QPen) *QGraphicsLineItem { + return newQGraphicsLineItem(C.QGraphicsScene_addLine4(this.h, (C.double)(x1), (C.double)(y1), (C.double)(x2), (C.double)(y2), pen.cPointer())) } func (this *QGraphicsScene) AddRect5(x float64, y float64, w float64, h float64, pen *QPen) *QGraphicsRectItem { @@ -879,24 +879,24 @@ func (this *QGraphicsScene) SetFocusItem2(item *QGraphicsItem, focusReason Focus C.QGraphicsScene_setFocusItem2(this.h, item.cPointer(), (C.int)(focusReason)) } -func (this *QGraphicsScene) SetFocus1(focusReason FocusReason) { - C.QGraphicsScene_setFocus1(this.h, (C.int)(focusReason)) +func (this *QGraphicsScene) SetFocusWithFocusReason(focusReason FocusReason) { + C.QGraphicsScene_setFocusWithFocusReason(this.h, (C.int)(focusReason)) } -func (this *QGraphicsScene) Invalidate5(x float64, y float64, w float64, h float64, layers QGraphicsScene__SceneLayer) { - C.QGraphicsScene_invalidate5(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(layers)) +func (this *QGraphicsScene) Invalidate3(x float64, y float64, w float64, h float64, layers QGraphicsScene__SceneLayer) { + C.QGraphicsScene_invalidate3(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(layers)) } -func (this *QGraphicsScene) Update1(rect *QRectF) { - C.QGraphicsScene_update1(this.h, rect.cPointer()) +func (this *QGraphicsScene) UpdateWithRect(rect *QRectF) { + C.QGraphicsScene_updateWithRect(this.h, rect.cPointer()) } -func (this *QGraphicsScene) Invalidate1(rect *QRectF) { - C.QGraphicsScene_invalidate1(this.h, rect.cPointer()) +func (this *QGraphicsScene) InvalidateWithRect(rect *QRectF) { + C.QGraphicsScene_invalidateWithRect(this.h, rect.cPointer()) } -func (this *QGraphicsScene) Invalidate22(rect *QRectF, layers QGraphicsScene__SceneLayer) { - C.QGraphicsScene_invalidate22(this.h, rect.cPointer(), (C.int)(layers)) +func (this *QGraphicsScene) Invalidate4(rect *QRectF, layers QGraphicsScene__SceneLayer) { + C.QGraphicsScene_invalidate4(this.h, rect.cPointer(), (C.int)(layers)) } // FocusNextPrevChild can only be called from a QGraphicsScene that was directly constructed. diff --git a/qt/gen_qgraphicsscene.h b/qt/gen_qgraphicsscene.h index aacb5d88..2f4a9e0d 100644 --- a/qt/gen_qgraphicsscene.h +++ b/qt/gen_qgraphicsscene.h @@ -224,43 +224,43 @@ 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); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items1(const QGraphicsScene* self, int order); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items22(const QGraphicsScene* self, QPointF* pos, int mode); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items3(const QGraphicsScene* self, QPointF* pos, int mode, int order); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items4(const QGraphicsScene* self, QPointF* pos, int mode, int order, QTransform* deviceTransform); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items23(const QGraphicsScene* self, QRectF* rect, int mode); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items32(const QGraphicsScene* self, QRectF* rect, int mode, int order); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items42(const QGraphicsScene* self, QRectF* rect, int mode, int order, QTransform* deviceTransform); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items25(const QGraphicsScene* self, QPainterPath* path, int mode); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items34(const QGraphicsScene* self, QPainterPath* path, int mode, int order); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items44(const QGraphicsScene* self, QPainterPath* path, int mode, int order, QTransform* deviceTransform); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_itemsWithOrder(const QGraphicsScene* self, int order); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items3(const QGraphicsScene* self, QPointF* pos, int mode); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items4(const QGraphicsScene* self, QPointF* pos, int mode, int order); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items5(const QGraphicsScene* self, QPointF* pos, int mode, int order, QTransform* deviceTransform); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items6(const QGraphicsScene* self, QRectF* rect, int mode); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items7(const QGraphicsScene* self, QRectF* rect, int mode, int order); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items8(const QGraphicsScene* self, QRectF* rect, int mode, int order, QTransform* deviceTransform); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items12(const QGraphicsScene* self, QPainterPath* path, int mode); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items13(const QGraphicsScene* self, QPainterPath* path, int mode, int order); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items14(const QGraphicsScene* self, QPainterPath* path, int mode, int order, QTransform* deviceTransform); struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_collidingItems2(const QGraphicsScene* self, QGraphicsItem* item, int mode); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items7(const QGraphicsScene* self, double x, double y, double w, double h, int mode, int order, QTransform* deviceTransform); -void QGraphicsScene_setSelectionArea22(QGraphicsScene* self, QPainterPath* path, int mode); -void QGraphicsScene_setSelectionArea3(QGraphicsScene* self, QPainterPath* path, int mode, QTransform* deviceTransform); -void QGraphicsScene_setSelectionArea32(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode); -void QGraphicsScene_setSelectionArea4(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode, QTransform* deviceTransform); -QGraphicsEllipseItem* QGraphicsScene_addEllipse22(QGraphicsScene* self, QRectF* rect, QPen* pen); -QGraphicsEllipseItem* QGraphicsScene_addEllipse3(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush); -QGraphicsLineItem* QGraphicsScene_addLine22(QGraphicsScene* self, QLineF* line, QPen* pen); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items15(const QGraphicsScene* self, double x, double y, double w, double h, int mode, int order, QTransform* deviceTransform); +void QGraphicsScene_setSelectionArea3(QGraphicsScene* self, QPainterPath* path, int mode); +void QGraphicsScene_setSelectionArea4(QGraphicsScene* self, QPainterPath* path, int mode, QTransform* deviceTransform); +void QGraphicsScene_setSelectionArea5(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode); +void QGraphicsScene_setSelectionArea6(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode, QTransform* deviceTransform); +QGraphicsEllipseItem* QGraphicsScene_addEllipse3(QGraphicsScene* self, QRectF* rect, QPen* pen); +QGraphicsEllipseItem* QGraphicsScene_addEllipse4(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush); +QGraphicsLineItem* QGraphicsScene_addLine3(QGraphicsScene* self, QLineF* line, QPen* pen); QGraphicsPathItem* QGraphicsScene_addPath2(QGraphicsScene* self, QPainterPath* path, QPen* pen); 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); +QGraphicsRectItem* QGraphicsScene_addRect3(QGraphicsScene* self, QRectF* rect, QPen* pen); +QGraphicsRectItem* QGraphicsScene_addRect4(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); 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); -QGraphicsLineItem* QGraphicsScene_addLine5(QGraphicsScene* self, double x1, double y1, double x2, double y2, QPen* pen); +QGraphicsLineItem* QGraphicsScene_addLine4(QGraphicsScene* self, double x1, double y1, double x2, double y2, QPen* pen); QGraphicsRectItem* QGraphicsScene_addRect5(QGraphicsScene* self, double x, double y, double w, double h, QPen* pen); QGraphicsRectItem* QGraphicsScene_addRect6(QGraphicsScene* self, double x, double y, double w, double h, QPen* pen, QBrush* brush); void QGraphicsScene_setFocusItem2(QGraphicsScene* self, QGraphicsItem* item, int focusReason); -void QGraphicsScene_setFocus1(QGraphicsScene* self, int focusReason); -void QGraphicsScene_invalidate5(QGraphicsScene* self, double x, double y, double w, double h, int layers); -void QGraphicsScene_update1(QGraphicsScene* self, QRectF* rect); -void QGraphicsScene_invalidate1(QGraphicsScene* self, QRectF* rect); -void QGraphicsScene_invalidate22(QGraphicsScene* self, QRectF* rect, int layers); +void QGraphicsScene_setFocusWithFocusReason(QGraphicsScene* self, int focusReason); +void QGraphicsScene_invalidate3(QGraphicsScene* self, double x, double y, double w, double h, int layers); +void QGraphicsScene_updateWithRect(QGraphicsScene* self, QRectF* rect); +void QGraphicsScene_invalidateWithRect(QGraphicsScene* self, QRectF* rect); +void QGraphicsScene_invalidate4(QGraphicsScene* self, QRectF* rect, int layers); bool QGraphicsScene_override_virtual_inputMethodQuery(void* self, intptr_t slot); QVariant* QGraphicsScene_virtualbase_inputMethodQuery(const void* self, int query); bool QGraphicsScene_override_virtual_event(void* self, intptr_t slot); diff --git a/qt/gen_qgraphicsview.cpp b/qt/gen_qgraphicsview.cpp index f5cc88f7..4ccf5233 100644 --- a/qt/gen_qgraphicsview.cpp +++ b/qt/gen_qgraphicsview.cpp @@ -1632,11 +1632,11 @@ void QGraphicsView_setTransform2(QGraphicsView* self, QTransform* matrix, bool c self->setTransform(*matrix, combine); } -void QGraphicsView_ensureVisible22(QGraphicsView* self, QRectF* rect, int xmargin) { +void QGraphicsView_ensureVisible3(QGraphicsView* self, QRectF* rect, int xmargin) { self->ensureVisible(*rect, static_cast(xmargin)); } -void QGraphicsView_ensureVisible3(QGraphicsView* self, QRectF* rect, int xmargin, int ymargin) { +void QGraphicsView_ensureVisible4(QGraphicsView* self, QRectF* rect, int xmargin, int ymargin) { self->ensureVisible(*rect, static_cast(xmargin), static_cast(ymargin)); } @@ -1648,23 +1648,23 @@ void QGraphicsView_ensureVisible6(QGraphicsView* self, double x, double y, doubl self->ensureVisible(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(xmargin), static_cast(ymargin)); } -void QGraphicsView_ensureVisible23(QGraphicsView* self, QGraphicsItem* item, int xmargin) { +void QGraphicsView_ensureVisible7(QGraphicsView* self, QGraphicsItem* item, int xmargin) { self->ensureVisible(item, static_cast(xmargin)); } -void QGraphicsView_ensureVisible32(QGraphicsView* self, QGraphicsItem* item, int xmargin, int ymargin) { +void QGraphicsView_ensureVisible8(QGraphicsView* self, QGraphicsItem* item, int xmargin, int ymargin) { self->ensureVisible(item, static_cast(xmargin), static_cast(ymargin)); } -void QGraphicsView_fitInView22(QGraphicsView* self, QRectF* rect, int aspectRadioMode) { +void QGraphicsView_fitInView3(QGraphicsView* self, QRectF* rect, int aspectRadioMode) { self->fitInView(*rect, static_cast(aspectRadioMode)); } -void QGraphicsView_fitInView5(QGraphicsView* self, double x, double y, double w, double h, int aspectRadioMode) { +void QGraphicsView_fitInView4(QGraphicsView* self, double x, double y, double w, double h, int aspectRadioMode) { self->fitInView(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(aspectRadioMode)); } -void QGraphicsView_fitInView23(QGraphicsView* self, QGraphicsItem* item, int aspectRadioMode) { +void QGraphicsView_fitInView5(QGraphicsView* self, QGraphicsItem* item, int aspectRadioMode) { self->fitInView(item, static_cast(aspectRadioMode)); } @@ -1680,7 +1680,7 @@ void QGraphicsView_render4(QGraphicsView* self, QPainter* painter, QRectF* targe self->render(painter, *target, *source, static_cast(aspectRatioMode)); } -struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items22(const QGraphicsView* self, QRect* rect, int mode) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items4(const QGraphicsView* self, QRect* rect, int mode) { QList _ret = self->items(*rect, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1706,7 +1706,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items5(const QGraphicsV return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items24(const QGraphicsView* self, QPainterPath* path, int mode) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items7(const QGraphicsView* self, QPainterPath* path, int mode) { QList _ret = self->items(*path, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1719,7 +1719,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items24(const QGraphics return _out; } -void QGraphicsView_invalidateScene1(QGraphicsView* self, QRectF* rect) { +void QGraphicsView_invalidateSceneWithRect(QGraphicsView* self, QRectF* rect) { self->invalidateScene(*rect); } diff --git a/qt/gen_qgraphicsview.go b/qt/gen_qgraphicsview.go index dd2877cf..188fc2b3 100644 --- a/qt/gen_qgraphicsview.go +++ b/qt/gen_qgraphicsview.go @@ -602,12 +602,12 @@ func (this *QGraphicsView) SetTransform2(matrix *QTransform, combine bool) { C.QGraphicsView_setTransform2(this.h, matrix.cPointer(), (C.bool)(combine)) } -func (this *QGraphicsView) EnsureVisible22(rect *QRectF, xmargin int) { - C.QGraphicsView_ensureVisible22(this.h, rect.cPointer(), (C.int)(xmargin)) +func (this *QGraphicsView) EnsureVisible3(rect *QRectF, xmargin int) { + C.QGraphicsView_ensureVisible3(this.h, rect.cPointer(), (C.int)(xmargin)) } -func (this *QGraphicsView) EnsureVisible3(rect *QRectF, xmargin int, ymargin int) { - C.QGraphicsView_ensureVisible3(this.h, rect.cPointer(), (C.int)(xmargin), (C.int)(ymargin)) +func (this *QGraphicsView) EnsureVisible4(rect *QRectF, xmargin int, ymargin int) { + C.QGraphicsView_ensureVisible4(this.h, rect.cPointer(), (C.int)(xmargin), (C.int)(ymargin)) } func (this *QGraphicsView) EnsureVisible5(x float64, y float64, w float64, h float64, xmargin int) { @@ -618,24 +618,24 @@ func (this *QGraphicsView) EnsureVisible6(x float64, y float64, w float64, h flo C.QGraphicsView_ensureVisible6(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(xmargin), (C.int)(ymargin)) } -func (this *QGraphicsView) EnsureVisible23(item *QGraphicsItem, xmargin int) { - C.QGraphicsView_ensureVisible23(this.h, item.cPointer(), (C.int)(xmargin)) +func (this *QGraphicsView) EnsureVisible7(item *QGraphicsItem, xmargin int) { + C.QGraphicsView_ensureVisible7(this.h, item.cPointer(), (C.int)(xmargin)) } -func (this *QGraphicsView) EnsureVisible32(item *QGraphicsItem, xmargin int, ymargin int) { - C.QGraphicsView_ensureVisible32(this.h, item.cPointer(), (C.int)(xmargin), (C.int)(ymargin)) +func (this *QGraphicsView) EnsureVisible8(item *QGraphicsItem, xmargin int, ymargin int) { + C.QGraphicsView_ensureVisible8(this.h, item.cPointer(), (C.int)(xmargin), (C.int)(ymargin)) } -func (this *QGraphicsView) FitInView22(rect *QRectF, aspectRadioMode AspectRatioMode) { - C.QGraphicsView_fitInView22(this.h, rect.cPointer(), (C.int)(aspectRadioMode)) +func (this *QGraphicsView) FitInView3(rect *QRectF, aspectRadioMode AspectRatioMode) { + C.QGraphicsView_fitInView3(this.h, rect.cPointer(), (C.int)(aspectRadioMode)) } -func (this *QGraphicsView) FitInView5(x float64, y float64, w float64, h float64, aspectRadioMode AspectRatioMode) { - C.QGraphicsView_fitInView5(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(aspectRadioMode)) +func (this *QGraphicsView) FitInView4(x float64, y float64, w float64, h float64, aspectRadioMode AspectRatioMode) { + C.QGraphicsView_fitInView4(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(aspectRadioMode)) } -func (this *QGraphicsView) FitInView23(item *QGraphicsItem, aspectRadioMode AspectRatioMode) { - C.QGraphicsView_fitInView23(this.h, item.cPointer(), (C.int)(aspectRadioMode)) +func (this *QGraphicsView) FitInView5(item *QGraphicsItem, aspectRadioMode AspectRatioMode) { + C.QGraphicsView_fitInView5(this.h, item.cPointer(), (C.int)(aspectRadioMode)) } func (this *QGraphicsView) Render2(painter *QPainter, target *QRectF) { @@ -650,8 +650,8 @@ func (this *QGraphicsView) Render4(painter *QPainter, target *QRectF, source *QR C.QGraphicsView_render4(this.h, painter.cPointer(), target.cPointer(), source.cPointer(), (C.int)(aspectRatioMode)) } -func (this *QGraphicsView) Items22(rect *QRect, mode ItemSelectionMode) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsView_items22(this.h, rect.cPointer(), (C.int)(mode)) +func (this *QGraphicsView) Items4(rect *QRect, mode ItemSelectionMode) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsView_items4(this.h, rect.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -670,8 +670,8 @@ func (this *QGraphicsView) Items5(x int, y int, w int, h int, mode ItemSelection return _ret } -func (this *QGraphicsView) Items24(path *QPainterPath, mode ItemSelectionMode) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsView_items24(this.h, path.cPointer(), (C.int)(mode)) +func (this *QGraphicsView) Items7(path *QPainterPath, mode ItemSelectionMode) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsView_items7(this.h, path.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -680,8 +680,8 @@ func (this *QGraphicsView) Items24(path *QPainterPath, mode ItemSelectionMode) [ return _ret } -func (this *QGraphicsView) InvalidateScene1(rect *QRectF) { - C.QGraphicsView_invalidateScene1(this.h, rect.cPointer()) +func (this *QGraphicsView) InvalidateSceneWithRect(rect *QRectF) { + C.QGraphicsView_invalidateSceneWithRect(this.h, rect.cPointer()) } func (this *QGraphicsView) InvalidateScene2(rect *QRectF, layers QGraphicsScene__SceneLayer) { diff --git a/qt/gen_qgraphicsview.h b/qt/gen_qgraphicsview.h index f5fe6051..9572712a 100644 --- a/qt/gen_qgraphicsview.h +++ b/qt/gen_qgraphicsview.h @@ -226,22 +226,22 @@ 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); void QGraphicsView_setTransform2(QGraphicsView* self, QTransform* matrix, bool combine); -void QGraphicsView_ensureVisible22(QGraphicsView* self, QRectF* rect, int xmargin); -void QGraphicsView_ensureVisible3(QGraphicsView* self, QRectF* rect, int xmargin, int ymargin); +void QGraphicsView_ensureVisible3(QGraphicsView* self, QRectF* rect, int xmargin); +void QGraphicsView_ensureVisible4(QGraphicsView* self, QRectF* rect, int xmargin, int ymargin); void QGraphicsView_ensureVisible5(QGraphicsView* self, double x, double y, double w, double h, int xmargin); void QGraphicsView_ensureVisible6(QGraphicsView* self, double x, double y, double w, double h, int xmargin, int ymargin); -void QGraphicsView_ensureVisible23(QGraphicsView* self, QGraphicsItem* item, int xmargin); -void QGraphicsView_ensureVisible32(QGraphicsView* self, QGraphicsItem* item, int xmargin, int ymargin); -void QGraphicsView_fitInView22(QGraphicsView* self, QRectF* rect, int aspectRadioMode); -void QGraphicsView_fitInView5(QGraphicsView* self, double x, double y, double w, double h, int aspectRadioMode); -void QGraphicsView_fitInView23(QGraphicsView* self, QGraphicsItem* item, int aspectRadioMode); +void QGraphicsView_ensureVisible7(QGraphicsView* self, QGraphicsItem* item, int xmargin); +void QGraphicsView_ensureVisible8(QGraphicsView* self, QGraphicsItem* item, int xmargin, int ymargin); +void QGraphicsView_fitInView3(QGraphicsView* self, QRectF* rect, int aspectRadioMode); +void QGraphicsView_fitInView4(QGraphicsView* self, double x, double y, double w, double h, int aspectRadioMode); +void QGraphicsView_fitInView5(QGraphicsView* self, QGraphicsItem* item, int aspectRadioMode); void QGraphicsView_render2(QGraphicsView* self, QPainter* painter, QRectF* target); void QGraphicsView_render3(QGraphicsView* self, QPainter* painter, QRectF* target, QRect* source); void QGraphicsView_render4(QGraphicsView* self, QPainter* painter, QRectF* target, QRect* source, int aspectRatioMode); -struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items22(const QGraphicsView* self, QRect* rect, int mode); +struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items4(const QGraphicsView* self, QRect* rect, int mode); struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items5(const QGraphicsView* self, int x, int y, int w, int h, int mode); -struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items24(const QGraphicsView* self, QPainterPath* path, int mode); -void QGraphicsView_invalidateScene1(QGraphicsView* self, QRectF* rect); +struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items7(const QGraphicsView* self, QPainterPath* path, int mode); +void QGraphicsView_invalidateSceneWithRect(QGraphicsView* self, QRectF* rect); void QGraphicsView_invalidateScene2(QGraphicsView* self, QRectF* rect, int layers); bool QGraphicsView_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QGraphicsView_virtualbase_sizeHint(const void* self); diff --git a/qt/gen_qgridlayout.cpp b/qt/gen_qgridlayout.cpp index cde12cf2..5a3286fc 100644 --- a/qt/gen_qgridlayout.cpp +++ b/qt/gen_qgridlayout.cpp @@ -812,27 +812,27 @@ void QGridLayout_addWidget4(QGridLayout* self, QWidget* param1, int row, int col self->addWidget(param1, static_cast(row), static_cast(column), static_cast(param4)); } -void QGridLayout_addWidget6(QGridLayout* self, QWidget* param1, int row, int column, int rowSpan, int columnSpan, int param6) { +void QGridLayout_addWidget5(QGridLayout* self, QWidget* param1, int row, int column, int rowSpan, int columnSpan, int param6) { self->addWidget(param1, static_cast(row), static_cast(column), static_cast(rowSpan), static_cast(columnSpan), static_cast(param6)); } -void QGridLayout_addLayout4(QGridLayout* self, QLayout* param1, int row, int column, int param4) { +void QGridLayout_addLayout3(QGridLayout* self, QLayout* param1, int row, int column, int param4) { self->addLayout(param1, static_cast(row), static_cast(column), static_cast(param4)); } -void QGridLayout_addLayout6(QGridLayout* self, QLayout* param1, int row, int column, int rowSpan, int columnSpan, int param6) { +void QGridLayout_addLayout4(QGridLayout* self, QLayout* param1, int row, int column, int rowSpan, int columnSpan, int param6) { self->addLayout(param1, static_cast(row), static_cast(column), static_cast(rowSpan), static_cast(columnSpan), static_cast(param6)); } -void QGridLayout_addItem4(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan) { +void QGridLayout_addItem2(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan) { self->addItem(item, static_cast(row), static_cast(column), static_cast(rowSpan)); } -void QGridLayout_addItem5(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan) { +void QGridLayout_addItem3(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan) { self->addItem(item, static_cast(row), static_cast(column), static_cast(rowSpan), static_cast(columnSpan)); } -void QGridLayout_addItem6(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int param6) { +void QGridLayout_addItem4(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int param6) { self->addItem(item, static_cast(row), static_cast(column), static_cast(rowSpan), static_cast(columnSpan), static_cast(param6)); } diff --git a/qt/gen_qgridlayout.go b/qt/gen_qgridlayout.go index d44966ba..5603bc38 100644 --- a/qt/gen_qgridlayout.go +++ b/qt/gen_qgridlayout.go @@ -306,28 +306,28 @@ func (this *QGridLayout) AddWidget4(param1 *QWidget, row int, column int, param4 C.QGridLayout_addWidget4(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(param4)) } -func (this *QGridLayout) AddWidget6(param1 *QWidget, row int, column int, rowSpan int, columnSpan int, param6 AlignmentFlag) { - C.QGridLayout_addWidget6(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) +func (this *QGridLayout) AddWidget5(param1 *QWidget, row int, column int, rowSpan int, columnSpan int, param6 AlignmentFlag) { + C.QGridLayout_addWidget5(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) } -func (this *QGridLayout) AddLayout4(param1 *QLayout, row int, column int, param4 AlignmentFlag) { - C.QGridLayout_addLayout4(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(param4)) +func (this *QGridLayout) AddLayout3(param1 *QLayout, row int, column int, param4 AlignmentFlag) { + C.QGridLayout_addLayout3(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(param4)) } -func (this *QGridLayout) AddLayout6(param1 *QLayout, row int, column int, rowSpan int, columnSpan int, param6 AlignmentFlag) { - C.QGridLayout_addLayout6(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) +func (this *QGridLayout) AddLayout4(param1 *QLayout, row int, column int, rowSpan int, columnSpan int, param6 AlignmentFlag) { + C.QGridLayout_addLayout4(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) } -func (this *QGridLayout) AddItem4(item *QLayoutItem, row int, column int, rowSpan int) { - C.QGridLayout_addItem4(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan)) +func (this *QGridLayout) AddItem2(item *QLayoutItem, row int, column int, rowSpan int) { + C.QGridLayout_addItem2(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan)) } -func (this *QGridLayout) AddItem5(item *QLayoutItem, row int, column int, rowSpan int, columnSpan int) { - C.QGridLayout_addItem5(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan)) +func (this *QGridLayout) AddItem3(item *QLayoutItem, row int, column int, rowSpan int, columnSpan int) { + C.QGridLayout_addItem3(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan)) } -func (this *QGridLayout) AddItem6(item *QLayoutItem, row int, column int, rowSpan int, columnSpan int, param6 AlignmentFlag) { - C.QGridLayout_addItem6(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) +func (this *QGridLayout) AddItem4(item *QLayoutItem, row int, column int, rowSpan int, columnSpan int, param6 AlignmentFlag) { + C.QGridLayout_addItem4(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) } // WidgetEvent can only be called from a QGridLayout that was directly constructed. diff --git a/qt/gen_qgridlayout.h b/qt/gen_qgridlayout.h index 931673dd..8fb4dce1 100644 --- a/qt/gen_qgridlayout.h +++ b/qt/gen_qgridlayout.h @@ -97,12 +97,12 @@ 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); -void QGridLayout_addLayout6(QGridLayout* self, QLayout* param1, int row, int column, int rowSpan, int columnSpan, int param6); -void QGridLayout_addItem4(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan); -void QGridLayout_addItem5(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan); -void QGridLayout_addItem6(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int param6); +void QGridLayout_addWidget5(QGridLayout* self, QWidget* param1, int row, int column, int rowSpan, int columnSpan, int param6); +void QGridLayout_addLayout3(QGridLayout* self, QLayout* param1, int row, int column, int param4); +void QGridLayout_addLayout4(QGridLayout* self, QLayout* param1, int row, int column, int rowSpan, int columnSpan, int param6); +void QGridLayout_addItem2(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan); +void QGridLayout_addItem3(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan); +void QGridLayout_addItem4(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int param6); bool QGridLayout_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QGridLayout_virtualbase_sizeHint(const void* self); bool QGridLayout_override_virtual_minimumSize(void* self, intptr_t slot); diff --git a/qt/gen_qgroupbox.cpp b/qt/gen_qgroupbox.cpp index c55f2c6b..90d6163e 100644 --- a/qt/gen_qgroupbox.cpp +++ b/qt/gen_qgroupbox.cpp @@ -44,7 +44,7 @@ extern "C" { void miqt_exec_callback_QGroupBox_clicked(intptr_t); void miqt_exec_callback_QGroupBox_toggled(intptr_t, bool); -void miqt_exec_callback_QGroupBox_clicked1(intptr_t, bool); +void miqt_exec_callback_QGroupBox_clickedWithChecked(intptr_t, bool); QSize* miqt_exec_callback_QGroupBox_minimumSizeHint(const QGroupBox*, intptr_t); bool miqt_exec_callback_QGroupBox_event(QGroupBox*, intptr_t, QEvent*); void miqt_exec_callback_QGroupBox_childEvent(QGroupBox*, intptr_t, QChildEvent*); @@ -1176,14 +1176,14 @@ struct miqt_string QGroupBox_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QGroupBox_clicked1(QGroupBox* self, bool checked) { +void QGroupBox_clickedWithChecked(QGroupBox* self, bool checked) { self->clicked(checked); } -void QGroupBox_connect_clicked1(QGroupBox* self, intptr_t slot) { +void QGroupBox_connect_clickedWithChecked(QGroupBox* self, intptr_t slot) { MiqtVirtualQGroupBox::connect(self, static_cast(&QGroupBox::clicked), self, [=](bool checked) { bool sigval1 = checked; - miqt_exec_callback_QGroupBox_clicked1(slot, sigval1); + miqt_exec_callback_QGroupBox_clickedWithChecked(slot, sigval1); }); } diff --git a/qt/gen_qgroupbox.go b/qt/gen_qgroupbox.go index 0aa92cb7..a275b100 100644 --- a/qt/gen_qgroupbox.go +++ b/qt/gen_qgroupbox.go @@ -244,15 +244,15 @@ func QGroupBox_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QGroupBox) Clicked1(checked bool) { - C.QGroupBox_clicked1(this.h, (C.bool)(checked)) +func (this *QGroupBox) ClickedWithChecked(checked bool) { + C.QGroupBox_clickedWithChecked(this.h, (C.bool)(checked)) } -func (this *QGroupBox) OnClicked1(slot func(checked bool)) { - C.QGroupBox_connect_clicked1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QGroupBox) OnClickedWithChecked(slot func(checked bool)) { + C.QGroupBox_connect_clickedWithChecked(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QGroupBox_clicked1 -func miqt_exec_callback_QGroupBox_clicked1(cb C.intptr_t, checked C.bool) { +//export miqt_exec_callback_QGroupBox_clickedWithChecked +func miqt_exec_callback_QGroupBox_clickedWithChecked(cb C.intptr_t, checked C.bool) { gofunc, ok := cgo.Handle(cb).Value().(func(checked bool)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qgroupbox.h b/qt/gen_qgroupbox.h index 4bd7e48a..cb7c5e6e 100644 --- a/qt/gen_qgroupbox.h +++ b/qt/gen_qgroupbox.h @@ -121,8 +121,8 @@ 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_clickedWithChecked(QGroupBox* self, bool checked); +void QGroupBox_connect_clickedWithChecked(QGroupBox* self, intptr_t slot); bool QGroupBox_override_virtual_minimumSizeHint(void* self, intptr_t slot); QSize* QGroupBox_virtualbase_minimumSizeHint(const void* self); bool QGroupBox_override_virtual_event(void* self, intptr_t slot); diff --git a/qt/gen_qheaderview.cpp b/qt/gen_qheaderview.cpp index a318bcbf..306cd85d 100644 --- a/qt/gen_qheaderview.cpp +++ b/qt/gen_qheaderview.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qicon.cpp b/qt/gen_qicon.cpp index 827c7868..564f14af 100644 --- a/qt/gen_qicon.cpp +++ b/qt/gen_qicon.cpp @@ -253,51 +253,51 @@ void QIcon_setFallbackThemeName(struct miqt_string name) { QIcon::setFallbackThemeName(name_QString); } -QPixmap* QIcon_pixmap22(const QIcon* self, QSize* size, int mode) { +QPixmap* QIcon_pixmap4(const QIcon* self, QSize* size, int mode) { return new QPixmap(self->pixmap(*size, static_cast(mode))); } -QPixmap* QIcon_pixmap32(const QIcon* self, QSize* size, int mode, int state) { +QPixmap* QIcon_pixmap5(const QIcon* self, QSize* size, int mode, int state) { return new QPixmap(self->pixmap(*size, static_cast(mode), static_cast(state))); } -QPixmap* QIcon_pixmap33(const QIcon* self, int w, int h, int mode) { +QPixmap* QIcon_pixmap6(const QIcon* self, int w, int h, int mode) { return new QPixmap(self->pixmap(static_cast(w), static_cast(h), static_cast(mode))); } -QPixmap* QIcon_pixmap4(const QIcon* self, int w, int h, int mode, int state) { +QPixmap* QIcon_pixmap7(const QIcon* self, int w, int h, int mode, int state) { return new QPixmap(self->pixmap(static_cast(w), static_cast(h), static_cast(mode), static_cast(state))); } -QPixmap* QIcon_pixmap23(const QIcon* self, int extent, int mode) { +QPixmap* QIcon_pixmap8(const QIcon* self, int extent, int mode) { return new QPixmap(self->pixmap(static_cast(extent), static_cast(mode))); } -QPixmap* QIcon_pixmap34(const QIcon* self, int extent, int mode, int state) { +QPixmap* QIcon_pixmap9(const QIcon* self, int extent, int mode, int state) { return new QPixmap(self->pixmap(static_cast(extent), static_cast(mode), static_cast(state))); } -QPixmap* QIcon_pixmap35(const QIcon* self, QWindow* window, QSize* size, int mode) { +QPixmap* QIcon_pixmap10(const QIcon* self, QWindow* window, QSize* size, int mode) { return new QPixmap(self->pixmap(window, *size, static_cast(mode))); } -QPixmap* QIcon_pixmap42(const QIcon* self, QWindow* window, QSize* size, int mode, int state) { +QPixmap* QIcon_pixmap11(const QIcon* self, QWindow* window, QSize* size, int mode, int state) { return new QPixmap(self->pixmap(window, *size, static_cast(mode), static_cast(state))); } -QSize* QIcon_actualSize22(const QIcon* self, QSize* size, int mode) { +QSize* QIcon_actualSize3(const QIcon* self, QSize* size, int mode) { return new QSize(self->actualSize(*size, static_cast(mode))); } -QSize* QIcon_actualSize3(const QIcon* self, QSize* size, int mode, int state) { +QSize* QIcon_actualSize4(const QIcon* self, QSize* size, int mode, int state) { return new QSize(self->actualSize(*size, static_cast(mode), static_cast(state))); } -QSize* QIcon_actualSize32(const QIcon* self, QWindow* window, QSize* size, int mode) { +QSize* QIcon_actualSize5(const QIcon* self, QWindow* window, QSize* size, int mode) { return new QSize(self->actualSize(window, *size, static_cast(mode))); } -QSize* QIcon_actualSize4(const QIcon* self, QWindow* window, QSize* size, int mode, int state) { +QSize* QIcon_actualSize6(const QIcon* self, QWindow* window, QSize* size, int mode, int state) { return new QSize(self->actualSize(window, *size, static_cast(mode), static_cast(state))); } @@ -348,7 +348,7 @@ void QIcon_addFile4(QIcon* self, struct miqt_string fileName, QSize* size, int m self->addFile(fileName_QString, *size, static_cast(mode), static_cast(state)); } -struct miqt_array /* of QSize* */ QIcon_availableSizes1(const QIcon* self, int mode) { +struct miqt_array /* of QSize* */ QIcon_availableSizesWithMode(const QIcon* self, int mode) { QList _ret = self->availableSizes(static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QSize** _arr = static_cast(malloc(sizeof(QSize*) * _ret.length())); diff --git a/qt/gen_qicon.go b/qt/gen_qicon.go index e138cc4d..4f24c5fa 100644 --- a/qt/gen_qicon.go +++ b/qt/gen_qicon.go @@ -320,74 +320,74 @@ func QIcon_SetFallbackThemeName(name string) { C.QIcon_setFallbackThemeName(name_ms) } -func (this *QIcon) Pixmap22(size *QSize, mode QIcon__Mode) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap22(this.h, size.cPointer(), (C.int)(mode))) +func (this *QIcon) Pixmap4(size *QSize, mode QIcon__Mode) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap4(this.h, size.cPointer(), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap32(size *QSize, mode QIcon__Mode, state QIcon__State) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap32(this.h, size.cPointer(), (C.int)(mode), (C.int)(state))) +func (this *QIcon) Pixmap5(size *QSize, mode QIcon__Mode, state QIcon__State) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap5(this.h, size.cPointer(), (C.int)(mode), (C.int)(state))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap33(w int, h int, mode QIcon__Mode) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap33(this.h, (C.int)(w), (C.int)(h), (C.int)(mode))) +func (this *QIcon) Pixmap6(w int, h int, mode QIcon__Mode) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap6(this.h, (C.int)(w), (C.int)(h), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap4(w int, h int, mode QIcon__Mode, state QIcon__State) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap4(this.h, (C.int)(w), (C.int)(h), (C.int)(mode), (C.int)(state))) +func (this *QIcon) Pixmap7(w int, h int, mode QIcon__Mode, state QIcon__State) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap7(this.h, (C.int)(w), (C.int)(h), (C.int)(mode), (C.int)(state))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap23(extent int, mode QIcon__Mode) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap23(this.h, (C.int)(extent), (C.int)(mode))) +func (this *QIcon) Pixmap8(extent int, mode QIcon__Mode) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap8(this.h, (C.int)(extent), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap34(extent int, mode QIcon__Mode, state QIcon__State) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap34(this.h, (C.int)(extent), (C.int)(mode), (C.int)(state))) +func (this *QIcon) Pixmap9(extent int, mode QIcon__Mode, state QIcon__State) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap9(this.h, (C.int)(extent), (C.int)(mode), (C.int)(state))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap35(window *QWindow, size *QSize, mode QIcon__Mode) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap35(this.h, window.cPointer(), size.cPointer(), (C.int)(mode))) +func (this *QIcon) Pixmap10(window *QWindow, size *QSize, mode QIcon__Mode) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap10(this.h, window.cPointer(), size.cPointer(), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap42(window *QWindow, size *QSize, mode QIcon__Mode, state QIcon__State) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap42(this.h, window.cPointer(), size.cPointer(), (C.int)(mode), (C.int)(state))) +func (this *QIcon) Pixmap11(window *QWindow, size *QSize, mode QIcon__Mode, state QIcon__State) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap11(this.h, window.cPointer(), size.cPointer(), (C.int)(mode), (C.int)(state))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) ActualSize22(size *QSize, mode QIcon__Mode) *QSize { - _goptr := newQSize(C.QIcon_actualSize22(this.h, size.cPointer(), (C.int)(mode))) +func (this *QIcon) ActualSize3(size *QSize, mode QIcon__Mode) *QSize { + _goptr := newQSize(C.QIcon_actualSize3(this.h, size.cPointer(), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) ActualSize3(size *QSize, mode QIcon__Mode, state QIcon__State) *QSize { - _goptr := newQSize(C.QIcon_actualSize3(this.h, size.cPointer(), (C.int)(mode), (C.int)(state))) +func (this *QIcon) ActualSize4(size *QSize, mode QIcon__Mode, state QIcon__State) *QSize { + _goptr := newQSize(C.QIcon_actualSize4(this.h, size.cPointer(), (C.int)(mode), (C.int)(state))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) ActualSize32(window *QWindow, size *QSize, mode QIcon__Mode) *QSize { - _goptr := newQSize(C.QIcon_actualSize32(this.h, window.cPointer(), size.cPointer(), (C.int)(mode))) +func (this *QIcon) ActualSize5(window *QWindow, size *QSize, mode QIcon__Mode) *QSize { + _goptr := newQSize(C.QIcon_actualSize5(this.h, window.cPointer(), size.cPointer(), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) ActualSize4(window *QWindow, size *QSize, mode QIcon__Mode, state QIcon__State) *QSize { - _goptr := newQSize(C.QIcon_actualSize4(this.h, window.cPointer(), size.cPointer(), (C.int)(mode), (C.int)(state))) +func (this *QIcon) ActualSize6(window *QWindow, size *QSize, mode QIcon__Mode, state QIcon__State) *QSize { + _goptr := newQSize(C.QIcon_actualSize6(this.h, window.cPointer(), size.cPointer(), (C.int)(mode), (C.int)(state))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -448,8 +448,8 @@ func (this *QIcon) AddFile4(fileName string, size *QSize, mode QIcon__Mode, stat C.QIcon_addFile4(this.h, fileName_ms, size.cPointer(), (C.int)(mode), (C.int)(state)) } -func (this *QIcon) AvailableSizes1(mode QIcon__Mode) []QSize { - var _ma C.struct_miqt_array = C.QIcon_availableSizes1(this.h, (C.int)(mode)) +func (this *QIcon) AvailableSizesWithMode(mode QIcon__Mode) []QSize { + var _ma C.struct_miqt_array = C.QIcon_availableSizesWithMode(this.h, (C.int)(mode)) _ret := make([]QSize, int(_ma.len)) _outCast := (*[0xffff]*C.QSize)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qicon.h b/qt/gen_qicon.h index 47a289bf..0df05208 100644 --- a/qt/gen_qicon.h +++ b/qt/gen_qicon.h @@ -71,18 +71,18 @@ 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); -QPixmap* QIcon_pixmap4(const QIcon* self, int w, int h, int mode, int state); -QPixmap* QIcon_pixmap23(const QIcon* self, int extent, int mode); -QPixmap* QIcon_pixmap34(const QIcon* self, int extent, int mode, int state); -QPixmap* QIcon_pixmap35(const QIcon* self, QWindow* window, QSize* size, int mode); -QPixmap* QIcon_pixmap42(const QIcon* self, QWindow* window, QSize* size, int mode, int state); -QSize* QIcon_actualSize22(const QIcon* self, QSize* size, int mode); -QSize* QIcon_actualSize3(const QIcon* self, QSize* size, int mode, int state); -QSize* QIcon_actualSize32(const QIcon* self, QWindow* window, QSize* size, int mode); -QSize* QIcon_actualSize4(const QIcon* self, QWindow* window, QSize* size, int mode, int state); +QPixmap* QIcon_pixmap4(const QIcon* self, QSize* size, int mode); +QPixmap* QIcon_pixmap5(const QIcon* self, QSize* size, int mode, int state); +QPixmap* QIcon_pixmap6(const QIcon* self, int w, int h, int mode); +QPixmap* QIcon_pixmap7(const QIcon* self, int w, int h, int mode, int state); +QPixmap* QIcon_pixmap8(const QIcon* self, int extent, int mode); +QPixmap* QIcon_pixmap9(const QIcon* self, int extent, int mode, int state); +QPixmap* QIcon_pixmap10(const QIcon* self, QWindow* window, QSize* size, int mode); +QPixmap* QIcon_pixmap11(const QIcon* self, QWindow* window, QSize* size, int mode, int state); +QSize* QIcon_actualSize3(const QIcon* self, QSize* size, int mode); +QSize* QIcon_actualSize4(const QIcon* self, QSize* size, int mode, int state); +QSize* QIcon_actualSize5(const QIcon* self, QWindow* window, QSize* size, int mode); +QSize* QIcon_actualSize6(const QIcon* self, QWindow* window, QSize* size, int mode, int state); void QIcon_paint3(const QIcon* self, QPainter* painter, QRect* rect, int alignment); void QIcon_paint4(const QIcon* self, QPainter* painter, QRect* rect, int alignment, int mode); void QIcon_paint5(const QIcon* self, QPainter* painter, QRect* rect, int alignment, int mode, int state); @@ -94,7 +94,7 @@ 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); -struct miqt_array /* of QSize* */ QIcon_availableSizes1(const QIcon* self, int mode); +struct miqt_array /* of QSize* */ QIcon_availableSizesWithMode(const QIcon* self, int mode); struct miqt_array /* of QSize* */ QIcon_availableSizes2(const QIcon* self, int mode, int state); void QIcon_delete(QIcon* self); diff --git a/qt/gen_qidentityproxymodel.cpp b/qt/gen_qidentityproxymodel.cpp index 6439d222..7066330e 100644 --- a/qt/gen_qidentityproxymodel.cpp +++ b/qt/gen_qidentityproxymodel.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qimage.cpp b/qt/gen_qimage.cpp index b47947b6..2c5cd40c 100644 --- a/qt/gen_qimage.cpp +++ b/qt/gen_qimage.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include "gen_qimage.h" @@ -678,15 +679,15 @@ int QImage_toImageFormat(QPixelFormat* format) { return static_cast(_ret); } -QImage* QImage_copy1(const QImage* self, QRect* rect) { +QImage* QImage_copyWithRect(const QImage* self, QRect* rect) { return new QImage(self->copy(*rect)); } -QImage* QImage_convertToFormat22(const QImage* self, int f, int flags) { +QImage* QImage_convertToFormat3(const QImage* self, int f, int flags) { return new QImage(self->convertToFormat(static_cast(f), static_cast(flags))); } -QImage* QImage_convertToFormat3(const QImage* self, int f, struct miqt_array /* of unsigned int */ colorTable, int flags) { +QImage* QImage_convertToFormat4(const QImage* self, int f, struct miqt_array /* of unsigned int */ colorTable, int flags) { QVector colorTable_QList; colorTable_QList.reserve(colorTable.len); unsigned int* colorTable_arr = static_cast(colorTable.data); @@ -700,11 +701,11 @@ void QImage_convertTo2(QImage* self, int f, int flags) { self->convertTo(static_cast(f), static_cast(flags)); } -QImage* QImage_createAlphaMask1(const QImage* self, int flags) { +QImage* QImage_createAlphaMaskWithFlags(const QImage* self, int flags) { return new QImage(self->createAlphaMask(static_cast(flags))); } -QImage* QImage_createHeuristicMask1(const QImage* self, bool clipTight) { +QImage* QImage_createHeuristicMaskWithClipTight(const QImage* self, bool clipTight) { return new QImage(self->createHeuristicMask(clipTight)); } @@ -712,19 +713,19 @@ QImage* QImage_createMaskFromColor2(const QImage* self, unsigned int color, int return new QImage(self->createMaskFromColor(static_cast(color), static_cast(mode))); } -QImage* QImage_scaled3(const QImage* self, int w, int h, int aspectMode) { +QImage* QImage_scaled2(const QImage* self, int w, int h, int aspectMode) { return new QImage(self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode))); } -QImage* QImage_scaled4(const QImage* self, int w, int h, int aspectMode, int mode) { +QImage* QImage_scaled3(const QImage* self, int w, int h, int aspectMode, int mode) { return new QImage(self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode), static_cast(mode))); } -QImage* QImage_scaled2(const QImage* self, QSize* s, int aspectMode) { +QImage* QImage_scaled4(const QImage* self, QSize* s, int aspectMode) { return new QImage(self->scaled(*s, static_cast(aspectMode))); } -QImage* QImage_scaled32(const QImage* self, QSize* s, int aspectMode, int mode) { +QImage* QImage_scaled5(const QImage* self, QSize* s, int aspectMode, int mode) { return new QImage(self->scaled(*s, static_cast(aspectMode), static_cast(mode))); } @@ -740,11 +741,11 @@ QImage* QImage_transformed2(const QImage* self, QMatrix* matrix, int mode) { return new QImage(self->transformed(*matrix, static_cast(mode))); } -QImage* QImage_transformed22(const QImage* self, QTransform* matrix, int mode) { +QImage* QImage_transformed3(const QImage* self, QTransform* matrix, int mode) { return new QImage(self->transformed(*matrix, static_cast(mode))); } -QImage* QImage_mirrored1(const QImage* self, bool horizontally) { +QImage* QImage_mirroredWithHorizontally(const QImage* self, bool horizontally) { return new QImage(self->mirrored(horizontally)); } @@ -752,7 +753,7 @@ QImage* QImage_mirrored2(const QImage* self, bool horizontally, bool vertically) return new QImage(self->mirrored(horizontally, vertically)); } -void QImage_invertPixels1(QImage* self, int param1) { +void QImage_invertPixelsWithQImageInvertMode(QImage* self, int param1) { self->invertPixels(static_cast(param1)); } @@ -761,11 +762,11 @@ bool QImage_load2(QImage* self, struct miqt_string fileName, const char* format) return self->load(fileName_QString, format); } -bool QImage_loadFromData3(QImage* self, const unsigned char* buf, int len, const char* format) { +bool QImage_loadFromData2(QImage* self, const unsigned char* buf, int len, const char* format) { return self->loadFromData(static_cast(buf), static_cast(len), format); } -bool QImage_loadFromData2(QImage* self, struct miqt_string data, const char* aformat) { +bool QImage_loadFromData3(QImage* self, struct miqt_string data, const char* aformat) { QByteArray data_QByteArray(data.data, data.len); return self->loadFromData(data_QByteArray, aformat); } @@ -780,24 +781,24 @@ bool QImage_save3(const QImage* self, struct miqt_string fileName, const char* f return self->save(fileName_QString, format, static_cast(quality)); } -bool QImage_save22(const QImage* self, QIODevice* device, const char* format) { +bool QImage_save4(const QImage* self, QIODevice* device, const char* format) { return self->save(device, format); } -bool QImage_save32(const QImage* self, QIODevice* device, const char* format, int quality) { +bool QImage_save5(const QImage* self, QIODevice* device, const char* format, int quality) { return self->save(device, format, static_cast(quality)); } -QImage* QImage_fromData3(const unsigned char* data, int size, const char* format) { +QImage* QImage_fromData2(const unsigned char* data, int size, const char* format) { return new QImage(QImage::fromData(static_cast(data), static_cast(size), format)); } -QImage* QImage_fromData2(struct miqt_string data, const char* format) { +QImage* QImage_fromData3(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) { +struct miqt_string QImage_textWithKey(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 diff --git a/qt/gen_qimage.go b/qt/gen_qimage.go index 9f157367..f67a6ed7 100644 --- a/qt/gen_qimage.go +++ b/qt/gen_qimage.go @@ -685,26 +685,26 @@ func QImage_ToImageFormat(format QPixelFormat) QImage__Format { return (QImage__Format)(C.QImage_toImageFormat(format.cPointer())) } -func (this *QImage) Copy1(rect *QRect) *QImage { - _goptr := newQImage(C.QImage_copy1(this.h, rect.cPointer())) +func (this *QImage) CopyWithRect(rect *QRect) *QImage { + _goptr := newQImage(C.QImage_copyWithRect(this.h, rect.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) ConvertToFormat22(f QImage__Format, flags ImageConversionFlag) *QImage { - _goptr := newQImage(C.QImage_convertToFormat22(this.h, (C.int)(f), (C.int)(flags))) +func (this *QImage) ConvertToFormat3(f QImage__Format, flags ImageConversionFlag) *QImage { + _goptr := newQImage(C.QImage_convertToFormat3(this.h, (C.int)(f), (C.int)(flags))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) ConvertToFormat3(f QImage__Format, colorTable []uint, flags ImageConversionFlag) *QImage { +func (this *QImage) ConvertToFormat4(f QImage__Format, colorTable []uint, flags ImageConversionFlag) *QImage { colorTable_CArray := (*[0xffff]C.uint)(C.malloc(C.size_t(8 * len(colorTable)))) defer C.free(unsafe.Pointer(colorTable_CArray)) for i := range colorTable { colorTable_CArray[i] = (C.uint)(colorTable[i]) } colorTable_ma := C.struct_miqt_array{len: C.size_t(len(colorTable)), data: unsafe.Pointer(colorTable_CArray)} - _goptr := newQImage(C.QImage_convertToFormat3(this.h, (C.int)(f), colorTable_ma, (C.int)(flags))) + _goptr := newQImage(C.QImage_convertToFormat4(this.h, (C.int)(f), colorTable_ma, (C.int)(flags))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -713,14 +713,14 @@ func (this *QImage) ConvertTo2(f QImage__Format, flags ImageConversionFlag) { C.QImage_convertTo2(this.h, (C.int)(f), (C.int)(flags)) } -func (this *QImage) CreateAlphaMask1(flags ImageConversionFlag) *QImage { - _goptr := newQImage(C.QImage_createAlphaMask1(this.h, (C.int)(flags))) +func (this *QImage) CreateAlphaMaskWithFlags(flags ImageConversionFlag) *QImage { + _goptr := newQImage(C.QImage_createAlphaMaskWithFlags(this.h, (C.int)(flags))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) CreateHeuristicMask1(clipTight bool) *QImage { - _goptr := newQImage(C.QImage_createHeuristicMask1(this.h, (C.bool)(clipTight))) +func (this *QImage) CreateHeuristicMaskWithClipTight(clipTight bool) *QImage { + _goptr := newQImage(C.QImage_createHeuristicMaskWithClipTight(this.h, (C.bool)(clipTight))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -731,26 +731,26 @@ func (this *QImage) CreateMaskFromColor2(color uint, mode MaskMode) *QImage { return _goptr } -func (this *QImage) Scaled3(w int, h int, aspectMode AspectRatioMode) *QImage { - _goptr := newQImage(C.QImage_scaled3(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode))) +func (this *QImage) Scaled2(w int, h int, aspectMode AspectRatioMode) *QImage { + _goptr := newQImage(C.QImage_scaled2(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) Scaled4(w int, h int, aspectMode AspectRatioMode, mode TransformationMode) *QImage { - _goptr := newQImage(C.QImage_scaled4(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode), (C.int)(mode))) +func (this *QImage) Scaled3(w int, h int, aspectMode AspectRatioMode, mode TransformationMode) *QImage { + _goptr := newQImage(C.QImage_scaled3(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) Scaled2(s *QSize, aspectMode AspectRatioMode) *QImage { - _goptr := newQImage(C.QImage_scaled2(this.h, s.cPointer(), (C.int)(aspectMode))) +func (this *QImage) Scaled4(s *QSize, aspectMode AspectRatioMode) *QImage { + _goptr := newQImage(C.QImage_scaled4(this.h, s.cPointer(), (C.int)(aspectMode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) Scaled32(s *QSize, aspectMode AspectRatioMode, mode TransformationMode) *QImage { - _goptr := newQImage(C.QImage_scaled32(this.h, s.cPointer(), (C.int)(aspectMode), (C.int)(mode))) +func (this *QImage) Scaled5(s *QSize, aspectMode AspectRatioMode, mode TransformationMode) *QImage { + _goptr := newQImage(C.QImage_scaled5(this.h, s.cPointer(), (C.int)(aspectMode), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -773,14 +773,14 @@ func (this *QImage) Transformed2(matrix *QMatrix, mode TransformationMode) *QIma return _goptr } -func (this *QImage) Transformed22(matrix *QTransform, mode TransformationMode) *QImage { - _goptr := newQImage(C.QImage_transformed22(this.h, matrix.cPointer(), (C.int)(mode))) +func (this *QImage) Transformed3(matrix *QTransform, mode TransformationMode) *QImage { + _goptr := newQImage(C.QImage_transformed3(this.h, matrix.cPointer(), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) Mirrored1(horizontally bool) *QImage { - _goptr := newQImage(C.QImage_mirrored1(this.h, (C.bool)(horizontally))) +func (this *QImage) MirroredWithHorizontally(horizontally bool) *QImage { + _goptr := newQImage(C.QImage_mirroredWithHorizontally(this.h, (C.bool)(horizontally))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -791,8 +791,8 @@ func (this *QImage) Mirrored2(horizontally bool, vertically bool) *QImage { return _goptr } -func (this *QImage) InvertPixels1(param1 QImage__InvertMode) { - C.QImage_invertPixels1(this.h, (C.int)(param1)) +func (this *QImage) InvertPixelsWithQImageInvertMode(param1 QImage__InvertMode) { + C.QImage_invertPixelsWithQImageInvertMode(this.h, (C.int)(param1)) } func (this *QImage) Load2(fileName string, format string) bool { @@ -805,13 +805,13 @@ func (this *QImage) Load2(fileName string, format string) bool { return (bool)(C.QImage_load2(this.h, fileName_ms, format_Cstring)) } -func (this *QImage) LoadFromData3(buf *byte, lenVal int, format string) bool { +func (this *QImage) LoadFromData2(buf *byte, lenVal int, format string) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QImage_loadFromData3(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.int)(lenVal), format_Cstring)) + return (bool)(C.QImage_loadFromData2(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.int)(lenVal), format_Cstring)) } -func (this *QImage) LoadFromData2(data []byte, aformat string) bool { +func (this *QImage) LoadFromData3(data []byte, aformat string) bool { data_alias := C.struct_miqt_string{} if len(data) > 0 { data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) @@ -821,7 +821,7 @@ func (this *QImage) LoadFromData2(data []byte, aformat string) bool { 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_alias, aformat_Cstring)) + return (bool)(C.QImage_loadFromData3(this.h, data_alias, aformat_Cstring)) } func (this *QImage) Save2(fileName string, format string) bool { @@ -844,27 +844,27 @@ func (this *QImage) Save3(fileName string, format string, quality int) bool { return (bool)(C.QImage_save3(this.h, fileName_ms, format_Cstring, (C.int)(quality))) } -func (this *QImage) Save22(device *QIODevice, format string) bool { +func (this *QImage) Save4(device *QIODevice, format string) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QImage_save22(this.h, device.cPointer(), format_Cstring)) + return (bool)(C.QImage_save4(this.h, device.cPointer(), format_Cstring)) } -func (this *QImage) Save32(device *QIODevice, format string, quality int) bool { +func (this *QImage) Save5(device *QIODevice, format string, quality int) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QImage_save32(this.h, device.cPointer(), format_Cstring, (C.int)(quality))) + return (bool)(C.QImage_save5(this.h, device.cPointer(), format_Cstring, (C.int)(quality))) } -func QImage_FromData3(data *byte, size int, format string) *QImage { +func QImage_FromData2(data *byte, size int, format string) *QImage { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - _goptr := newQImage(C.QImage_fromData3((*C.uchar)(unsafe.Pointer(data)), (C.int)(size), format_Cstring)) + _goptr := newQImage(C.QImage_fromData2((*C.uchar)(unsafe.Pointer(data)), (C.int)(size), format_Cstring)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QImage_FromData2(data []byte, format string) *QImage { +func QImage_FromData3(data []byte, format string) *QImage { data_alias := C.struct_miqt_string{} if len(data) > 0 { data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) @@ -874,17 +874,17 @@ func QImage_FromData2(data []byte, format string) *QImage { data_alias.len = C.size_t(len(data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - _goptr := newQImage(C.QImage_fromData2(data_alias, format_Cstring)) + _goptr := newQImage(C.QImage_fromData3(data_alias, format_Cstring)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) Text1(key string) string { +func (this *QImage) TextWithKey(key string) string { 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) + var _ms C.struct_miqt_string = C.QImage_textWithKey(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 e1a2f5f0..9bf8130b 100644 --- a/qt/gen_qimage.h +++ b/qt/gen_qimage.h @@ -160,34 +160,34 @@ QPixelFormat* QImage_pixelFormat(const QImage* self); QPixelFormat* QImage_toPixelFormat(int format); int QImage_toImageFormat(QPixelFormat* format); int QImage_metric(const QImage* self, int metric); -QImage* QImage_copy1(const QImage* self, QRect* rect); -QImage* QImage_convertToFormat22(const QImage* self, int f, int flags); -QImage* QImage_convertToFormat3(const QImage* self, int f, struct miqt_array /* of unsigned int */ colorTable, int flags); +QImage* QImage_copyWithRect(const QImage* self, QRect* rect); +QImage* QImage_convertToFormat3(const QImage* self, int f, int flags); +QImage* QImage_convertToFormat4(const QImage* self, int f, struct miqt_array /* of unsigned int */ colorTable, int flags); void QImage_convertTo2(QImage* self, int f, int flags); -QImage* QImage_createAlphaMask1(const QImage* self, int flags); -QImage* QImage_createHeuristicMask1(const QImage* self, bool clipTight); +QImage* QImage_createAlphaMaskWithFlags(const QImage* self, int flags); +QImage* QImage_createHeuristicMaskWithClipTight(const QImage* self, bool clipTight); QImage* QImage_createMaskFromColor2(const QImage* self, unsigned int color, int mode); -QImage* QImage_scaled3(const QImage* self, int w, int h, int aspectMode); -QImage* QImage_scaled4(const QImage* self, int w, int h, int aspectMode, int mode); -QImage* QImage_scaled2(const QImage* self, QSize* s, int aspectMode); -QImage* QImage_scaled32(const QImage* self, QSize* s, int aspectMode, int mode); +QImage* QImage_scaled2(const QImage* self, int w, int h, int aspectMode); +QImage* QImage_scaled3(const QImage* self, int w, int h, int aspectMode, int mode); +QImage* QImage_scaled4(const QImage* self, QSize* s, int aspectMode); +QImage* QImage_scaled5(const QImage* self, QSize* s, int aspectMode, int mode); QImage* QImage_scaledToWidth2(const QImage* self, int w, int mode); QImage* QImage_scaledToHeight2(const QImage* self, int h, int mode); QImage* QImage_transformed2(const QImage* self, QMatrix* matrix, int mode); -QImage* QImage_transformed22(const QImage* self, QTransform* matrix, int mode); -QImage* QImage_mirrored1(const QImage* self, bool horizontally); +QImage* QImage_transformed3(const QImage* self, QTransform* matrix, int mode); +QImage* QImage_mirroredWithHorizontally(const QImage* self, bool horizontally); QImage* QImage_mirrored2(const QImage* self, bool horizontally, bool vertically); -void QImage_invertPixels1(QImage* self, int param1); +void QImage_invertPixelsWithQImageInvertMode(QImage* self, int param1); bool QImage_load2(QImage* self, struct miqt_string fileName, const char* format); -bool QImage_loadFromData3(QImage* self, const unsigned char* buf, int len, const char* format); -bool QImage_loadFromData2(QImage* self, struct miqt_string data, const char* aformat); +bool QImage_loadFromData2(QImage* self, const unsigned char* buf, int len, const char* format); +bool QImage_loadFromData3(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(struct miqt_string data, const char* format); -struct miqt_string QImage_text1(const QImage* self, struct miqt_string key); +bool QImage_save4(const QImage* self, QIODevice* device, const char* format); +bool QImage_save5(const QImage* self, QIODevice* device, const char* format, int quality); +QImage* QImage_fromData2(const unsigned char* data, int size, const char* format); +QImage* QImage_fromData3(struct miqt_string data, const char* format); +struct miqt_string QImage_textWithKey(const QImage* self, struct miqt_string key); bool QImage_override_virtual_devType(void* self, intptr_t slot); int QImage_virtualbase_devType(const void* self); bool QImage_override_virtual_paintEngine(void* self, intptr_t slot); diff --git a/qt/gen_qinputdialog.cpp b/qt/gen_qinputdialog.cpp index b3da34fb..bdfad066 100644 --- a/qt/gen_qinputdialog.cpp +++ b/qt/gen_qinputdialog.cpp @@ -1578,7 +1578,7 @@ 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) { +struct miqt_string QInputDialog_getText2(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)); @@ -1591,7 +1591,7 @@ struct miqt_string QInputDialog_getText4(QWidget* parent, struct miqt_string tit return _ms; } -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_getText3(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); @@ -1605,7 +1605,7 @@ struct miqt_string QInputDialog_getText5(QWidget* parent, struct miqt_string tit 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) { +struct miqt_string QInputDialog_getText4(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); @@ -1619,7 +1619,7 @@ struct miqt_string QInputDialog_getText6(QWidget* parent, struct miqt_string tit 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) { +struct miqt_string QInputDialog_getText5(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); @@ -1633,7 +1633,7 @@ struct miqt_string QInputDialog_getText7(QWidget* parent, struct miqt_string tit 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) { +struct miqt_string QInputDialog_getText6(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); @@ -1647,7 +1647,7 @@ struct miqt_string QInputDialog_getText8(QWidget* parent, struct miqt_string tit return _ms; } -struct miqt_string QInputDialog_getMultiLineText4(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text) { +struct miqt_string QInputDialog_getMultiLineText2(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); @@ -1661,7 +1661,7 @@ struct miqt_string QInputDialog_getMultiLineText4(QWidget* parent, struct miqt_s return _ms; } -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_getMultiLineText3(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); @@ -1675,7 +1675,7 @@ struct miqt_string QInputDialog_getMultiLineText5(QWidget* parent, struct miqt_s 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) { +struct miqt_string QInputDialog_getMultiLineText4(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); @@ -1689,7 +1689,7 @@ struct miqt_string QInputDialog_getMultiLineText6(QWidget* parent, struct miqt_s 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) { +struct miqt_string QInputDialog_getMultiLineText5(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); @@ -1703,7 +1703,7 @@ struct miqt_string QInputDialog_getMultiLineText7(QWidget* parent, struct miqt_s 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) { +struct miqt_string QInputDialog_getItem2(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; @@ -1723,7 +1723,7 @@ struct miqt_string QInputDialog_getItem5(QWidget* parent, struct miqt_string tit 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) { +struct miqt_string QInputDialog_getItem3(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; @@ -1743,7 +1743,7 @@ struct miqt_string QInputDialog_getItem6(QWidget* parent, struct miqt_string tit 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) { +struct miqt_string QInputDialog_getItem4(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; @@ -1763,7 +1763,7 @@ struct miqt_string QInputDialog_getItem7(QWidget* parent, struct miqt_string tit 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) { +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, 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; @@ -1783,7 +1783,7 @@ struct miqt_string QInputDialog_getItem8(QWidget* parent, struct miqt_string tit 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) { +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, 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; @@ -1803,73 +1803,73 @@ struct miqt_string QInputDialog_getItem9(QWidget* parent, struct miqt_string tit return _ms; } -int QInputDialog_getInt4(QWidget* parent, struct miqt_string title, struct miqt_string label, int value) { +int QInputDialog_getInt2(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) { +int QInputDialog_getInt3(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) { +int QInputDialog_getInt4(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) { +int QInputDialog_getInt5(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) { +int QInputDialog_getInt6(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) { +int QInputDialog_getInt7(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) { +double QInputDialog_getDouble3(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) { +double QInputDialog_getDouble4(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) { +double QInputDialog_getDouble5(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) { +double QInputDialog_getDouble6(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) { +double QInputDialog_getDouble7(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) { +double QInputDialog_getDouble8(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 75552388..15d13119 100644 --- a/qt/gen_qinputdialog.go +++ b/qt/gen_qinputdialog.go @@ -612,7 +612,7 @@ func (this *QInputDialog) SetOption2(option QInputDialog__InputDialogOption, on C.QInputDialog_setOption2(this.h, (C.int)(option), (C.bool)(on)) } -func QInputDialog_GetText4(parent *QWidget, title string, label string, echo QLineEdit__EchoMode) string { +func QInputDialog_GetText2(parent *QWidget, title string, label string, echo QLineEdit__EchoMode) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -621,13 +621,13 @@ func QInputDialog_GetText4(parent *QWidget, title string, label string, echo QLi 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)) + var _ms C.struct_miqt_string = C.QInputDialog_getText2(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 { +func QInputDialog_GetText3(parent *QWidget, title string, label string, echo QLineEdit__EchoMode, text string) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -640,13 +640,13 @@ func QInputDialog_GetText5(parent *QWidget, title string, label string, echo QLi 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) + var _ms C.struct_miqt_string = C.QInputDialog_getText3(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 { +func QInputDialog_GetText4(parent *QWidget, title string, label string, echo QLineEdit__EchoMode, text string, ok *bool) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -659,13 +659,13 @@ func QInputDialog_GetText6(parent *QWidget, title string, label string, echo QLi 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))) + var _ms C.struct_miqt_string = C.QInputDialog_getText4(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 { +func QInputDialog_GetText5(parent *QWidget, title string, label string, echo QLineEdit__EchoMode, text string, ok *bool, flags WindowType) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -678,13 +678,13 @@ func QInputDialog_GetText7(parent *QWidget, title string, label string, echo QLi 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)) + var _ms C.struct_miqt_string = C.QInputDialog_getText5(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 { +func QInputDialog_GetText6(parent *QWidget, title string, label string, echo QLineEdit__EchoMode, text string, ok *bool, flags WindowType, inputMethodHints InputMethodHint) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -697,13 +697,13 @@ func QInputDialog_GetText8(parent *QWidget, title string, label string, echo QLi 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)) + 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)), (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 { +func QInputDialog_GetMultiLineText2(parent *QWidget, title string, label string, text string) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -716,13 +716,13 @@ func QInputDialog_GetMultiLineText4(parent *QWidget, title string, label 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) + var _ms C.struct_miqt_string = C.QInputDialog_getMultiLineText2(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 { +func QInputDialog_GetMultiLineText3(parent *QWidget, title string, label string, text string, ok *bool) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -735,13 +735,13 @@ func QInputDialog_GetMultiLineText5(parent *QWidget, title string, label 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))) + var _ms C.struct_miqt_string = C.QInputDialog_getMultiLineText3(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 { +func QInputDialog_GetMultiLineText4(parent *QWidget, title string, label string, text string, ok *bool, flags WindowType) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -754,13 +754,13 @@ func QInputDialog_GetMultiLineText6(parent *QWidget, title string, label 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)) + var _ms C.struct_miqt_string = C.QInputDialog_getMultiLineText4(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 { +func QInputDialog_GetMultiLineText5(parent *QWidget, title string, label string, text string, ok *bool, flags WindowType, inputMethodHints InputMethodHint) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -773,13 +773,13 @@ func QInputDialog_GetMultiLineText7(parent *QWidget, title string, label 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)) + var _ms C.struct_miqt_string = C.QInputDialog_getMultiLineText5(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 { +func QInputDialog_GetItem2(parent *QWidget, title string, label string, items []string, current int) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -798,13 +798,13 @@ func QInputDialog_GetItem5(parent *QWidget, title string, label string, items [] items_CArray[i] = items_i_ms } items_ma := C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} - var _ms C.struct_miqt_string = C.QInputDialog_getItem5(parent.cPointer(), title_ms, label_ms, items_ma, (C.int)(current)) + var _ms C.struct_miqt_string = C.QInputDialog_getItem2(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 { +func QInputDialog_GetItem3(parent *QWidget, title string, label string, items []string, current int, editable bool) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -823,13 +823,13 @@ func QInputDialog_GetItem6(parent *QWidget, title string, label string, items [] items_CArray[i] = items_i_ms } items_ma := C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} - var _ms C.struct_miqt_string = C.QInputDialog_getItem6(parent.cPointer(), title_ms, label_ms, items_ma, (C.int)(current), (C.bool)(editable)) + var _ms C.struct_miqt_string = C.QInputDialog_getItem3(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 { +func QInputDialog_GetItem4(parent *QWidget, title string, label string, items []string, current int, editable bool, ok *bool) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -848,13 +848,13 @@ func QInputDialog_GetItem7(parent *QWidget, title string, label string, items [] items_CArray[i] = items_i_ms } items_ma := C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} - 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))) + var _ms C.struct_miqt_string = C.QInputDialog_getItem4(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 { +func QInputDialog_GetItem5(parent *QWidget, title string, label string, items []string, current int, editable bool, ok *bool, flags WindowType) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -873,13 +873,13 @@ func QInputDialog_GetItem8(parent *QWidget, title string, label string, items [] items_CArray[i] = items_i_ms } items_ma := C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} - 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)) + var _ms C.struct_miqt_string = C.QInputDialog_getItem5(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 { +func QInputDialog_GetItem6(parent *QWidget, title string, label string, items []string, current int, editable bool, ok *bool, flags WindowType, inputMethodHints InputMethodHint) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -898,13 +898,13 @@ func QInputDialog_GetItem9(parent *QWidget, title string, label string, items [] items_CArray[i] = items_i_ms } items_ma := C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} - 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)) + var _ms C.struct_miqt_string = C.QInputDialog_getItem6(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 { +func QInputDialog_GetInt2(parent *QWidget, title string, label string, value int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -913,10 +913,10 @@ func QInputDialog_GetInt4(parent *QWidget, title string, label string, value int 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))) + return (int)(C.QInputDialog_getInt2(parent.cPointer(), title_ms, label_ms, (C.int)(value))) } -func QInputDialog_GetInt5(parent *QWidget, title string, label string, value int, minValue int) int { +func QInputDialog_GetInt3(parent *QWidget, title string, label string, value int, minValue int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -925,10 +925,10 @@ func QInputDialog_GetInt5(parent *QWidget, title string, label string, value int 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))) + return (int)(C.QInputDialog_getInt3(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 { +func QInputDialog_GetInt4(parent *QWidget, title string, label string, value int, minValue int, maxValue int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -937,10 +937,10 @@ func QInputDialog_GetInt6(parent *QWidget, title string, label string, value int 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))) + return (int)(C.QInputDialog_getInt4(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 { +func QInputDialog_GetInt5(parent *QWidget, title string, label string, value int, minValue int, maxValue int, step int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -949,10 +949,10 @@ func QInputDialog_GetInt7(parent *QWidget, title string, label string, value int 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))) + return (int)(C.QInputDialog_getInt5(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 { +func QInputDialog_GetInt6(parent *QWidget, title string, label string, value int, minValue int, maxValue int, step int, ok *bool) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -961,10 +961,10 @@ func QInputDialog_GetInt8(parent *QWidget, title string, label string, value int 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)))) + return (int)(C.QInputDialog_getInt6(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 { +func QInputDialog_GetInt7(parent *QWidget, title string, label string, value int, minValue int, maxValue int, step int, ok *bool, flags WindowType) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -973,10 +973,10 @@ func QInputDialog_GetInt9(parent *QWidget, title string, label string, value int 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))) + return (int)(C.QInputDialog_getInt7(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 { +func QInputDialog_GetDouble3(parent *QWidget, title string, label string, value float64) float64 { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -985,10 +985,10 @@ func QInputDialog_GetDouble4(parent *QWidget, title string, label string, value 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))) + return (float64)(C.QInputDialog_getDouble3(parent.cPointer(), title_ms, label_ms, (C.double)(value))) } -func QInputDialog_GetDouble5(parent *QWidget, title string, label string, value float64, minValue float64) float64 { +func QInputDialog_GetDouble4(parent *QWidget, title string, label string, value float64, minValue float64) float64 { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -997,10 +997,10 @@ func QInputDialog_GetDouble5(parent *QWidget, title string, label string, value 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))) + return (float64)(C.QInputDialog_getDouble4(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 { +func QInputDialog_GetDouble5(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64) float64 { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1009,10 +1009,10 @@ func QInputDialog_GetDouble6(parent *QWidget, title string, label string, value 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))) + return (float64)(C.QInputDialog_getDouble5(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 { +func QInputDialog_GetDouble6(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int) float64 { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1021,10 +1021,10 @@ func QInputDialog_GetDouble7(parent *QWidget, title string, label string, value 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))) + return (float64)(C.QInputDialog_getDouble6(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 { +func QInputDialog_GetDouble7(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int, ok *bool) float64 { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1033,10 +1033,10 @@ func QInputDialog_GetDouble8(parent *QWidget, title string, label string, value 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)))) + return (float64)(C.QInputDialog_getDouble7(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 { +func QInputDialog_GetDouble8(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int, ok *bool, flags WindowType) float64 { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1045,7 +1045,7 @@ func QInputDialog_GetDouble9(parent *QWidget, title string, label string, value 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))) + 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)), (C.int)(flags))) } // AdjustPosition can only be called from a QInputDialog that was directly constructed. diff --git a/qt/gen_qinputdialog.h b/qt/gen_qinputdialog.h index 831141bb..51a41440 100644 --- a/qt/gen_qinputdialog.h +++ b/qt/gen_qinputdialog.h @@ -159,32 +159,32 @@ 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_getText2(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo); +struct miqt_string QInputDialog_getText3(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text); +struct miqt_string QInputDialog_getText4(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text, bool* ok); +struct miqt_string QInputDialog_getText5(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text, bool* ok, int flags); +struct miqt_string QInputDialog_getText6(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_getMultiLineText2(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text); +struct miqt_string QInputDialog_getMultiLineText3(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text, bool* ok); +struct miqt_string QInputDialog_getMultiLineText4(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text, bool* ok, int flags); +struct miqt_string QInputDialog_getMultiLineText5(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text, bool* ok, int flags, int inputMethodHints); +struct miqt_string QInputDialog_getItem2(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array /* of struct miqt_string */ items, int current); +struct miqt_string QInputDialog_getItem3(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_getItem4(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_getItem5(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_getItem6(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_getInt2(QWidget* parent, struct miqt_string title, struct miqt_string label, int value); +int QInputDialog_getInt3(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue); +int QInputDialog_getInt4(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue); +int QInputDialog_getInt5(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue, int step); +int QInputDialog_getInt6(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue, int step, bool* ok); +int QInputDialog_getInt7(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue, int step, bool* ok, int flags); +double QInputDialog_getDouble3(QWidget* parent, struct miqt_string title, struct miqt_string label, double value); +double QInputDialog_getDouble4(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue); +double QInputDialog_getDouble5(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue); +double QInputDialog_getDouble6(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals); +double QInputDialog_getDouble7(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals, bool* ok); +double QInputDialog_getDouble8(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags); bool QInputDialog_override_virtual_minimumSizeHint(void* self, intptr_t slot); QSize* QInputDialog_virtualbase_minimumSizeHint(const void* self); bool QInputDialog_override_virtual_sizeHint(void* self, intptr_t slot); diff --git a/qt/gen_qiodevice.cpp b/qt/gen_qiodevice.cpp index b6f3501a..5097f324 100644 --- a/qt/gen_qiodevice.cpp +++ b/qt/gen_qiodevice.cpp @@ -854,7 +854,7 @@ struct miqt_string QIODevice_trUtf83(const char* s, const char* c, int n) { return _ms; } -struct miqt_string QIODevice_readLine1(QIODevice* self, long long maxlen) { +struct miqt_string QIODevice_readLineWithMaxlen(QIODevice* self, long long maxlen) { QByteArray _qb = self->readLine(static_cast(maxlen)); struct miqt_string _ms; _ms.len = _qb.length(); diff --git a/qt/gen_qiodevice.go b/qt/gen_qiodevice.go index 9330854e..783b187e 100644 --- a/qt/gen_qiodevice.go +++ b/qt/gen_qiodevice.go @@ -472,8 +472,8 @@ func QIODevice_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QIODevice) ReadLine1(maxlen int64) []byte { - var _bytearray C.struct_miqt_string = C.QIODevice_readLine1(this.h, (C.longlong)(maxlen)) +func (this *QIODevice) ReadLineWithMaxlen(maxlen int64) []byte { + var _bytearray C.struct_miqt_string = C.QIODevice_readLineWithMaxlen(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 diff --git a/qt/gen_qiodevice.h b/qt/gen_qiodevice.h index d189fe3f..88b5d9a4 100644 --- a/qt/gen_qiodevice.h +++ b/qt/gen_qiodevice.h @@ -102,7 +102,7 @@ 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); +struct miqt_string QIODevice_readLineWithMaxlen(QIODevice* self, long long maxlen); bool QIODevice_override_virtual_isSequential(void* self, intptr_t slot); bool QIODevice_virtualbase_isSequential(const void* self); bool QIODevice_override_virtual_open(void* self, intptr_t slot); diff --git a/qt/gen_qitemdelegate.cpp b/qt/gen_qitemdelegate.cpp index 7088a3e6..1c4895d8 100644 --- a/qt/gen_qitemdelegate.cpp +++ b/qt/gen_qitemdelegate.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -23,6 +22,7 @@ #include #include #include +#include #include #include #include "gen_qitemdelegate.h" diff --git a/qt/gen_qitemselectionmodel.cpp b/qt/gen_qitemselectionmodel.cpp index 4403f27a..92fe4b3a 100644 --- a/qt/gen_qitemselectionmodel.cpp +++ b/qt/gen_qitemselectionmodel.cpp @@ -732,7 +732,7 @@ bool QItemSelectionModel_columnIntersectsSelection2(const QItemSelectionModel* s return self->columnIntersectsSelection(static_cast(column), *parent); } -struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedRows1(const QItemSelectionModel* self, int column) { +struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedRowsWithColumn(const QItemSelectionModel* self, int column) { QModelIndexList _ret = self->selectedRows(static_cast(column)); // Convert QList<> from C++ memory to manually-managed C memory QModelIndex** _arr = static_cast(malloc(sizeof(QModelIndex*) * _ret.length())); @@ -745,7 +745,7 @@ struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedRows1(const return _out; } -struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedColumns1(const QItemSelectionModel* self, int row) { +struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedColumnsWithRow(const QItemSelectionModel* self, int row) { QModelIndexList _ret = self->selectedColumns(static_cast(row)); // Convert QList<> from C++ memory to manually-managed C memory QModelIndex** _arr = static_cast(malloc(sizeof(QModelIndex*) * _ret.length())); diff --git a/qt/gen_qitemselectionmodel.go b/qt/gen_qitemselectionmodel.go index 1d42aef0..0c4308b2 100644 --- a/qt/gen_qitemselectionmodel.go +++ b/qt/gen_qitemselectionmodel.go @@ -562,8 +562,8 @@ func (this *QItemSelectionModel) ColumnIntersectsSelection2(column int, parent * return (bool)(C.QItemSelectionModel_columnIntersectsSelection2(this.h, (C.int)(column), parent.cPointer())) } -func (this *QItemSelectionModel) SelectedRows1(column int) []QModelIndex { - var _ma C.struct_miqt_array = C.QItemSelectionModel_selectedRows1(this.h, (C.int)(column)) +func (this *QItemSelectionModel) SelectedRowsWithColumn(column int) []QModelIndex { + var _ma C.struct_miqt_array = C.QItemSelectionModel_selectedRowsWithColumn(this.h, (C.int)(column)) _ret := make([]QModelIndex, int(_ma.len)) _outCast := (*[0xffff]*C.QModelIndex)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -574,8 +574,8 @@ func (this *QItemSelectionModel) SelectedRows1(column int) []QModelIndex { return _ret } -func (this *QItemSelectionModel) SelectedColumns1(row int) []QModelIndex { - var _ma C.struct_miqt_array = C.QItemSelectionModel_selectedColumns1(this.h, (C.int)(row)) +func (this *QItemSelectionModel) SelectedColumnsWithRow(row int) []QModelIndex { + var _ma C.struct_miqt_array = C.QItemSelectionModel_selectedColumnsWithRow(this.h, (C.int)(row)) _ret := make([]QModelIndex, int(_ma.len)) _outCast := (*[0xffff]*C.QModelIndex)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qitemselectionmodel.h b/qt/gen_qitemselectionmodel.h index 9b4e4376..dbfbc39e 100644 --- a/qt/gen_qitemselectionmodel.h +++ b/qt/gen_qitemselectionmodel.h @@ -117,8 +117,8 @@ bool QItemSelectionModel_isRowSelected2(const QItemSelectionModel* self, int row bool QItemSelectionModel_isColumnSelected2(const QItemSelectionModel* self, int column, QModelIndex* parent); bool QItemSelectionModel_rowIntersectsSelection2(const QItemSelectionModel* self, int row, QModelIndex* parent); bool QItemSelectionModel_columnIntersectsSelection2(const QItemSelectionModel* self, int column, QModelIndex* parent); -struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedRows1(const QItemSelectionModel* self, int column); -struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedColumns1(const QItemSelectionModel* self, int row); +struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedRowsWithColumn(const QItemSelectionModel* self, int column); +struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedColumnsWithRow(const QItemSelectionModel* self, int row); bool QItemSelectionModel_override_virtual_setCurrentIndex(void* self, intptr_t slot); void QItemSelectionModel_virtualbase_setCurrentIndex(void* self, QModelIndex* index, int command); bool QItemSelectionModel_override_virtual_select(void* self, intptr_t slot); diff --git a/qt/gen_qjsonarray.cpp b/qt/gen_qjsonarray.cpp index 41225b2d..5da2c7e0 100644 --- a/qt/gen_qjsonarray.cpp +++ b/qt/gen_qjsonarray.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include "gen_qjsonarray.h" @@ -43,6 +44,29 @@ QJsonArray* QJsonArray_fromStringList(struct miqt_array /* of struct miqt_string return new QJsonArray(QJsonArray::fromStringList(list_QList)); } +QJsonArray* QJsonArray_fromVariantList(struct miqt_array /* of QVariant* */ list) { + QVariantList list_QList; + list_QList.reserve(list.len); + QVariant** list_arr = static_cast(list.data); + for(size_t i = 0; i < list.len; ++i) { + list_QList.push_back(*(list_arr[i])); + } + return new QJsonArray(QJsonArray::fromVariantList(list_QList)); +} + +struct miqt_array /* of QVariant* */ QJsonArray_toVariantList(const QJsonArray* self) { + QVariantList _ret = self->toVariantList(); + // Convert QList<> from C++ memory to manually-managed C memory + QVariant** _arr = static_cast(malloc(sizeof(QVariant*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = new QVariant(_ret[i]); + } + struct miqt_array _out; + _out.len = _ret.length(); + _out.data = static_cast(_arr); + return _out; +} + int QJsonArray_size(const QJsonArray* self) { return self->size(); } diff --git a/qt/gen_qjsonarray.go b/qt/gen_qjsonarray.go index 5de9eb2a..dbc3b07c 100644 --- a/qt/gen_qjsonarray.go +++ b/qt/gen_qjsonarray.go @@ -77,6 +77,30 @@ func QJsonArray_FromStringList(list []string) *QJsonArray { return _goptr } +func QJsonArray_FromVariantList(list []QVariant) *QJsonArray { + list_CArray := (*[0xffff]*C.QVariant)(C.malloc(C.size_t(8 * len(list)))) + defer C.free(unsafe.Pointer(list_CArray)) + for i := range list { + list_CArray[i] = list[i].cPointer() + } + list_ma := C.struct_miqt_array{len: C.size_t(len(list)), data: unsafe.Pointer(list_CArray)} + _goptr := newQJsonArray(C.QJsonArray_fromVariantList(list_ma)) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QJsonArray) ToVariantList() []QVariant { + var _ma C.struct_miqt_array = C.QJsonArray_toVariantList(this.h) + _ret := make([]QVariant, int(_ma.len)) + _outCast := (*[0xffff]*C.QVariant)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _lv_goptr := newQVariant(_outCast[i]) + _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + _ret[i] = *_lv_goptr + } + return _ret +} + func (this *QJsonArray) Size() int { return (int)(C.QJsonArray_size(this.h)) } diff --git a/qt/gen_qjsonarray.h b/qt/gen_qjsonarray.h index 75acb221..9c5880d7 100644 --- a/qt/gen_qjsonarray.h +++ b/qt/gen_qjsonarray.h @@ -30,6 +30,7 @@ class QJsonValue; class QJsonValuePtr; class QJsonValueRef; class QJsonValueRefPtr; +class QVariant; #else typedef struct QJsonArray QJsonArray; typedef struct QJsonArray__const_iterator QJsonArray__const_iterator; @@ -38,12 +39,15 @@ typedef struct QJsonValue QJsonValue; typedef struct QJsonValuePtr QJsonValuePtr; typedef struct QJsonValueRef QJsonValueRef; typedef struct QJsonValueRefPtr QJsonValueRefPtr; +typedef struct QVariant QVariant; #endif 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_fromVariantList(struct miqt_array /* of QVariant* */ list); +struct miqt_array /* of QVariant* */ QJsonArray_toVariantList(const QJsonArray* self); 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 4d376202..84476841 100644 --- a/qt/gen_qjsondocument.cpp +++ b/qt/gen_qjsondocument.cpp @@ -160,7 +160,7 @@ bool QJsonDocument_isNull(const QJsonDocument* self) { return self->isNull(); } -QJsonDocument* QJsonDocument_fromRawData3(const char* data, int size, int validation) { +QJsonDocument* QJsonDocument_fromRawData2(const char* data, int size, int validation) { return new QJsonDocument(QJsonDocument::fromRawData(data, static_cast(size), static_cast(validation))); } diff --git a/qt/gen_qjsondocument.go b/qt/gen_qjsondocument.go index e1fdc4e5..7603a6b5 100644 --- a/qt/gen_qjsondocument.go +++ b/qt/gen_qjsondocument.go @@ -296,10 +296,10 @@ func (this *QJsonDocument) IsNull() bool { return (bool)(C.QJsonDocument_isNull(this.h)) } -func QJsonDocument_FromRawData3(data string, size int, validation QJsonDocument__DataValidation) *QJsonDocument { +func QJsonDocument_FromRawData2(data string, size int, validation QJsonDocument__DataValidation) *QJsonDocument { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - _goptr := newQJsonDocument(C.QJsonDocument_fromRawData3(data_Cstring, (C.int)(size), (C.int)(validation))) + _goptr := newQJsonDocument(C.QJsonDocument_fromRawData2(data_Cstring, (C.int)(size), (C.int)(validation))) _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 cd590f75..cbe5b4dd 100644 --- a/qt/gen_qjsondocument.h +++ b/qt/gen_qjsondocument.h @@ -60,7 +60,7 @@ QJsonValue* QJsonDocument_operatorSubscriptWithInt(const QJsonDocument* self, in 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_fromRawData2(const char* data, int size, int validation); QJsonDocument* QJsonDocument_fromBinaryData2(struct miqt_string data, int validation); QJsonDocument* QJsonDocument_fromJson2(struct miqt_string json, QJsonParseError* error); void QJsonDocument_delete(QJsonDocument* self); diff --git a/qt/gen_qjsonobject.cpp b/qt/gen_qjsonobject.cpp index a7d7980c..9c619f2c 100644 --- a/qt/gen_qjsonobject.cpp +++ b/qt/gen_qjsonobject.cpp @@ -1,3 +1,4 @@ +#include #include #define WORKAROUND_INNER_CLASS_DEFINITION_QJsonObject__const_iterator #define WORKAROUND_INNER_CLASS_DEFINITION_QJsonObject__iterator diff --git a/qt/gen_qjsonvalue.cpp b/qt/gen_qjsonvalue.cpp index 7992e20b..01199712 100644 --- a/qt/gen_qjsonvalue.cpp +++ b/qt/gen_qjsonvalue.cpp @@ -181,15 +181,15 @@ bool QJsonValue_operatorNotEqual(const QJsonValue* self, QJsonValue* other) { return (*self != *other); } -bool QJsonValue_toBool1(const QJsonValue* self, bool defaultValue) { +bool QJsonValue_toBoolWithDefaultValue(const QJsonValue* self, bool defaultValue) { return self->toBool(defaultValue); } -int QJsonValue_toInt1(const QJsonValue* self, int defaultValue) { +int QJsonValue_toIntWithDefaultValue(const QJsonValue* self, int defaultValue) { return self->toInt(static_cast(defaultValue)); } -double QJsonValue_toDouble1(const QJsonValue* self, double defaultValue) { +double QJsonValue_toDoubleWithDefaultValue(const QJsonValue* self, double defaultValue) { return self->toDouble(static_cast(defaultValue)); } diff --git a/qt/gen_qjsonvalue.go b/qt/gen_qjsonvalue.go index 8d93469d..061f046e 100644 --- a/qt/gen_qjsonvalue.go +++ b/qt/gen_qjsonvalue.go @@ -259,16 +259,16 @@ func (this *QJsonValue) OperatorNotEqual(other *QJsonValue) bool { return (bool)(C.QJsonValue_operatorNotEqual(this.h, other.cPointer())) } -func (this *QJsonValue) ToBool1(defaultValue bool) bool { - return (bool)(C.QJsonValue_toBool1(this.h, (C.bool)(defaultValue))) +func (this *QJsonValue) ToBoolWithDefaultValue(defaultValue bool) bool { + return (bool)(C.QJsonValue_toBoolWithDefaultValue(this.h, (C.bool)(defaultValue))) } -func (this *QJsonValue) ToInt1(defaultValue int) int { - return (int)(C.QJsonValue_toInt1(this.h, (C.int)(defaultValue))) +func (this *QJsonValue) ToIntWithDefaultValue(defaultValue int) int { + return (int)(C.QJsonValue_toIntWithDefaultValue(this.h, (C.int)(defaultValue))) } -func (this *QJsonValue) ToDouble1(defaultValue float64) float64 { - return (float64)(C.QJsonValue_toDouble1(this.h, (C.double)(defaultValue))) +func (this *QJsonValue) ToDoubleWithDefaultValue(defaultValue float64) float64 { + return (float64)(C.QJsonValue_toDoubleWithDefaultValue(this.h, (C.double)(defaultValue))) } // Delete this object from C++ memory. diff --git a/qt/gen_qjsonvalue.h b/qt/gen_qjsonvalue.h index f2f3d64f..19c05d02 100644 --- a/qt/gen_qjsonvalue.h +++ b/qt/gen_qjsonvalue.h @@ -68,9 +68,9 @@ QJsonValue* QJsonValue_operatorSubscript(const QJsonValue* self, struct miqt_str QJsonValue* QJsonValue_operatorSubscriptWithInt(const QJsonValue* self, int i); bool QJsonValue_operatorEqual(const QJsonValue* self, QJsonValue* other); bool QJsonValue_operatorNotEqual(const QJsonValue* self, QJsonValue* other); -bool QJsonValue_toBool1(const QJsonValue* self, bool defaultValue); -int QJsonValue_toInt1(const QJsonValue* self, int defaultValue); -double QJsonValue_toDouble1(const QJsonValue* self, double defaultValue); +bool QJsonValue_toBoolWithDefaultValue(const QJsonValue* self, bool defaultValue); +int QJsonValue_toIntWithDefaultValue(const QJsonValue* self, int defaultValue); +double QJsonValue_toDoubleWithDefaultValue(const QJsonValue* self, double defaultValue); void QJsonValue_delete(QJsonValue* self); QJsonValueRef* QJsonValueRef_new(QJsonValueRef* param1); diff --git a/qt/gen_qkeysequence.cpp b/qt/gen_qkeysequence.cpp index 00e51d32..b9f126d5 100644 --- a/qt/gen_qkeysequence.cpp +++ b/qt/gen_qkeysequence.cpp @@ -175,7 +175,7 @@ bool QKeySequence_isDetached(const QKeySequence* self) { return self->isDetached(); } -struct miqt_string QKeySequence_toString1(const QKeySequence* self, int format) { +struct miqt_string QKeySequence_toStringWithFormat(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(); diff --git a/qt/gen_qkeysequence.go b/qt/gen_qkeysequence.go index f34117c9..ec60db53 100644 --- a/qt/gen_qkeysequence.go +++ b/qt/gen_qkeysequence.go @@ -324,8 +324,8 @@ func (this *QKeySequence) IsDetached() bool { return (bool)(C.QKeySequence_isDetached(this.h)) } -func (this *QKeySequence) ToString1(format QKeySequence__SequenceFormat) string { - var _ms C.struct_miqt_string = C.QKeySequence_toString1(this.h, (C.int)(format)) +func (this *QKeySequence) ToStringWithFormat(format QKeySequence__SequenceFormat) string { + var _ms C.struct_miqt_string = C.QKeySequence_toStringWithFormat(this.h, (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 954d95f6..24aa79ec 100644 --- a/qt/gen_qkeysequence.h +++ b/qt/gen_qkeysequence.h @@ -51,7 +51,7 @@ 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); +struct miqt_string QKeySequence_toStringWithFormat(const QKeySequence* self, int format); QKeySequence* QKeySequence_fromString2(struct miqt_string str, int format); struct miqt_array /* of QKeySequence* */ QKeySequence_listFromString2(struct miqt_string str, int format); struct miqt_string QKeySequence_listToString2(struct miqt_array /* of QKeySequence* */ list, int format); diff --git a/qt/gen_qlayout.cpp b/qt/gen_qlayout.cpp index 33511377..924b3ed4 100644 --- a/qt/gen_qlayout.cpp +++ b/qt/gen_qlayout.cpp @@ -815,7 +815,7 @@ struct miqt_string QLayout_trUtf83(const char* s, const char* c, int n) { return _ms; } -QLayoutItem* QLayout_replaceWidget3(QLayout* self, QWidget* from, QWidget* to, int options) { +QLayoutItem* QLayout_replaceWidget2(QLayout* self, QWidget* from, QWidget* to, int options) { return self->replaceWidget(from, to, static_cast(options)); } diff --git a/qt/gen_qlayout.go b/qt/gen_qlayout.go index 5fa7b135..5731d7f5 100644 --- a/qt/gen_qlayout.go +++ b/qt/gen_qlayout.go @@ -342,8 +342,8 @@ func QLayout_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QLayout) ReplaceWidget3(from *QWidget, to *QWidget, options FindChildOption) *QLayoutItem { - return newQLayoutItem(C.QLayout_replaceWidget3(this.h, from.cPointer(), to.cPointer(), (C.int)(options))) +func (this *QLayout) ReplaceWidget2(from *QWidget, to *QWidget, options FindChildOption) *QLayoutItem { + return newQLayoutItem(C.QLayout_replaceWidget2(this.h, from.cPointer(), to.cPointer(), (C.int)(options))) } // WidgetEvent can only be called from a QLayout that was directly constructed. diff --git a/qt/gen_qlayout.h b/qt/gen_qlayout.h index 5c24ace5..ffa63a82 100644 --- a/qt/gen_qlayout.h +++ b/qt/gen_qlayout.h @@ -100,7 +100,7 @@ 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); +QLayoutItem* QLayout_replaceWidget2(QLayout* self, QWidget* from, QWidget* to, int options); bool QLayout_override_virtual_invalidate(void* self, intptr_t slot); void QLayout_virtualbase_invalidate(void* self); bool QLayout_override_virtual_geometry(void* self, intptr_t slot); diff --git a/qt/gen_qlayoutitem.cpp b/qt/gen_qlayoutitem.cpp index 56923a78..42eefe76 100644 --- a/qt/gen_qlayoutitem.cpp +++ b/qt/gen_qlayoutitem.cpp @@ -957,11 +957,11 @@ QSizePolicy* QSpacerItem_sizePolicy(const QSpacerItem* self) { return new QSizePolicy(self->sizePolicy()); } -void QSpacerItem_changeSize3(QSpacerItem* self, int w, int h, int hData) { +void QSpacerItem_changeSize2(QSpacerItem* self, int w, int h, int hData) { self->changeSize(static_cast(w), static_cast(h), static_cast(hData)); } -void QSpacerItem_changeSize4(QSpacerItem* self, int w, int h, int hData, int vData) { +void QSpacerItem_changeSize3(QSpacerItem* self, int w, int h, int hData, int vData) { self->changeSize(static_cast(w), static_cast(h), static_cast(hData), static_cast(vData)); } diff --git a/qt/gen_qlayoutitem.go b/qt/gen_qlayoutitem.go index 98f7c6f6..2b2d678e 100644 --- a/qt/gen_qlayoutitem.go +++ b/qt/gen_qlayoutitem.go @@ -602,12 +602,12 @@ func (this *QSpacerItem) SizePolicy() *QSizePolicy { return _goptr } -func (this *QSpacerItem) ChangeSize3(w int, h int, hData QSizePolicy__Policy) { - C.QSpacerItem_changeSize3(this.h, (C.int)(w), (C.int)(h), (C.int)(hData)) +func (this *QSpacerItem) ChangeSize2(w int, h int, hData QSizePolicy__Policy) { + C.QSpacerItem_changeSize2(this.h, (C.int)(w), (C.int)(h), (C.int)(hData)) } -func (this *QSpacerItem) ChangeSize4(w int, h int, hData QSizePolicy__Policy, vData QSizePolicy__Policy) { - C.QSpacerItem_changeSize4(this.h, (C.int)(w), (C.int)(h), (C.int)(hData), (C.int)(vData)) +func (this *QSpacerItem) ChangeSize3(w int, h int, hData QSizePolicy__Policy, vData QSizePolicy__Policy) { + C.QSpacerItem_changeSize3(this.h, (C.int)(w), (C.int)(h), (C.int)(hData), (C.int)(vData)) } func (this *QSpacerItem) callVirtualBase_SizeHint() *QSize { diff --git a/qt/gen_qlayoutitem.h b/qt/gen_qlayoutitem.h index ebbe06fe..15b83cfb 100644 --- a/qt/gen_qlayoutitem.h +++ b/qt/gen_qlayoutitem.h @@ -103,8 +103,8 @@ void QSpacerItem_setGeometry(QSpacerItem* self, QRect* geometry); QRect* QSpacerItem_geometry(const QSpacerItem* self); QSpacerItem* QSpacerItem_spacerItem(QSpacerItem* self); QSizePolicy* QSpacerItem_sizePolicy(const QSpacerItem* self); -void QSpacerItem_changeSize3(QSpacerItem* self, int w, int h, int hData); -void QSpacerItem_changeSize4(QSpacerItem* self, int w, int h, int hData, int vData); +void QSpacerItem_changeSize2(QSpacerItem* self, int w, int h, int hData); +void QSpacerItem_changeSize3(QSpacerItem* self, int w, int h, int hData, int vData); bool QSpacerItem_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QSpacerItem_virtualbase_sizeHint(const void* self); bool QSpacerItem_override_virtual_minimumSize(void* self, intptr_t slot); diff --git a/qt/gen_qlistview.cpp b/qt/gen_qlistview.cpp index 5e6b3e83..d3725491 100644 --- a/qt/gen_qlistview.cpp +++ b/qt/gen_qlistview.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qlistwidget.cpp b/qt/gen_qlistwidget.cpp index 6c687d22..0b68e8a8 100644 --- a/qt/gen_qlistwidget.cpp +++ b/qt/gen_qlistwidget.cpp @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -2942,7 +2943,7 @@ struct miqt_string QListWidget_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QListWidget_sortItems1(QListWidget* self, int order) { +void QListWidget_sortItemsWithOrder(QListWidget* self, int order) { self->sortItems(static_cast(order)); } diff --git a/qt/gen_qlistwidget.go b/qt/gen_qlistwidget.go index 2853ebf9..3c4af944 100644 --- a/qt/gen_qlistwidget.go +++ b/qt/gen_qlistwidget.go @@ -1076,8 +1076,8 @@ func QListWidget_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QListWidget) SortItems1(order SortOrder) { - C.QListWidget_sortItems1(this.h, (C.int)(order)) +func (this *QListWidget) SortItemsWithOrder(order SortOrder) { + C.QListWidget_sortItemsWithOrder(this.h, (C.int)(order)) } func (this *QListWidget) ScrollToItem2(item *QListWidgetItem, hint QAbstractItemView__ScrollHint) { diff --git a/qt/gen_qlistwidget.h b/qt/gen_qlistwidget.h index 34c9bef6..dd76a33e 100644 --- a/qt/gen_qlistwidget.h +++ b/qt/gen_qlistwidget.h @@ -262,7 +262,7 @@ 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_sortItemsWithOrder(QListWidget* self, int order); void QListWidget_scrollToItem2(QListWidget* self, QListWidgetItem* item, int hint); bool QListWidget_override_virtual_setSelectionModel(void* self, intptr_t slot); void QListWidget_virtualbase_setSelectionModel(void* self, QItemSelectionModel* selectionModel); diff --git a/qt/gen_qlocale.cpp b/qt/gen_qlocale.cpp index db448a2e..0de7a20c 100644 --- a/qt/gen_qlocale.cpp +++ b/qt/gen_qlocale.cpp @@ -111,15 +111,15 @@ struct miqt_string QLocale_nativeCountryName(const QLocale* self) { return _ms; } -int16_t QLocale_toShort(const QLocale* self, struct miqt_string s) { +short 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) { +unsigned short 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); + return static_cast(_ret); } int QLocale_toInt(const QLocale* self, struct miqt_string s) { @@ -210,7 +210,7 @@ struct miqt_string QLocale_toStringWithUlong(const QLocale* self, unsigned long return _ms; } -struct miqt_string QLocale_toStringWithShort(const QLocale* self, int16_t i) { +struct miqt_string QLocale_toStringWithShort(const QLocale* self, short 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(); @@ -221,7 +221,7 @@ struct miqt_string QLocale_toStringWithShort(const QLocale* self, int16_t i) { return _ms; } -struct miqt_string QLocale_toStringWithUshort(const QLocale* self, uint16_t i) { +struct miqt_string QLocale_toStringWithUshort(const QLocale* self, unsigned short 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(); @@ -650,7 +650,7 @@ struct miqt_string QLocale_toCurrencyStringWithQulonglong(const QLocale* self, u return _ms; } -struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, int16_t param1) { +struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, short 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(); @@ -661,7 +661,7 @@ struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, int16_ return _ms; } -struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, uint16_t param1) { +struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, unsigned short 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(); @@ -901,15 +901,15 @@ struct miqt_string QLocale_createSeparatedList(const QLocale* self, struct miqt_ return _ms; } -int16_t QLocale_toShort2(const QLocale* self, struct miqt_string s, bool* ok) { +short 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) { +unsigned short 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); + return static_cast(_ret); } int QLocale_toInt2(const QLocale* self, struct miqt_string s, bool* ok) { @@ -956,7 +956,7 @@ double QLocale_toDouble2(const QLocale* self, struct miqt_string s, bool* ok) { return self->toDouble(s_QString, ok); } -struct miqt_string QLocale_toString22(const QLocale* self, double i, char f) { +struct miqt_string QLocale_toString12(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(); @@ -967,7 +967,7 @@ struct miqt_string QLocale_toString22(const QLocale* self, double i, char f) { return _ms; } -struct miqt_string QLocale_toString32(const QLocale* self, double i, char f, int prec) { +struct miqt_string QLocale_toString13(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(); @@ -978,7 +978,7 @@ struct miqt_string QLocale_toString32(const QLocale* self, double i, char f, int return _ms; } -struct miqt_string QLocale_toString23(const QLocale* self, float i, char f) { +struct miqt_string QLocale_toString14(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(); @@ -989,7 +989,7 @@ struct miqt_string QLocale_toString23(const QLocale* self, float i, char f) { return _ms; } -struct miqt_string QLocale_toString33(const QLocale* self, float i, char f, int prec) { +struct miqt_string QLocale_toString15(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(); @@ -1000,7 +1000,7 @@ struct miqt_string QLocale_toString33(const QLocale* self, float i, char f, int return _ms; } -struct miqt_string QLocale_toString24(const QLocale* self, QDate* date, int format) { +struct miqt_string QLocale_toString16(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(); @@ -1011,7 +1011,7 @@ struct miqt_string QLocale_toString24(const QLocale* self, QDate* date, int form return _ms; } -struct miqt_string QLocale_toString25(const QLocale* self, QTime* time, int format) { +struct miqt_string QLocale_toString17(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(); @@ -1022,7 +1022,7 @@ struct miqt_string QLocale_toString25(const QLocale* self, QTime* time, int form return _ms; } -struct miqt_string QLocale_toString26(const QLocale* self, QDateTime* dateTime, int format) { +struct miqt_string QLocale_toString18(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(); @@ -1033,7 +1033,7 @@ struct miqt_string QLocale_toString26(const QLocale* self, QDateTime* dateTime, return _ms; } -struct miqt_string QLocale_dateFormat1(const QLocale* self, int format) { +struct miqt_string QLocale_dateFormatWithFormat(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(); @@ -1044,7 +1044,7 @@ struct miqt_string QLocale_dateFormat1(const QLocale* self, int format) { return _ms; } -struct miqt_string QLocale_timeFormat1(const QLocale* self, int format) { +struct miqt_string QLocale_timeFormatWithFormat(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(); @@ -1055,7 +1055,7 @@ struct miqt_string QLocale_timeFormat1(const QLocale* self, int format) { return _ms; } -struct miqt_string QLocale_dateTimeFormat1(const QLocale* self, int format) { +struct miqt_string QLocale_dateTimeFormatWithFormat(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(); @@ -1066,17 +1066,17 @@ struct miqt_string QLocale_dateTimeFormat1(const QLocale* self, int format) { return _ms; } -QDate* QLocale_toDate22(const QLocale* self, struct miqt_string string, int param2) { +QDate* QLocale_toDate5(const QLocale* self, struct miqt_string string, int param2) { QString string_QString = QString::fromUtf8(string.data, string.len); return new QDate(self->toDate(string_QString, static_cast(param2))); } -QTime* QLocale_toTime22(const QLocale* self, struct miqt_string string, int param2) { +QTime* QLocale_toTime5(const QLocale* self, struct miqt_string string, int param2) { QString string_QString = QString::fromUtf8(string.data, string.len); return new QTime(self->toTime(string_QString, static_cast(param2))); } -QDateTime* QLocale_toDateTime22(const QLocale* self, struct miqt_string string, int format) { +QDateTime* QLocale_toDateTime5(const QLocale* self, struct miqt_string string, int format) { QString string_QString = QString::fromUtf8(string.data, string.len); return new QDateTime(self->toDateTime(string_QString, static_cast(format))); } @@ -1125,7 +1125,7 @@ struct miqt_string QLocale_standaloneDayName2(const QLocale* self, int param1, i return _ms; } -struct miqt_string QLocale_currencySymbol1(const QLocale* self, int param1) { +struct miqt_string QLocale_currencySymbolWithQLocaleCurrencySymbolFormat(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(); @@ -1136,7 +1136,7 @@ struct miqt_string QLocale_currencySymbol1(const QLocale* self, int param1) { return _ms; } -struct miqt_string QLocale_toCurrencyString22(const QLocale* self, long long param1, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString4(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 @@ -1148,7 +1148,7 @@ struct miqt_string QLocale_toCurrencyString22(const QLocale* self, long long par return _ms; } -struct miqt_string QLocale_toCurrencyString23(const QLocale* self, unsigned long long param1, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString5(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 @@ -1160,7 +1160,7 @@ struct miqt_string QLocale_toCurrencyString23(const QLocale* self, unsigned long return _ms; } -struct miqt_string QLocale_toCurrencyString24(const QLocale* self, int16_t param1, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString6(const QLocale* self, short 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 @@ -1172,7 +1172,7 @@ struct miqt_string QLocale_toCurrencyString24(const QLocale* self, int16_t param return _ms; } -struct miqt_string QLocale_toCurrencyString25(const QLocale* self, uint16_t param1, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString7(const QLocale* self, unsigned short 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 @@ -1184,7 +1184,7 @@ struct miqt_string QLocale_toCurrencyString25(const QLocale* self, uint16_t para return _ms; } -struct miqt_string QLocale_toCurrencyString26(const QLocale* self, int param1, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString8(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 @@ -1196,7 +1196,7 @@ struct miqt_string QLocale_toCurrencyString26(const QLocale* self, int param1, s return _ms; } -struct miqt_string QLocale_toCurrencyString27(const QLocale* self, unsigned int param1, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString9(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 @@ -1208,7 +1208,7 @@ struct miqt_string QLocale_toCurrencyString27(const QLocale* self, unsigned int return _ms; } -struct miqt_string QLocale_toCurrencyString28(const QLocale* self, double param1, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString10(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 @@ -1220,7 +1220,7 @@ struct miqt_string QLocale_toCurrencyString28(const QLocale* self, double param1 return _ms; } -struct miqt_string QLocale_toCurrencyString29(const QLocale* self, float i, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString11(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 @@ -1254,7 +1254,7 @@ struct miqt_string QLocale_formattedDataSize3(QLocale* self, long long bytes, in return _ms; } -struct miqt_string QLocale_formattedDataSize22(const QLocale* self, long long bytes, int precision) { +struct miqt_string QLocale_formattedDataSize4(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(); @@ -1265,7 +1265,7 @@ struct miqt_string QLocale_formattedDataSize22(const QLocale* self, long long by return _ms; } -struct miqt_string QLocale_formattedDataSize32(const QLocale* self, long long bytes, int precision, int format) { +struct miqt_string QLocale_formattedDataSize5(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(); diff --git a/qt/gen_qlocale.go b/qt/gen_qlocale.go index 974bca79..a31c24e1 100644 --- a/qt/gen_qlocale.go +++ b/qt/gen_qlocale.go @@ -1120,14 +1120,14 @@ func (this *QLocale) ToStringWithUlong(i uint64) string { } func (this *QLocale) ToStringWithShort(i int16) string { - var _ms C.struct_miqt_string = C.QLocale_toStringWithShort(this.h, (C.int16_t)(i)) + var _ms C.struct_miqt_string = C.QLocale_toStringWithShort(this.h, (C.short)(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)) + var _ms C.struct_miqt_string = C.QLocale_toStringWithUshort(this.h, (C.ushort)(i)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1550,14 +1550,14 @@ func (this *QLocale) ToCurrencyStringWithQulonglong(param1 uint64) string { } func (this *QLocale) ToCurrencyStringWithShort(param1 int16) string { - var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithShort(this.h, (C.int16_t)(param1)) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithShort(this.h, (C.short)(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)) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithUshort(this.h, (C.ushort)(param1)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1823,102 +1823,102 @@ func (this *QLocale) ToDouble2(s string, ok *bool) float64 { 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)) +func (this *QLocale) ToString12(i float64, f int8) string { + var _ms C.struct_miqt_string = C.QLocale_toString12(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)) +func (this *QLocale) ToString13(i float64, f int8, prec int) string { + var _ms C.struct_miqt_string = C.QLocale_toString13(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)) +func (this *QLocale) ToString14(i float32, f int8) string { + var _ms C.struct_miqt_string = C.QLocale_toString14(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)) +func (this *QLocale) ToString15(i float32, f int8, prec int) string { + var _ms C.struct_miqt_string = C.QLocale_toString15(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)) +func (this *QLocale) ToString16(date *QDate, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QLocale_toString16(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)) +func (this *QLocale) ToString17(time *QTime, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QLocale_toString17(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)) +func (this *QLocale) ToString18(dateTime *QDateTime, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QLocale_toString18(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)) +func (this *QLocale) DateFormatWithFormat(format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QLocale_dateFormatWithFormat(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)) +func (this *QLocale) TimeFormatWithFormat(format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QLocale_timeFormatWithFormat(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)) +func (this *QLocale) DateTimeFormatWithFormat(format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QLocale_dateTimeFormatWithFormat(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 { +func (this *QLocale) ToDate5(stringVal string, param2 QLocale__FormatType) *QDate { 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)) - _goptr := newQDate(C.QLocale_toDate22(this.h, stringVal_ms, (C.int)(param2))) + _goptr := newQDate(C.QLocale_toDate5(this.h, stringVal_ms, (C.int)(param2))) _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 { +func (this *QLocale) ToTime5(stringVal string, param2 QLocale__FormatType) *QTime { 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)) - _goptr := newQTime(C.QLocale_toTime22(this.h, stringVal_ms, (C.int)(param2))) + _goptr := newQTime(C.QLocale_toTime5(this.h, stringVal_ms, (C.int)(param2))) _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 { +func (this *QLocale) ToDateTime5(stringVal string, format QLocale__FormatType) *QDateTime { 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)) - _goptr := newQDateTime(C.QLocale_toDateTime22(this.h, stringVal_ms, (C.int)(format))) + _goptr := newQDateTime(C.QLocale_toDateTime5(this.h, stringVal_ms, (C.int)(format))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1951,96 +1951,96 @@ func (this *QLocale) StandaloneDayName2(param1 int, format QLocale__FormatType) return _ret } -func (this *QLocale) CurrencySymbol1(param1 QLocale__CurrencySymbolFormat) string { - var _ms C.struct_miqt_string = C.QLocale_currencySymbol1(this.h, (C.int)(param1)) +func (this *QLocale) CurrencySymbolWithQLocaleCurrencySymbolFormat(param1 QLocale__CurrencySymbolFormat) string { + var _ms C.struct_miqt_string = C.QLocale_currencySymbolWithQLocaleCurrencySymbolFormat(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 { +func (this *QLocale) ToCurrencyString4(param1 int64, symbol string) string { 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) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString4(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 { +func (this *QLocale) ToCurrencyString5(param1 uint64, symbol string) string { 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) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString5(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 { +func (this *QLocale) ToCurrencyString6(param1 int16, symbol string) string { 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) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString6(this.h, (C.short)(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 { +func (this *QLocale) ToCurrencyString7(param1 uint16, symbol string) string { 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) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString7(this.h, (C.ushort)(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 { +func (this *QLocale) ToCurrencyString8(param1 int, symbol string) string { 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) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString8(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 { +func (this *QLocale) ToCurrencyString9(param1 uint, symbol string) string { 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) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString9(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 { +func (this *QLocale) ToCurrencyString10(param1 float64, symbol string) string { 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) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString10(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 { +func (this *QLocale) ToCurrencyString11(i float32, symbol string) string { 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) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString11(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 @@ -2060,15 +2060,15 @@ func (this *QLocale) FormattedDataSize3(bytes int64, precision int, format QLoca 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)) +func (this *QLocale) FormattedDataSize4(bytes int64, precision int) string { + var _ms C.struct_miqt_string = C.QLocale_formattedDataSize4(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)) +func (this *QLocale) FormattedDataSize5(bytes int64, precision int, format QLocale__DataSizeFormat) string { + var _ms C.struct_miqt_string = C.QLocale_formattedDataSize5(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 diff --git a/qt/gen_qlocale.h b/qt/gen_qlocale.h index f1e17ca5..a5cd76d6 100644 --- a/qt/gen_qlocale.h +++ b/qt/gen_qlocale.h @@ -45,8 +45,8 @@ 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); +short QLocale_toShort(const QLocale* self, struct miqt_string s); +unsigned short 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); @@ -59,8 +59,8 @@ 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_toStringWithShort(const QLocale* self, short i); +struct miqt_string QLocale_toStringWithUshort(const QLocale* self, unsigned short 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); @@ -111,8 +111,8 @@ 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_toCurrencyStringWithShort(const QLocale* self, short param1); +struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, unsigned short 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); @@ -136,8 +136,8 @@ 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); +short QLocale_toShort2(const QLocale* self, struct miqt_string s, bool* ok); +unsigned short 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); @@ -146,36 +146,36 @@ long long QLocale_toLongLong2(const QLocale* self, struct miqt_string s, bool* o 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 string, int param2); -QTime* QLocale_toTime22(const QLocale* self, struct miqt_string string, int param2); -QDateTime* QLocale_toDateTime22(const QLocale* self, struct miqt_string string, int format); +struct miqt_string QLocale_toString12(const QLocale* self, double i, char f); +struct miqt_string QLocale_toString13(const QLocale* self, double i, char f, int prec); +struct miqt_string QLocale_toString14(const QLocale* self, float i, char f); +struct miqt_string QLocale_toString15(const QLocale* self, float i, char f, int prec); +struct miqt_string QLocale_toString16(const QLocale* self, QDate* date, int format); +struct miqt_string QLocale_toString17(const QLocale* self, QTime* time, int format); +struct miqt_string QLocale_toString18(const QLocale* self, QDateTime* dateTime, int format); +struct miqt_string QLocale_dateFormatWithFormat(const QLocale* self, int format); +struct miqt_string QLocale_timeFormatWithFormat(const QLocale* self, int format); +struct miqt_string QLocale_dateTimeFormatWithFormat(const QLocale* self, int format); +QDate* QLocale_toDate5(const QLocale* self, struct miqt_string string, int param2); +QTime* QLocale_toTime5(const QLocale* self, struct miqt_string string, int param2); +QDateTime* QLocale_toDateTime5(const QLocale* self, struct miqt_string string, 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_currencySymbolWithQLocaleCurrencySymbolFormat(const QLocale* self, int param1); +struct miqt_string QLocale_toCurrencyString4(const QLocale* self, long long param1, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString5(const QLocale* self, unsigned long long param1, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString6(const QLocale* self, short param1, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString7(const QLocale* self, unsigned short param1, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString8(const QLocale* self, int param1, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString9(const QLocale* self, unsigned int param1, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString10(const QLocale* self, double param1, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString11(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_formattedDataSize4(const QLocale* self, long long bytes, int precision); +struct miqt_string QLocale_formattedDataSize5(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); diff --git a/qt/gen_qlockfile.cpp b/qt/gen_qlockfile.cpp index 7f0665d8..1c947530 100644 --- a/qt/gen_qlockfile.cpp +++ b/qt/gen_qlockfile.cpp @@ -51,7 +51,7 @@ int QLockFile_error(const QLockFile* self) { return static_cast(_ret); } -bool QLockFile_tryLock1(QLockFile* self, int timeout) { +bool QLockFile_tryLockWithTimeout(QLockFile* self, int timeout) { return self->tryLock(static_cast(timeout)); } diff --git a/qt/gen_qlockfile.go b/qt/gen_qlockfile.go index c6b6f796..1b00dbea 100644 --- a/qt/gen_qlockfile.go +++ b/qt/gen_qlockfile.go @@ -96,8 +96,8 @@ func (this *QLockFile) Error() QLockFile__LockError { return (QLockFile__LockError)(C.QLockFile_error(this.h)) } -func (this *QLockFile) TryLock1(timeout int) bool { - return (bool)(C.QLockFile_tryLock1(this.h, (C.int)(timeout))) +func (this *QLockFile) TryLockWithTimeout(timeout int) bool { + return (bool)(C.QLockFile_tryLockWithTimeout(this.h, (C.int)(timeout))) } // Delete this object from C++ memory. diff --git a/qt/gen_qlockfile.h b/qt/gen_qlockfile.h index f082b15d..39b39698 100644 --- a/qt/gen_qlockfile.h +++ b/qt/gen_qlockfile.h @@ -29,7 +29,7 @@ int QLockFile_staleLockTime(const QLockFile* self); bool QLockFile_isLocked(const QLockFile* self); bool QLockFile_removeStaleLockFile(QLockFile* self); int QLockFile_error(const QLockFile* self); -bool QLockFile_tryLock1(QLockFile* self, int timeout); +bool QLockFile_tryLockWithTimeout(QLockFile* self, int timeout); void QLockFile_delete(QLockFile* self); #ifdef __cplusplus diff --git a/qt/gen_qmainwindow.cpp b/qt/gen_qmainwindow.cpp index ffaa4349..82c93ef8 100644 --- a/qt/gen_qmainwindow.cpp +++ b/qt/gen_qmainwindow.cpp @@ -1396,11 +1396,11 @@ struct miqt_string QMainWindow_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QMainWindow_addToolBarBreak1(QMainWindow* self, int area) { +void QMainWindow_addToolBarBreakWithArea(QMainWindow* self, int area) { self->addToolBarBreak(static_cast(area)); } -struct miqt_string QMainWindow_saveState1(const QMainWindow* self, int version) { +struct miqt_string QMainWindow_saveStateWithVersion(const QMainWindow* self, int version) { QByteArray _qb = self->saveState(static_cast(version)); struct miqt_string _ms; _ms.len = _qb.length(); diff --git a/qt/gen_qmainwindow.go b/qt/gen_qmainwindow.go index 16db9308..c226dc91 100644 --- a/qt/gen_qmainwindow.go +++ b/qt/gen_qmainwindow.go @@ -453,12 +453,12 @@ func QMainWindow_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QMainWindow) AddToolBarBreak1(area ToolBarArea) { - C.QMainWindow_addToolBarBreak1(this.h, (C.int)(area)) +func (this *QMainWindow) AddToolBarBreakWithArea(area ToolBarArea) { + C.QMainWindow_addToolBarBreakWithArea(this.h, (C.int)(area)) } -func (this *QMainWindow) SaveState1(version int) []byte { - var _bytearray C.struct_miqt_string = C.QMainWindow_saveState1(this.h, (C.int)(version)) +func (this *QMainWindow) SaveStateWithVersion(version int) []byte { + var _bytearray C.struct_miqt_string = C.QMainWindow_saveStateWithVersion(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 diff --git a/qt/gen_qmainwindow.h b/qt/gen_qmainwindow.h index 046b9c14..512eeae8 100644 --- a/qt/gen_qmainwindow.h +++ b/qt/gen_qmainwindow.h @@ -164,8 +164,8 @@ 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); -struct miqt_string QMainWindow_saveState1(const QMainWindow* self, int version); +void QMainWindow_addToolBarBreakWithArea(QMainWindow* self, int area); +struct miqt_string QMainWindow_saveStateWithVersion(const QMainWindow* self, int version); bool QMainWindow_restoreState2(QMainWindow* self, struct miqt_string state, int version); bool QMainWindow_override_virtual_createPopupMenu(void* self, intptr_t slot); QMenu* QMainWindow_virtualbase_createPopupMenu(void* self); diff --git a/qt/gen_qmatrix.cpp b/qt/gen_qmatrix.cpp index 8a1e0787..46192f58 100644 --- a/qt/gen_qmatrix.cpp +++ b/qt/gen_qmatrix.cpp @@ -180,7 +180,7 @@ QVariant* QMatrix_ToQVariant(const QMatrix* self) { return new QVariant(self->operator QVariant()); } -QMatrix* QMatrix_inverted1(const QMatrix* self, bool* invertible) { +QMatrix* QMatrix_invertedWithInvertible(const QMatrix* self, bool* invertible) { return new QMatrix(self->inverted(invertible)); } diff --git a/qt/gen_qmatrix.go b/qt/gen_qmatrix.go index d5cf6b80..8b4a1a3d 100644 --- a/qt/gen_qmatrix.go +++ b/qt/gen_qmatrix.go @@ -219,8 +219,8 @@ func (this *QMatrix) ToQVariant() *QVariant { return _goptr } -func (this *QMatrix) Inverted1(invertible *bool) *QMatrix { - _goptr := newQMatrix(C.QMatrix_inverted1(this.h, (*C.bool)(unsafe.Pointer(invertible)))) +func (this *QMatrix) InvertedWithInvertible(invertible *bool) *QMatrix { + _goptr := newQMatrix(C.QMatrix_invertedWithInvertible(this.h, (*C.bool)(unsafe.Pointer(invertible)))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qmatrix.h b/qt/gen_qmatrix.h index 7ccacd64..06a34c01 100644 --- a/qt/gen_qmatrix.h +++ b/qt/gen_qmatrix.h @@ -74,7 +74,7 @@ bool QMatrix_operatorNotEqual(const QMatrix* self, QMatrix* param1); QMatrix* QMatrix_operatorMultiplyAssign(QMatrix* self, QMatrix* param1); QMatrix* QMatrix_operatorMultiply(const QMatrix* self, QMatrix* o); QVariant* QMatrix_ToQVariant(const QMatrix* self); -QMatrix* QMatrix_inverted1(const QMatrix* self, bool* invertible); +QMatrix* QMatrix_invertedWithInvertible(const QMatrix* self, bool* invertible); void QMatrix_delete(QMatrix* self); #ifdef __cplusplus diff --git a/qt/gen_qmatrix4x4.cpp b/qt/gen_qmatrix4x4.cpp index ca0ae04a..aa0836be 100644 --- a/qt/gen_qmatrix4x4.cpp +++ b/qt/gen_qmatrix4x4.cpp @@ -274,19 +274,19 @@ QVariant* QMatrix4x4_ToQVariant(const QMatrix4x4* self) { return new QVariant(self->operator QVariant()); } -QMatrix4x4* QMatrix4x4_inverted1(const QMatrix4x4* self, bool* invertible) { +QMatrix4x4* QMatrix4x4_invertedWithInvertible(const QMatrix4x4* self, bool* invertible) { return new QMatrix4x4(self->inverted(invertible)); } -void QMatrix4x4_rotate4(QMatrix4x4* self, float angle, float x, float y, float z) { +void QMatrix4x4_rotate3(QMatrix4x4* self, float angle, float x, float y, float z) { self->rotate(static_cast(angle), static_cast(x), static_cast(y), static_cast(z)); } -void QMatrix4x4_viewport5(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane) { +void QMatrix4x4_viewport3(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane) { self->viewport(static_cast(left), static_cast(bottom), static_cast(width), static_cast(height), static_cast(nearPlane)); } -void QMatrix4x4_viewport6(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane, float farPlane) { +void QMatrix4x4_viewport4(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane, float farPlane) { self->viewport(static_cast(left), static_cast(bottom), static_cast(width), static_cast(height), static_cast(nearPlane), static_cast(farPlane)); } diff --git a/qt/gen_qmatrix4x4.go b/qt/gen_qmatrix4x4.go index cc7b6406..3dd460ff 100644 --- a/qt/gen_qmatrix4x4.go +++ b/qt/gen_qmatrix4x4.go @@ -335,22 +335,22 @@ func (this *QMatrix4x4) ToQVariant() *QVariant { return _goptr } -func (this *QMatrix4x4) Inverted1(invertible *bool) *QMatrix4x4 { - _goptr := newQMatrix4x4(C.QMatrix4x4_inverted1(this.h, (*C.bool)(unsafe.Pointer(invertible)))) +func (this *QMatrix4x4) InvertedWithInvertible(invertible *bool) *QMatrix4x4 { + _goptr := newQMatrix4x4(C.QMatrix4x4_invertedWithInvertible(this.h, (*C.bool)(unsafe.Pointer(invertible)))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QMatrix4x4) Rotate4(angle float32, x float32, y float32, z float32) { - C.QMatrix4x4_rotate4(this.h, (C.float)(angle), (C.float)(x), (C.float)(y), (C.float)(z)) +func (this *QMatrix4x4) Rotate3(angle float32, x float32, y float32, z float32) { + C.QMatrix4x4_rotate3(this.h, (C.float)(angle), (C.float)(x), (C.float)(y), (C.float)(z)) } -func (this *QMatrix4x4) Viewport5(left float32, bottom float32, width float32, height float32, nearPlane float32) { - C.QMatrix4x4_viewport5(this.h, (C.float)(left), (C.float)(bottom), (C.float)(width), (C.float)(height), (C.float)(nearPlane)) +func (this *QMatrix4x4) Viewport3(left float32, bottom float32, width float32, height float32, nearPlane float32) { + C.QMatrix4x4_viewport3(this.h, (C.float)(left), (C.float)(bottom), (C.float)(width), (C.float)(height), (C.float)(nearPlane)) } -func (this *QMatrix4x4) Viewport6(left float32, bottom float32, width float32, height float32, nearPlane float32, farPlane float32) { - C.QMatrix4x4_viewport6(this.h, (C.float)(left), (C.float)(bottom), (C.float)(width), (C.float)(height), (C.float)(nearPlane), (C.float)(farPlane)) +func (this *QMatrix4x4) Viewport4(left float32, bottom float32, width float32, height float32, nearPlane float32, farPlane float32) { + C.QMatrix4x4_viewport4(this.h, (C.float)(left), (C.float)(bottom), (C.float)(width), (C.float)(height), (C.float)(nearPlane), (C.float)(farPlane)) } // Delete this object from C++ memory. diff --git a/qt/gen_qmatrix4x4.h b/qt/gen_qmatrix4x4.h index 907f7146..9b087314 100644 --- a/qt/gen_qmatrix4x4.h +++ b/qt/gen_qmatrix4x4.h @@ -101,10 +101,10 @@ const float* QMatrix4x4_data2(const QMatrix4x4* self); const float* QMatrix4x4_constData(const QMatrix4x4* self); void QMatrix4x4_optimize(QMatrix4x4* self); QVariant* QMatrix4x4_ToQVariant(const QMatrix4x4* self); -QMatrix4x4* QMatrix4x4_inverted1(const QMatrix4x4* self, bool* invertible); -void QMatrix4x4_rotate4(QMatrix4x4* self, float angle, float x, float y, float z); -void QMatrix4x4_viewport5(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane); -void QMatrix4x4_viewport6(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane, float farPlane); +QMatrix4x4* QMatrix4x4_invertedWithInvertible(const QMatrix4x4* self, bool* invertible); +void QMatrix4x4_rotate3(QMatrix4x4* self, float angle, float x, float y, float z); +void QMatrix4x4_viewport3(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane); +void QMatrix4x4_viewport4(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane, float farPlane); void QMatrix4x4_delete(QMatrix4x4* self); #ifdef __cplusplus diff --git a/qt/gen_qmdiarea.cpp b/qt/gen_qmdiarea.cpp index 080d7313..12d9ae20 100644 --- a/qt/gen_qmdiarea.cpp +++ b/qt/gen_qmdiarea.cpp @@ -1327,7 +1327,7 @@ struct miqt_string QMdiArea_trUtf83(const char* s, const char* c, int n) { return _ms; } -struct miqt_array /* of QMdiSubWindow* */ QMdiArea_subWindowList1(const QMdiArea* self, int order) { +struct miqt_array /* of QMdiSubWindow* */ QMdiArea_subWindowListWithOrder(const QMdiArea* self, int order) { QList _ret = self->subWindowList(static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QMdiSubWindow** _arr = static_cast(malloc(sizeof(QMdiSubWindow*) * _ret.length())); diff --git a/qt/gen_qmdiarea.go b/qt/gen_qmdiarea.go index fdbe591d..dc2e4493 100644 --- a/qt/gen_qmdiarea.go +++ b/qt/gen_qmdiarea.go @@ -315,8 +315,8 @@ func QMdiArea_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QMdiArea) SubWindowList1(order QMdiArea__WindowOrder) []*QMdiSubWindow { - var _ma C.struct_miqt_array = C.QMdiArea_subWindowList1(this.h, (C.int)(order)) +func (this *QMdiArea) SubWindowListWithOrder(order QMdiArea__WindowOrder) []*QMdiSubWindow { + var _ma C.struct_miqt_array = C.QMdiArea_subWindowListWithOrder(this.h, (C.int)(order)) _ret := make([]*QMdiSubWindow, int(_ma.len)) _outCast := (*[0xffff]*C.QMdiSubWindow)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qmdiarea.h b/qt/gen_qmdiarea.h index 329c6326..f8f4f4df 100644 --- a/qt/gen_qmdiarea.h +++ b/qt/gen_qmdiarea.h @@ -149,7 +149,7 @@ 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 /* of QMdiSubWindow* */ QMdiArea_subWindowList1(const QMdiArea* self, int order); +struct miqt_array /* of QMdiSubWindow* */ QMdiArea_subWindowListWithOrder(const QMdiArea* self, int order); QMdiSubWindow* QMdiArea_addSubWindow2(QMdiArea* self, QWidget* widget, int flags); void QMdiArea_setOption2(QMdiArea* self, int option, bool on); bool QMdiArea_override_virtual_sizeHint(void* self, intptr_t slot); diff --git a/qt/gen_qmenu.cpp b/qt/gen_qmenu.cpp index dff925a7..226edb8f 100644 --- a/qt/gen_qmenu.cpp +++ b/qt/gen_qmenu.cpp @@ -1340,11 +1340,11 @@ void QMenu_popup2(QMenu* self, QPoint* pos, QAction* at) { self->popup(*pos, at); } -QAction* QMenu_exec22(QMenu* self, QPoint* pos, QAction* at) { +QAction* QMenu_exec3(QMenu* self, QPoint* pos, QAction* at) { return self->exec(*pos, at); } -QAction* QMenu_exec3(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at) { +QAction* QMenu_exec4(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at) { QList actions_QList; actions_QList.reserve(actions.len); QAction** actions_arr = static_cast(actions.data); @@ -1354,7 +1354,7 @@ QAction* QMenu_exec3(struct miqt_array /* of QAction* */ actions, QPoint* pos, return QMenu::exec(actions_QList, *pos, at); } -QAction* QMenu_exec4(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at, QWidget* parent) { +QAction* QMenu_exec5(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at, QWidget* parent) { QList actions_QList; actions_QList.reserve(actions.len); QAction** actions_arr = static_cast(actions.data); diff --git a/qt/gen_qmenu.go b/qt/gen_qmenu.go index 1d4a278a..b3e63472 100644 --- a/qt/gen_qmenu.go +++ b/qt/gen_qmenu.go @@ -447,28 +447,28 @@ func (this *QMenu) Popup2(pos *QPoint, at *QAction) { C.QMenu_popup2(this.h, pos.cPointer(), at.cPointer()) } -func (this *QMenu) Exec22(pos *QPoint, at *QAction) *QAction { - return newQAction(C.QMenu_exec22(this.h, pos.cPointer(), at.cPointer())) +func (this *QMenu) Exec3(pos *QPoint, at *QAction) *QAction { + return newQAction(C.QMenu_exec3(this.h, pos.cPointer(), at.cPointer())) } -func QMenu_Exec3(actions []*QAction, pos *QPoint, at *QAction) *QAction { +func QMenu_Exec4(actions []*QAction, pos *QPoint, at *QAction) *QAction { actions_CArray := (*[0xffff]*C.QAction)(C.malloc(C.size_t(8 * len(actions)))) defer C.free(unsafe.Pointer(actions_CArray)) for i := range actions { actions_CArray[i] = actions[i].cPointer() } actions_ma := C.struct_miqt_array{len: C.size_t(len(actions)), data: unsafe.Pointer(actions_CArray)} - return newQAction(C.QMenu_exec3(actions_ma, pos.cPointer(), at.cPointer())) + return newQAction(C.QMenu_exec4(actions_ma, pos.cPointer(), at.cPointer())) } -func QMenu_Exec4(actions []*QAction, pos *QPoint, at *QAction, parent *QWidget) *QAction { +func QMenu_Exec5(actions []*QAction, pos *QPoint, at *QAction, parent *QWidget) *QAction { actions_CArray := (*[0xffff]*C.QAction)(C.malloc(C.size_t(8 * len(actions)))) defer C.free(unsafe.Pointer(actions_CArray)) for i := range actions { actions_CArray[i] = actions[i].cPointer() } actions_ma := C.struct_miqt_array{len: C.size_t(len(actions)), data: unsafe.Pointer(actions_CArray)} - return newQAction(C.QMenu_exec4(actions_ma, pos.cPointer(), at.cPointer(), parent.cPointer())) + return newQAction(C.QMenu_exec5(actions_ma, pos.cPointer(), at.cPointer(), parent.cPointer())) } // ColumnCount can only be called from a QMenu that was directly constructed. diff --git a/qt/gen_qmenu.h b/qt/gen_qmenu.h index edbcd708..4977facc 100644 --- a/qt/gen_qmenu.h +++ b/qt/gen_qmenu.h @@ -167,9 +167,9 @@ 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); -QAction* QMenu_exec4(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at, QWidget* parent); +QAction* QMenu_exec3(QMenu* self, QPoint* pos, QAction* at); +QAction* QMenu_exec4(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at); +QAction* QMenu_exec5(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at, QWidget* parent); bool QMenu_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QMenu_virtualbase_sizeHint(const void* self); bool QMenu_override_virtual_changeEvent(void* self, intptr_t slot); diff --git a/qt/gen_qmenubar.cpp b/qt/gen_qmenubar.cpp index 379d5f53..82a88367 100644 --- a/qt/gen_qmenubar.cpp +++ b/qt/gen_qmenubar.cpp @@ -1210,7 +1210,7 @@ void QMenuBar_setCornerWidget2(QMenuBar* self, QWidget* w, int corner) { self->setCornerWidget(w, static_cast(corner)); } -QWidget* QMenuBar_cornerWidget1(const QMenuBar* self, int corner) { +QWidget* QMenuBar_cornerWidgetWithCorner(const QMenuBar* self, int corner) { return self->cornerWidget(static_cast(corner)); } diff --git a/qt/gen_qmenubar.go b/qt/gen_qmenubar.go index 871177e9..47b31712 100644 --- a/qt/gen_qmenubar.go +++ b/qt/gen_qmenubar.go @@ -284,8 +284,8 @@ func (this *QMenuBar) SetCornerWidget2(w *QWidget, corner Corner) { C.QMenuBar_setCornerWidget2(this.h, w.cPointer(), (C.int)(corner)) } -func (this *QMenuBar) CornerWidget1(corner Corner) *QWidget { - return newQWidget(C.QMenuBar_cornerWidget1(this.h, (C.int)(corner))) +func (this *QMenuBar) CornerWidgetWithCorner(corner Corner) *QWidget { + return newQWidget(C.QMenuBar_cornerWidgetWithCorner(this.h, (C.int)(corner))) } // InitStyleOption can only be called from a QMenuBar that was directly constructed. diff --git a/qt/gen_qmenubar.h b/qt/gen_qmenubar.h index 5f18926d..35184515 100644 --- a/qt/gen_qmenubar.h +++ b/qt/gen_qmenubar.h @@ -144,7 +144,7 @@ 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); +QWidget* QMenuBar_cornerWidgetWithCorner(const QMenuBar* self, int corner); bool QMenuBar_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QMenuBar_virtualbase_sizeHint(const void* self); bool QMenuBar_override_virtual_minimumSizeHint(void* self, intptr_t slot); diff --git a/qt/gen_qmessagebox.cpp b/qt/gen_qmessagebox.cpp index 72cc25b0..cb2e33de 100644 --- a/qt/gen_qmessagebox.cpp +++ b/qt/gen_qmessagebox.cpp @@ -1564,56 +1564,56 @@ struct miqt_string QMessageBox_trUtf83(const char* s, const char* c, int n) { return _ms; } -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) { 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) { +int QMessageBox_information6(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) { +int QMessageBox_question5(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) { +int QMessageBox_question6(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) { +int QMessageBox_warning5(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) { +int QMessageBox_warning6(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) { +int QMessageBox_critical5(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) { +int QMessageBox_critical6(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)); @@ -1625,19 +1625,19 @@ void QMessageBox_aboutQt2(QWidget* parent, struct miqt_string title) { QMessageBox::aboutQt(parent, title_QString); } -int QMessageBox_information52(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1) { +int QMessageBox_information7(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) { +int QMessageBox_information8(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) { +int QMessageBox_information9(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); @@ -1645,7 +1645,7 @@ int QMessageBox_information53(QWidget* parent, struct miqt_string title, struct 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) { +int QMessageBox_information10(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); @@ -1654,7 +1654,7 @@ int QMessageBox_information62(QWidget* parent, struct miqt_string title, struct 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) { +int QMessageBox_information11(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); @@ -1663,7 +1663,7 @@ int QMessageBox_information7(QWidget* parent, struct miqt_string title, struct m 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) { +int QMessageBox_information12(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); @@ -1672,26 +1672,26 @@ int QMessageBox_information8(QWidget* parent, struct miqt_string title, struct m 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) { +int QMessageBox_information13(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) { +int QMessageBox_question7(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) { +int QMessageBox_question8(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) { +int QMessageBox_question9(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); @@ -1699,7 +1699,7 @@ int QMessageBox_question53(QWidget* parent, struct miqt_string title, struct miq 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) { +int QMessageBox_question10(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); @@ -1708,7 +1708,7 @@ int QMessageBox_question62(QWidget* parent, struct miqt_string title, struct miq 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) { +int QMessageBox_question11(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); @@ -1717,7 +1717,7 @@ int QMessageBox_question7(QWidget* parent, struct miqt_string title, struct miqt 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) { +int QMessageBox_question12(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); @@ -1726,13 +1726,13 @@ int QMessageBox_question8(QWidget* parent, struct miqt_string title, struct miqt 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) { +int QMessageBox_warning7(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) { +int QMessageBox_warning8(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); @@ -1740,7 +1740,7 @@ int QMessageBox_warning52(QWidget* parent, struct miqt_string title, struct miqt 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) { +int QMessageBox_warning9(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); @@ -1749,7 +1749,7 @@ int QMessageBox_warning62(QWidget* parent, struct miqt_string title, struct miqt 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) { +int QMessageBox_warning10(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); @@ -1758,7 +1758,7 @@ int QMessageBox_warning7(QWidget* parent, struct miqt_string title, struct miqt_ 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) { +int QMessageBox_warning11(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); @@ -1767,13 +1767,13 @@ int QMessageBox_warning8(QWidget* parent, struct miqt_string title, struct miqt_ 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) { +int QMessageBox_critical7(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) { +int QMessageBox_critical8(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); @@ -1781,7 +1781,7 @@ int QMessageBox_critical52(QWidget* parent, struct miqt_string title, struct miq 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) { +int QMessageBox_critical9(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); @@ -1790,7 +1790,7 @@ int QMessageBox_critical62(QWidget* parent, struct miqt_string title, struct miq 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) { +int QMessageBox_critical10(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); @@ -1799,7 +1799,7 @@ int QMessageBox_critical7(QWidget* parent, struct miqt_string title, struct miqt 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) { +int QMessageBox_critical11(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); diff --git a/qt/gen_qmessagebox.go b/qt/gen_qmessagebox.go index 0082a7af..e131ba84 100644 --- a/qt/gen_qmessagebox.go +++ b/qt/gen_qmessagebox.go @@ -732,7 +732,7 @@ func QMessageBox_TrUtf83(s string, c string, n int) string { return _ret } -func QMessageBox_Information42(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { +func QMessageBox_Information5(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -741,10 +741,10 @@ func QMessageBox_Information42(parent *QWidget, title string, text string, butto 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_information5(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 { +func QMessageBox_Information6(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -753,10 +753,10 @@ func QMessageBox_Information5(parent *QWidget, title string, text string, button 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_information6(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 { +func QMessageBox_Question5(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -765,10 +765,10 @@ func QMessageBox_Question42(parent *QWidget, title string, text string, buttons 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_question5(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 { +func QMessageBox_Question6(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -777,10 +777,10 @@ func QMessageBox_Question5(parent *QWidget, title string, text string, buttons Q 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_question6(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 { +func QMessageBox_Warning5(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -789,10 +789,10 @@ func QMessageBox_Warning42(parent *QWidget, title string, text string, buttons Q 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_warning5(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 { +func QMessageBox_Warning6(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -801,10 +801,10 @@ func QMessageBox_Warning5(parent *QWidget, title string, text string, buttons QM 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_warning6(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 { +func QMessageBox_Critical5(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -813,10 +813,10 @@ func QMessageBox_Critical42(parent *QWidget, title string, text string, buttons 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_critical5(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 { +func QMessageBox_Critical6(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -825,7 +825,7 @@ func QMessageBox_Critical5(parent *QWidget, title string, text string, buttons Q 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_critical6(parent.cPointer(), title_ms, text_ms, (C.int)(buttons), (C.int)(defaultButton))) } func QMessageBox_AboutQt2(parent *QWidget, title string) { @@ -836,7 +836,7 @@ func QMessageBox_AboutQt2(parent *QWidget, title string) { C.QMessageBox_aboutQt2(parent.cPointer(), title_ms) } -func QMessageBox_Information52(parent *QWidget, title string, text string, button0 int, button1 int) int { +func QMessageBox_Information7(parent *QWidget, title string, text string, button0 int, button1 int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -845,10 +845,10 @@ func QMessageBox_Information52(parent *QWidget, title string, text string, butto 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))) + return (int)(C.QMessageBox_information7(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 { +func QMessageBox_Information8(parent *QWidget, title string, text string, button0 int, button1 int, button2 int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -857,10 +857,10 @@ func QMessageBox_Information6(parent *QWidget, title string, text string, button 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))) + return (int)(C.QMessageBox_information8(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 { +func QMessageBox_Information9(parent *QWidget, title string, text string, button0Text string, button1Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -877,10 +877,10 @@ func QMessageBox_Information53(parent *QWidget, title string, text string, butto 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)) + return (int)(C.QMessageBox_information9(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 { +func QMessageBox_Information10(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -901,10 +901,10 @@ func QMessageBox_Information62(parent *QWidget, title string, text string, butto 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)) + return (int)(C.QMessageBox_information10(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 { +func QMessageBox_Information11(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -925,10 +925,10 @@ func QMessageBox_Information7(parent *QWidget, title string, text string, button 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))) + return (int)(C.QMessageBox_information11(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 { +func QMessageBox_Information12(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int, escapeButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -949,10 +949,10 @@ func QMessageBox_Information8(parent *QWidget, title string, text string, button 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))) + return (int)(C.QMessageBox_information12(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 { +func QMessageBox_Information13(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -961,10 +961,10 @@ func QMessageBox_Information54(parent *QWidget, title string, text string, butto 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_information13(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 { +func QMessageBox_Question7(parent *QWidget, title string, text string, button0 int, button1 int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -973,10 +973,10 @@ func QMessageBox_Question52(parent *QWidget, title string, text string, button0 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))) + return (int)(C.QMessageBox_question7(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 { +func QMessageBox_Question8(parent *QWidget, title string, text string, button0 int, button1 int, button2 int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -985,10 +985,10 @@ func QMessageBox_Question6(parent *QWidget, title string, text string, button0 i 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))) + return (int)(C.QMessageBox_question8(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 { +func QMessageBox_Question9(parent *QWidget, title string, text string, button0Text string, button1Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1005,10 +1005,10 @@ func QMessageBox_Question53(parent *QWidget, title string, text string, button0T 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)) + return (int)(C.QMessageBox_question9(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 { +func QMessageBox_Question10(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1029,10 +1029,10 @@ func QMessageBox_Question62(parent *QWidget, title string, text string, button0T 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)) + return (int)(C.QMessageBox_question10(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 { +func QMessageBox_Question11(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1053,10 +1053,10 @@ func QMessageBox_Question7(parent *QWidget, title string, text string, button0Te 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))) + return (int)(C.QMessageBox_question11(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 { +func QMessageBox_Question12(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int, escapeButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1077,10 +1077,10 @@ func QMessageBox_Question8(parent *QWidget, title string, text string, button0Te 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))) + return (int)(C.QMessageBox_question12(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 { +func QMessageBox_Warning7(parent *QWidget, title string, text string, button0 int, button1 int, button2 int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1089,10 +1089,10 @@ func QMessageBox_Warning6(parent *QWidget, title string, text string, button0 in 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))) + return (int)(C.QMessageBox_warning7(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 { +func QMessageBox_Warning8(parent *QWidget, title string, text string, button0Text string, button1Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1109,10 +1109,10 @@ func QMessageBox_Warning52(parent *QWidget, title string, text string, button0Te 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)) + return (int)(C.QMessageBox_warning8(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 { +func QMessageBox_Warning9(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1133,10 +1133,10 @@ func QMessageBox_Warning62(parent *QWidget, title string, text string, button0Te 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)) + return (int)(C.QMessageBox_warning9(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 { +func QMessageBox_Warning10(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1157,10 +1157,10 @@ func QMessageBox_Warning7(parent *QWidget, title string, text string, button0Tex 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))) + return (int)(C.QMessageBox_warning10(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 { +func QMessageBox_Warning11(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int, escapeButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1181,10 +1181,10 @@ func QMessageBox_Warning8(parent *QWidget, title string, text string, button0Tex 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))) + return (int)(C.QMessageBox_warning11(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 { +func QMessageBox_Critical7(parent *QWidget, title string, text string, button0 int, button1 int, button2 int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1193,10 +1193,10 @@ func QMessageBox_Critical6(parent *QWidget, title string, text string, button0 i 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))) + return (int)(C.QMessageBox_critical7(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 { +func QMessageBox_Critical8(parent *QWidget, title string, text string, button0Text string, button1Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1213,10 +1213,10 @@ func QMessageBox_Critical52(parent *QWidget, title string, text string, button0T 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)) + return (int)(C.QMessageBox_critical8(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 { +func QMessageBox_Critical9(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1237,10 +1237,10 @@ func QMessageBox_Critical62(parent *QWidget, title string, text string, button0T 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)) + return (int)(C.QMessageBox_critical9(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 { +func QMessageBox_Critical10(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1261,10 +1261,10 @@ func QMessageBox_Critical7(parent *QWidget, title string, text string, button0Te 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))) + return (int)(C.QMessageBox_critical10(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 { +func QMessageBox_Critical11(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int, escapeButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1285,7 +1285,7 @@ func QMessageBox_Critical8(parent *QWidget, title string, text string, button0Te 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))) + return (int)(C.QMessageBox_critical11(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms, (C.int)(defaultButtonNumber), (C.int)(escapeButtonNumber))) } // AdjustPosition can only be called from a QMessageBox that was directly constructed. diff --git a/qt/gen_qmessagebox.h b/qt/gen_qmessagebox.h index 91a2e431..be0a6fa6 100644 --- a/qt/gen_qmessagebox.h +++ b/qt/gen_qmessagebox.h @@ -174,38 +174,38 @@ 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); +int QMessageBox_information5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons); +int QMessageBox_information6(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton); +int QMessageBox_question5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons); +int QMessageBox_question6(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton); +int QMessageBox_warning5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons); +int QMessageBox_warning6(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton); +int QMessageBox_critical5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons); +int QMessageBox_critical6(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); +int QMessageBox_information7(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +int QMessageBox_information8(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2); +int QMessageBox_information9(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text); +int QMessageBox_information10(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text); +int QMessageBox_information11(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_information12(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_information13(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +int QMessageBox_question7(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +int QMessageBox_question8(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2); +int QMessageBox_question9(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text); +int QMessageBox_question10(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text); +int QMessageBox_question11(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_question12(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_warning7(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2); +int QMessageBox_warning8(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text); +int QMessageBox_warning9(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text); +int QMessageBox_warning10(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_warning11(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_critical7(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2); +int QMessageBox_critical8(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text); +int QMessageBox_critical9(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text); +int QMessageBox_critical10(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_critical11(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); bool QMessageBox_override_virtual_event(void* self, intptr_t slot); bool QMessageBox_virtualbase_event(void* self, QEvent* e); bool QMessageBox_override_virtual_resizeEvent(void* self, intptr_t slot); diff --git a/qt/gen_qmetaobject.cpp b/qt/gen_qmetaobject.cpp index 8b3d66a2..bc2a50c7 100644 --- a/qt/gen_qmetaobject.cpp +++ b/qt/gen_qmetaobject.cpp @@ -200,203 +200,203 @@ bool QMetaMethod_invoke13(const QMetaMethod* self, QObject* object, int connecti return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaMethod_invoke32(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0) { +bool QMetaMethod_invoke14(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0) { return self->invoke(object, *returnValue, *val0); } -bool QMetaMethod_invoke42(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaMethod_invoke15(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1) { return self->invoke(object, *returnValue, *val0, *val1); } -bool QMetaMethod_invoke52(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaMethod_invoke16(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return self->invoke(object, *returnValue, *val0, *val1, *val2); } -bool QMetaMethod_invoke62(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaMethod_invoke17(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3); } -bool QMetaMethod_invoke72(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaMethod_invoke18(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4); } -bool QMetaMethod_invoke82(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaMethod_invoke19(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaMethod_invoke92(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaMethod_invoke20(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaMethod_invoke102(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaMethod_invoke21(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaMethod_invoke112(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaMethod_invoke22(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaMethod_invoke122(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaMethod_invoke23(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaMethod_invoke33(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0) { +bool QMetaMethod_invoke24(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0) { return self->invoke(object, static_cast(connectionType), *val0); } -bool QMetaMethod_invoke43(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaMethod_invoke25(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1) { return self->invoke(object, static_cast(connectionType), *val0, *val1); } -bool QMetaMethod_invoke53(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaMethod_invoke26(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2); } -bool QMetaMethod_invoke63(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaMethod_invoke27(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3); } -bool QMetaMethod_invoke73(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaMethod_invoke28(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4); } -bool QMetaMethod_invoke83(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaMethod_invoke29(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaMethod_invoke93(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaMethod_invoke30(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaMethod_invoke103(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaMethod_invoke31(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaMethod_invoke113(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaMethod_invoke32(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaMethod_invoke123(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaMethod_invoke33(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaMethod_invoke22(const QMetaMethod* self, QObject* object, QGenericArgument* val0) { +bool QMetaMethod_invoke34(const QMetaMethod* self, QObject* object, QGenericArgument* val0) { return self->invoke(object, *val0); } -bool QMetaMethod_invoke34(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaMethod_invoke35(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1) { return self->invoke(object, *val0, *val1); } -bool QMetaMethod_invoke44(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaMethod_invoke36(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return self->invoke(object, *val0, *val1, *val2); } -bool QMetaMethod_invoke54(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaMethod_invoke37(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return self->invoke(object, *val0, *val1, *val2, *val3); } -bool QMetaMethod_invoke64(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaMethod_invoke38(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return self->invoke(object, *val0, *val1, *val2, *val3, *val4); } -bool QMetaMethod_invoke74(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaMethod_invoke39(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaMethod_invoke84(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaMethod_invoke40(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaMethod_invoke94(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaMethod_invoke41(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaMethod_invoke104(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaMethod_invoke42(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaMethod_invoke114(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaMethod_invoke43(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaMethod_invokeOnGadget3(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0) { +bool QMetaMethod_invokeOnGadget2(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0) { return self->invokeOnGadget(gadget, *returnValue, *val0); } -bool QMetaMethod_invokeOnGadget4(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaMethod_invokeOnGadget3(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1); } -bool QMetaMethod_invokeOnGadget5(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaMethod_invokeOnGadget4(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2); } -bool QMetaMethod_invokeOnGadget6(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaMethod_invokeOnGadget5(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3); } -bool QMetaMethod_invokeOnGadget7(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaMethod_invokeOnGadget6(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3, *val4); } -bool QMetaMethod_invokeOnGadget8(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaMethod_invokeOnGadget7(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaMethod_invokeOnGadget9(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaMethod_invokeOnGadget8(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaMethod_invokeOnGadget10(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaMethod_invokeOnGadget9(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaMethod_invokeOnGadget11(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaMethod_invokeOnGadget10(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaMethod_invokeOnGadget12(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaMethod_invokeOnGadget11(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaMethod_invokeOnGadget2(const QMetaMethod* self, void* gadget, QGenericArgument* val0) { +bool QMetaMethod_invokeOnGadget12(const QMetaMethod* self, void* gadget, QGenericArgument* val0) { return self->invokeOnGadget(gadget, *val0); } -bool QMetaMethod_invokeOnGadget32(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaMethod_invokeOnGadget13(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1) { return self->invokeOnGadget(gadget, *val0, *val1); } -bool QMetaMethod_invokeOnGadget42(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaMethod_invokeOnGadget14(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return self->invokeOnGadget(gadget, *val0, *val1, *val2); } -bool QMetaMethod_invokeOnGadget52(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaMethod_invokeOnGadget15(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3); } -bool QMetaMethod_invokeOnGadget62(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaMethod_invokeOnGadget16(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3, *val4); } -bool QMetaMethod_invokeOnGadget72(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaMethod_invokeOnGadget17(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaMethod_invokeOnGadget82(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaMethod_invokeOnGadget18(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaMethod_invokeOnGadget92(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaMethod_invokeOnGadget19(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaMethod_invokeOnGadget102(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaMethod_invokeOnGadget20(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaMethod_invokeOnGadget112(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaMethod_invokeOnGadget21(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } @@ -622,23 +622,23 @@ QMetaObject* QMetaProperty_enclosingMetaObject(const QMetaProperty* self) { return (QMetaObject*) self->enclosingMetaObject(); } -bool QMetaProperty_isDesignable1(const QMetaProperty* self, QObject* obj) { +bool QMetaProperty_isDesignableWithObj(const QMetaProperty* self, QObject* obj) { return self->isDesignable(obj); } -bool QMetaProperty_isScriptable1(const QMetaProperty* self, QObject* obj) { +bool QMetaProperty_isScriptableWithObj(const QMetaProperty* self, QObject* obj) { return self->isScriptable(obj); } -bool QMetaProperty_isStored1(const QMetaProperty* self, QObject* obj) { +bool QMetaProperty_isStoredWithObj(const QMetaProperty* self, QObject* obj) { return self->isStored(obj); } -bool QMetaProperty_isEditable1(const QMetaProperty* self, QObject* obj) { +bool QMetaProperty_isEditableWithObj(const QMetaProperty* self, QObject* obj) { return self->isEditable(obj); } -bool QMetaProperty_isUser1(const QMetaProperty* self, QObject* obj) { +bool QMetaProperty_isUserWithObj(const QMetaProperty* self, QObject* obj) { return self->isUser(obj); } diff --git a/qt/gen_qmetaobject.go b/qt/gen_qmetaobject.go index 4abab0dd..67c83e0d 100644 --- a/qt/gen_qmetaobject.go +++ b/qt/gen_qmetaobject.go @@ -240,204 +240,204 @@ func (this *QMetaMethod) Invoke13(object *QObject, connectionType ConnectionType return (bool)(C.QMetaMethod_invoke13(this.h, object.cPointer(), (C.int)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func (this *QMetaMethod) Invoke32(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke32(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer())) +func (this *QMetaMethod) Invoke14(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke14(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer())) } -func (this *QMetaMethod) Invoke42(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke42(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer())) +func (this *QMetaMethod) Invoke15(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke15(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer())) } -func (this *QMetaMethod) Invoke52(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke52(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) +func (this *QMetaMethod) Invoke16(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke16(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func (this *QMetaMethod) Invoke62(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke62(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) +func (this *QMetaMethod) Invoke17(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke17(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func (this *QMetaMethod) Invoke72(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke72(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) +func (this *QMetaMethod) Invoke18(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke18(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func (this *QMetaMethod) Invoke82(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke82(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) +func (this *QMetaMethod) Invoke19(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke19(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func (this *QMetaMethod) Invoke92(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke92(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) +func (this *QMetaMethod) Invoke20(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke20(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func (this *QMetaMethod) Invoke102(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke102(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) +func (this *QMetaMethod) Invoke21(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke21(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func (this *QMetaMethod) Invoke112(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke112(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) +func (this *QMetaMethod) Invoke22(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke22(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func (this *QMetaMethod) Invoke122(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke122(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) +func (this *QMetaMethod) Invoke23(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke23(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func (this *QMetaMethod) Invoke33(object *QObject, connectionType ConnectionType, val0 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke33(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer())) +func (this *QMetaMethod) Invoke24(object *QObject, connectionType ConnectionType, val0 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke24(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer())) } -func (this *QMetaMethod) Invoke43(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke43(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer())) +func (this *QMetaMethod) Invoke25(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke25(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer())) } -func (this *QMetaMethod) Invoke53(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke53(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer())) +func (this *QMetaMethod) Invoke26(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke26(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func (this *QMetaMethod) Invoke63(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke63(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) +func (this *QMetaMethod) Invoke27(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke27(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func (this *QMetaMethod) Invoke73(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke73(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) +func (this *QMetaMethod) Invoke28(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke28(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func (this *QMetaMethod) Invoke83(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke83(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) +func (this *QMetaMethod) Invoke29(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke29(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func (this *QMetaMethod) Invoke93(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke93(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) +func (this *QMetaMethod) Invoke30(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke30(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func (this *QMetaMethod) Invoke103(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke103(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) +func (this *QMetaMethod) Invoke31(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke31(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func (this *QMetaMethod) Invoke113(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke113(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) +func (this *QMetaMethod) Invoke32(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke32(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func (this *QMetaMethod) Invoke123(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke123(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) +func (this *QMetaMethod) Invoke33(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke33(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func (this *QMetaMethod) Invoke22(object *QObject, val0 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke22(this.h, object.cPointer(), val0.cPointer())) +func (this *QMetaMethod) Invoke34(object *QObject, val0 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke34(this.h, object.cPointer(), val0.cPointer())) } -func (this *QMetaMethod) Invoke34(object *QObject, val0 QGenericArgument, val1 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke34(this.h, object.cPointer(), val0.cPointer(), val1.cPointer())) +func (this *QMetaMethod) Invoke35(object *QObject, val0 QGenericArgument, val1 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke35(this.h, object.cPointer(), val0.cPointer(), val1.cPointer())) } -func (this *QMetaMethod) Invoke44(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke44(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) +func (this *QMetaMethod) Invoke36(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke36(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func (this *QMetaMethod) Invoke54(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke54(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) +func (this *QMetaMethod) Invoke37(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke37(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func (this *QMetaMethod) Invoke64(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke64(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) +func (this *QMetaMethod) Invoke38(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke38(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func (this *QMetaMethod) Invoke74(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke74(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) +func (this *QMetaMethod) Invoke39(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke39(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func (this *QMetaMethod) Invoke84(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke84(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) +func (this *QMetaMethod) Invoke40(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke40(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func (this *QMetaMethod) Invoke94(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke94(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) +func (this *QMetaMethod) Invoke41(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke41(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func (this *QMetaMethod) Invoke104(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke104(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) +func (this *QMetaMethod) Invoke42(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke42(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func (this *QMetaMethod) Invoke114(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke114(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) +func (this *QMetaMethod) Invoke43(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke43(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget3(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget3(this.h, gadget, returnValue.cPointer(), val0.cPointer())) +func (this *QMetaMethod) InvokeOnGadget2(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget2(this.h, gadget, returnValue.cPointer(), val0.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget4(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget4(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer())) +func (this *QMetaMethod) InvokeOnGadget3(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget3(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget5(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget5(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) +func (this *QMetaMethod) InvokeOnGadget4(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget4(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget6(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget6(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) +func (this *QMetaMethod) InvokeOnGadget5(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget5(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget7(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget7(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) +func (this *QMetaMethod) InvokeOnGadget6(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget6(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget8(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget8(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) +func (this *QMetaMethod) InvokeOnGadget7(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget7(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget9(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget9(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) +func (this *QMetaMethod) InvokeOnGadget8(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget8(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget10(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget10(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) +func (this *QMetaMethod) InvokeOnGadget9(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget9(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget11(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget11(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) +func (this *QMetaMethod) InvokeOnGadget10(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget10(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget12(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget12(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) +func (this *QMetaMethod) InvokeOnGadget11(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget11(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget2(gadget unsafe.Pointer, val0 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget2(this.h, gadget, val0.cPointer())) +func (this *QMetaMethod) InvokeOnGadget12(gadget unsafe.Pointer, val0 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget12(this.h, gadget, val0.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget32(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget32(this.h, gadget, val0.cPointer(), val1.cPointer())) +func (this *QMetaMethod) InvokeOnGadget13(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget13(this.h, gadget, val0.cPointer(), val1.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget42(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget42(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer())) +func (this *QMetaMethod) InvokeOnGadget14(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget14(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget52(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget52(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) +func (this *QMetaMethod) InvokeOnGadget15(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget15(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget62(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget62(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) +func (this *QMetaMethod) InvokeOnGadget16(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget16(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget72(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget72(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) +func (this *QMetaMethod) InvokeOnGadget17(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget17(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget82(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget82(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) +func (this *QMetaMethod) InvokeOnGadget18(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget18(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget92(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget92(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) +func (this *QMetaMethod) InvokeOnGadget19(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget19(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget102(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget102(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) +func (this *QMetaMethod) InvokeOnGadget20(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget20(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget112(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget112(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) +func (this *QMetaMethod) InvokeOnGadget21(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget21(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } // Delete this object from C++ memory. @@ -772,24 +772,24 @@ func (this *QMetaProperty) EnclosingMetaObject() *QMetaObject { return newQMetaObject(C.QMetaProperty_enclosingMetaObject(this.h)) } -func (this *QMetaProperty) IsDesignable1(obj *QObject) bool { - return (bool)(C.QMetaProperty_isDesignable1(this.h, obj.cPointer())) +func (this *QMetaProperty) IsDesignableWithObj(obj *QObject) bool { + return (bool)(C.QMetaProperty_isDesignableWithObj(this.h, obj.cPointer())) } -func (this *QMetaProperty) IsScriptable1(obj *QObject) bool { - return (bool)(C.QMetaProperty_isScriptable1(this.h, obj.cPointer())) +func (this *QMetaProperty) IsScriptableWithObj(obj *QObject) bool { + return (bool)(C.QMetaProperty_isScriptableWithObj(this.h, obj.cPointer())) } -func (this *QMetaProperty) IsStored1(obj *QObject) bool { - return (bool)(C.QMetaProperty_isStored1(this.h, obj.cPointer())) +func (this *QMetaProperty) IsStoredWithObj(obj *QObject) bool { + return (bool)(C.QMetaProperty_isStoredWithObj(this.h, obj.cPointer())) } -func (this *QMetaProperty) IsEditable1(obj *QObject) bool { - return (bool)(C.QMetaProperty_isEditable1(this.h, obj.cPointer())) +func (this *QMetaProperty) IsEditableWithObj(obj *QObject) bool { + return (bool)(C.QMetaProperty_isEditableWithObj(this.h, obj.cPointer())) } -func (this *QMetaProperty) IsUser1(obj *QObject) bool { - return (bool)(C.QMetaProperty_isUser1(this.h, obj.cPointer())) +func (this *QMetaProperty) IsUserWithObj(obj *QObject) bool { + return (bool)(C.QMetaProperty_isUserWithObj(this.h, obj.cPointer())) } // Delete this object from C++ memory. diff --git a/qt/gen_qmetaobject.h b/qt/gen_qmetaobject.h index 0fd84880..3c824d95 100644 --- a/qt/gen_qmetaobject.h +++ b/qt/gen_qmetaobject.h @@ -71,56 +71,56 @@ bool QMetaMethod_invoke10(const QMetaMethod* self, QObject* object, int connecti bool QMetaMethod_invoke11(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); bool QMetaMethod_invoke12(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); bool QMetaMethod_invoke13(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaMethod_invoke32(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0); -bool QMetaMethod_invoke42(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaMethod_invoke52(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaMethod_invoke62(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaMethod_invoke72(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaMethod_invoke82(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaMethod_invoke92(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaMethod_invoke102(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaMethod_invoke112(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaMethod_invoke122(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaMethod_invoke33(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0); -bool QMetaMethod_invoke43(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaMethod_invoke53(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaMethod_invoke63(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaMethod_invoke73(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaMethod_invoke83(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaMethod_invoke93(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaMethod_invoke103(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaMethod_invoke113(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaMethod_invoke123(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaMethod_invoke22(const QMetaMethod* self, QObject* object, QGenericArgument* val0); -bool QMetaMethod_invoke34(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaMethod_invoke44(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaMethod_invoke54(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaMethod_invoke64(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaMethod_invoke74(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaMethod_invoke84(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaMethod_invoke94(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaMethod_invoke104(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaMethod_invoke114(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaMethod_invokeOnGadget3(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0); -bool QMetaMethod_invokeOnGadget4(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaMethod_invokeOnGadget5(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaMethod_invokeOnGadget6(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaMethod_invokeOnGadget7(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaMethod_invokeOnGadget8(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaMethod_invokeOnGadget9(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaMethod_invokeOnGadget10(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaMethod_invokeOnGadget11(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaMethod_invokeOnGadget12(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaMethod_invokeOnGadget2(const QMetaMethod* self, void* gadget, QGenericArgument* val0); -bool QMetaMethod_invokeOnGadget32(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaMethod_invokeOnGadget42(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaMethod_invokeOnGadget52(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaMethod_invokeOnGadget62(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaMethod_invokeOnGadget72(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaMethod_invokeOnGadget82(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaMethod_invokeOnGadget92(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaMethod_invokeOnGadget102(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaMethod_invokeOnGadget112(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaMethod_invoke14(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0); +bool QMetaMethod_invoke15(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaMethod_invoke16(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaMethod_invoke17(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaMethod_invoke18(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaMethod_invoke19(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaMethod_invoke20(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaMethod_invoke21(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaMethod_invoke22(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaMethod_invoke23(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaMethod_invoke24(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0); +bool QMetaMethod_invoke25(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaMethod_invoke26(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaMethod_invoke27(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaMethod_invoke28(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaMethod_invoke29(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaMethod_invoke30(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaMethod_invoke31(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaMethod_invoke32(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaMethod_invoke33(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaMethod_invoke34(const QMetaMethod* self, QObject* object, QGenericArgument* val0); +bool QMetaMethod_invoke35(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaMethod_invoke36(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaMethod_invoke37(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaMethod_invoke38(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaMethod_invoke39(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaMethod_invoke40(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaMethod_invoke41(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaMethod_invoke42(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaMethod_invoke43(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaMethod_invokeOnGadget2(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0); +bool QMetaMethod_invokeOnGadget3(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaMethod_invokeOnGadget4(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaMethod_invokeOnGadget5(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaMethod_invokeOnGadget6(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaMethod_invokeOnGadget7(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaMethod_invokeOnGadget8(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaMethod_invokeOnGadget9(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaMethod_invokeOnGadget10(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaMethod_invokeOnGadget11(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaMethod_invokeOnGadget12(const QMetaMethod* self, void* gadget, QGenericArgument* val0); +bool QMetaMethod_invokeOnGadget13(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaMethod_invokeOnGadget14(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaMethod_invokeOnGadget15(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaMethod_invokeOnGadget16(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaMethod_invokeOnGadget17(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaMethod_invokeOnGadget18(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaMethod_invokeOnGadget19(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaMethod_invokeOnGadget20(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaMethod_invokeOnGadget21(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); void QMetaMethod_delete(QMetaMethod* self); QMetaEnum* QMetaEnum_new(); @@ -177,11 +177,11 @@ bool QMetaProperty_resetOnGadget(const QMetaProperty* self, void* gadget); bool QMetaProperty_hasStdCppSet(const QMetaProperty* self); bool QMetaProperty_isValid(const QMetaProperty* self); QMetaObject* QMetaProperty_enclosingMetaObject(const QMetaProperty* self); -bool QMetaProperty_isDesignable1(const QMetaProperty* self, QObject* obj); -bool QMetaProperty_isScriptable1(const QMetaProperty* self, QObject* obj); -bool QMetaProperty_isStored1(const QMetaProperty* self, QObject* obj); -bool QMetaProperty_isEditable1(const QMetaProperty* self, QObject* obj); -bool QMetaProperty_isUser1(const QMetaProperty* self, QObject* obj); +bool QMetaProperty_isDesignableWithObj(const QMetaProperty* self, QObject* obj); +bool QMetaProperty_isScriptableWithObj(const QMetaProperty* self, QObject* obj); +bool QMetaProperty_isStoredWithObj(const QMetaProperty* self, QObject* obj); +bool QMetaProperty_isEditableWithObj(const QMetaProperty* self, QObject* obj); +bool QMetaProperty_isUserWithObj(const QMetaProperty* self, QObject* obj); void QMetaProperty_delete(QMetaProperty* self); QMetaClassInfo* QMetaClassInfo_new(); diff --git a/qt/gen_qmetatype.cpp b/qt/gen_qmetatype.cpp index f8eec58f..6ade3c6d 100644 --- a/qt/gen_qmetatype.cpp +++ b/qt/gen_qmetatype.cpp @@ -167,11 +167,11 @@ bool QMetaType_hasRegisteredConverterFunction(int fromTypeId, int toTypeId) { return QMetaType::hasRegisteredConverterFunction(static_cast(fromTypeId), static_cast(toTypeId)); } -void* QMetaType_create22(int type, const void* copy) { +void* QMetaType_create3(int type, const void* copy) { return QMetaType::create(static_cast(type), copy); } -void* QMetaType_create1(const QMetaType* self, const void* copy) { +void* QMetaType_createWithCopy(const QMetaType* self, const void* copy) { return self->create(copy); } diff --git a/qt/gen_qmetatype.go b/qt/gen_qmetatype.go index 70179d11..8986a566 100644 --- a/qt/gen_qmetatype.go +++ b/qt/gen_qmetatype.go @@ -349,12 +349,12 @@ func QMetaType_HasRegisteredConverterFunction(fromTypeId int, toTypeId int) bool return (bool)(C.QMetaType_hasRegisteredConverterFunction((C.int)(fromTypeId), (C.int)(toTypeId))) } -func QMetaType_Create22(typeVal int, copyVal unsafe.Pointer) unsafe.Pointer { - return (unsafe.Pointer)(C.QMetaType_create22((C.int)(typeVal), copyVal)) +func QMetaType_Create3(typeVal int, copyVal unsafe.Pointer) unsafe.Pointer { + return (unsafe.Pointer)(C.QMetaType_create3((C.int)(typeVal), copyVal)) } -func (this *QMetaType) Create1(copyVal unsafe.Pointer) unsafe.Pointer { - return (unsafe.Pointer)(C.QMetaType_create1(this.h, copyVal)) +func (this *QMetaType) CreateWithCopy(copyVal unsafe.Pointer) unsafe.Pointer { + return (unsafe.Pointer)(C.QMetaType_createWithCopy(this.h, copyVal)) } func (this *QMetaType) Construct2(where unsafe.Pointer, copyVal unsafe.Pointer) unsafe.Pointer { diff --git a/qt/gen_qmetatype.h b/qt/gen_qmetatype.h index 60369972..54e767b7 100644 --- a/qt/gen_qmetatype.h +++ b/qt/gen_qmetatype.h @@ -62,8 +62,8 @@ bool QMetaType_compare(const void* lhs, const void* rhs, int typeId, int* result bool QMetaType_equals(const void* lhs, const void* rhs, int typeId, int* result); bool QMetaType_debugStream(QDebug* dbg, const void* rhs, int typeId); bool QMetaType_hasRegisteredConverterFunction(int fromTypeId, int toTypeId); -void* QMetaType_create22(int type, const void* copy); -void* QMetaType_create1(const QMetaType* self, const void* copy); +void* QMetaType_create3(int type, const void* copy); +void* QMetaType_createWithCopy(const QMetaType* self, const void* copy); void* QMetaType_construct2(const QMetaType* self, void* where, const void* copy); void QMetaType_delete(QMetaType* self); diff --git a/qt/gen_qmimedatabase.cpp b/qt/gen_qmimedatabase.cpp index e0b3a34b..7917c9c0 100644 --- a/qt/gen_qmimedatabase.cpp +++ b/qt/gen_qmimedatabase.cpp @@ -105,7 +105,7 @@ QMimeType* QMimeDatabase_mimeTypeForFile2(const QMimeDatabase* self, struct miqt return new QMimeType(self->mimeTypeForFile(fileName_QString, static_cast(mode))); } -QMimeType* QMimeDatabase_mimeTypeForFile22(const QMimeDatabase* self, QFileInfo* fileInfo, int mode) { +QMimeType* QMimeDatabase_mimeTypeForFile3(const QMimeDatabase* self, QFileInfo* fileInfo, int mode) { return new QMimeType(self->mimeTypeForFile(*fileInfo, static_cast(mode))); } diff --git a/qt/gen_qmimedatabase.go b/qt/gen_qmimedatabase.go index da47cf32..a8d60bca 100644 --- a/qt/gen_qmimedatabase.go +++ b/qt/gen_qmimedatabase.go @@ -186,8 +186,8 @@ func (this *QMimeDatabase) MimeTypeForFile2(fileName string, mode QMimeDatabase_ return _goptr } -func (this *QMimeDatabase) MimeTypeForFile22(fileInfo *QFileInfo, mode QMimeDatabase__MatchMode) *QMimeType { - _goptr := newQMimeType(C.QMimeDatabase_mimeTypeForFile22(this.h, fileInfo.cPointer(), (C.int)(mode))) +func (this *QMimeDatabase) MimeTypeForFile3(fileInfo *QFileInfo, mode QMimeDatabase__MatchMode) *QMimeType { + _goptr := newQMimeType(C.QMimeDatabase_mimeTypeForFile3(this.h, fileInfo.cPointer(), (C.int)(mode))) _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 ef61d781..6592ce99 100644 --- a/qt/gen_qmimedatabase.h +++ b/qt/gen_qmimedatabase.h @@ -41,7 +41,7 @@ QMimeType* QMimeDatabase_mimeTypeForFileNameAndData2(const QMimeDatabase* self, struct miqt_string QMimeDatabase_suffixForFileName(const QMimeDatabase* self, struct miqt_string fileName); struct miqt_array /* of QMimeType* */ QMimeDatabase_allMimeTypes(const QMimeDatabase* self); QMimeType* QMimeDatabase_mimeTypeForFile2(const QMimeDatabase* self, struct miqt_string fileName, int mode); -QMimeType* QMimeDatabase_mimeTypeForFile22(const QMimeDatabase* self, QFileInfo* fileInfo, int mode); +QMimeType* QMimeDatabase_mimeTypeForFile3(const QMimeDatabase* self, QFileInfo* fileInfo, int mode); void QMimeDatabase_delete(QMimeDatabase* self); #ifdef __cplusplus diff --git a/qt/gen_qmutex.cpp b/qt/gen_qmutex.cpp index de39d3dd..8145ee7b 100644 --- a/qt/gen_qmutex.cpp +++ b/qt/gen_qmutex.cpp @@ -77,7 +77,7 @@ bool QMutex_isRecursive(const QMutex* self) { return self->isRecursive(); } -bool QMutex_tryLock1(QMutex* self, int timeout) { +bool QMutex_tryLockWithTimeout(QMutex* self, int timeout) { return self->tryLock(static_cast(timeout)); } diff --git a/qt/gen_qmutex.go b/qt/gen_qmutex.go index 3a558e4a..61e1d106 100644 --- a/qt/gen_qmutex.go +++ b/qt/gen_qmutex.go @@ -164,8 +164,8 @@ func (this *QMutex) IsRecursive() bool { return (bool)(C.QMutex_isRecursive(this.h)) } -func (this *QMutex) TryLock1(timeout int) bool { - return (bool)(C.QMutex_tryLock1(this.h, (C.int)(timeout))) +func (this *QMutex) TryLockWithTimeout(timeout int) bool { + return (bool)(C.QMutex_tryLockWithTimeout(this.h, (C.int)(timeout))) } // Delete this object from C++ memory. diff --git a/qt/gen_qmutex.h b/qt/gen_qmutex.h index af3ac830..c8fad88f 100644 --- a/qt/gen_qmutex.h +++ b/qt/gen_qmutex.h @@ -43,7 +43,7 @@ bool QMutex_tryLock(QMutex* self); void QMutex_unlock(QMutex* self); bool QMutex_tryLock2(QMutex* self); bool QMutex_isRecursive(const QMutex* self); -bool QMutex_tryLock1(QMutex* self, int timeout); +bool QMutex_tryLockWithTimeout(QMutex* self, int timeout); void QMutex_delete(QMutex* self); QRecursiveMutex* QRecursiveMutex_new(); diff --git a/qt/gen_qobject.cpp b/qt/gen_qobject.cpp index 3ff3cbe2..0c91464e 100644 --- a/qt/gen_qobject.cpp +++ b/qt/gen_qobject.cpp @@ -23,7 +23,7 @@ extern "C" { #endif void miqt_exec_callback_QObject_destroyed(intptr_t); -void miqt_exec_callback_QObject_destroyed1(intptr_t, QObject*); +void miqt_exec_callback_QObject_destroyedWithQObject(intptr_t, QObject*); bool miqt_exec_callback_QObject_event(QObject*, intptr_t, QEvent*); bool miqt_exec_callback_QObject_eventFilter(QObject*, intptr_t, QObject*, QEvent*); void miqt_exec_callback_QObject_timerEvent(QObject*, intptr_t, QTimerEvent*); @@ -454,7 +454,7 @@ int QObject_startTimer2(QObject* self, int interval, int timerType) { return self->startTimer(static_cast(interval), static_cast(timerType)); } -QMetaObject__Connection* QObject_connect5(QObject* sender, QMetaMethod* signal, QObject* receiver, QMetaMethod* method, int type) { +QMetaObject__Connection* QObject_connect3(QObject* sender, QMetaMethod* signal, QObject* receiver, QMetaMethod* method, int type) { return new QMetaObject::Connection(QObject::connect(sender, *signal, receiver, *method, static_cast(type))); } @@ -462,14 +462,14 @@ QMetaObject__Connection* QObject_connect4(const QObject* self, QObject* sender, return new QMetaObject::Connection(self->connect(sender, signal, member, static_cast(type))); } -void QObject_destroyed1(QObject* self, QObject* param1) { +void QObject_destroyedWithQObject(QObject* self, QObject* param1) { self->destroyed(param1); } -void QObject_connect_destroyed1(QObject* self, intptr_t slot) { +void QObject_connect_destroyedWithQObject(QObject* self, intptr_t slot) { MiqtVirtualQObject::connect(self, static_cast(&QObject::destroyed), self, [=](QObject* param1) { QObject* sigval1 = param1; - miqt_exec_callback_QObject_destroyed1(slot, sigval1); + miqt_exec_callback_QObject_destroyedWithQObject(slot, sigval1); }); } diff --git a/qt/gen_qobject.go b/qt/gen_qobject.go index 06589be7..42c00467 100644 --- a/qt/gen_qobject.go +++ b/qt/gen_qobject.go @@ -377,8 +377,8 @@ func (this *QObject) StartTimer2(interval int, timerType TimerType) int { return (int)(C.QObject_startTimer2(this.h, (C.int)(interval), (C.int)(timerType))) } -func QObject_Connect5(sender *QObject, signal *QMetaMethod, receiver *QObject, method *QMetaMethod, typeVal ConnectionType) *QMetaObject__Connection { - _goptr := newQMetaObject__Connection(C.QObject_connect5(sender.cPointer(), signal.cPointer(), receiver.cPointer(), method.cPointer(), (C.int)(typeVal))) +func QObject_Connect3(sender *QObject, signal *QMetaMethod, receiver *QObject, method *QMetaMethod, typeVal ConnectionType) *QMetaObject__Connection { + _goptr := newQMetaObject__Connection(C.QObject_connect3(sender.cPointer(), signal.cPointer(), receiver.cPointer(), method.cPointer(), (C.int)(typeVal))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -393,15 +393,15 @@ func (this *QObject) Connect4(sender *QObject, signal string, member string, typ return _goptr } -func (this *QObject) Destroyed1(param1 *QObject) { - C.QObject_destroyed1(this.h, param1.cPointer()) +func (this *QObject) DestroyedWithQObject(param1 *QObject) { + C.QObject_destroyedWithQObject(this.h, param1.cPointer()) } -func (this *QObject) OnDestroyed1(slot func(param1 *QObject)) { - C.QObject_connect_destroyed1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QObject) OnDestroyedWithQObject(slot func(param1 *QObject)) { + C.QObject_connect_destroyedWithQObject(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QObject_destroyed1 -func miqt_exec_callback_QObject_destroyed1(cb C.intptr_t, param1 *C.QObject) { +//export miqt_exec_callback_QObject_destroyedWithQObject +func miqt_exec_callback_QObject_destroyedWithQObject(cb C.intptr_t, param1 *C.QObject) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 *QObject)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qobject.h b/qt/gen_qobject.h index fd0313c4..5e13ce84 100644 --- a/qt/gen_qobject.h +++ b/qt/gen_qobject.h @@ -100,10 +100,10 @@ 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 type); +QMetaObject__Connection* QObject_connect3(QObject* sender, QMetaMethod* signal, QObject* receiver, QMetaMethod* method, int type); QMetaObject__Connection* QObject_connect4(const QObject* self, QObject* sender, const char* signal, const char* member, int type); -void QObject_destroyed1(QObject* self, QObject* param1); -void QObject_connect_destroyed1(QObject* self, intptr_t slot); +void QObject_destroyedWithQObject(QObject* self, QObject* param1); +void QObject_connect_destroyedWithQObject(QObject* self, intptr_t slot); bool QObject_override_virtual_event(void* self, intptr_t slot); bool QObject_virtualbase_event(void* self, QEvent* event); bool QObject_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt/gen_qobjectdefs.cpp b/qt/gen_qobjectdefs.cpp index 45e0e032..53492fd2 100644 --- a/qt/gen_qobjectdefs.cpp +++ b/qt/gen_qobjectdefs.cpp @@ -264,7 +264,7 @@ 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_tr2(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(); @@ -275,11 +275,11 @@ struct miqt_string QMetaObject_tr3(const QMetaObject* self, const char* s, const return _ms; } -QMetaObject__Connection* QMetaObject_connect5(QObject* sender, int signal_index, QObject* receiver, int method_index, int type) { +QMetaObject__Connection* QMetaObject_connect2(QObject* sender, int signal_index, QObject* receiver, int method_index, int type) { return new QMetaObject::Connection(QMetaObject::connect(sender, static_cast(signal_index), receiver, static_cast(method_index), static_cast(type))); } -QMetaObject__Connection* QMetaObject_connect6(QObject* sender, int signal_index, QObject* receiver, int method_index, int type, int* types) { +QMetaObject__Connection* QMetaObject_connect3(QObject* sender, int signal_index, QObject* receiver, int method_index, int type, int* types) { return new QMetaObject::Connection(QMetaObject::connect(sender, static_cast(signal_index), receiver, static_cast(method_index), static_cast(type), static_cast(types))); } @@ -323,127 +323,127 @@ bool QMetaObject_invokeMethod14(QObject* obj, const char* member, int param3, QG return QMetaObject::invokeMethod(obj, member, static_cast(param3), *ret, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaObject_invokeMethod42(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0) { +bool QMetaObject_invokeMethod15(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0) { return QMetaObject::invokeMethod(obj, member, *ret, *val0); } -bool QMetaObject_invokeMethod52(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaObject_invokeMethod16(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1); } -bool QMetaObject_invokeMethod62(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaObject_invokeMethod17(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2); } -bool QMetaObject_invokeMethod72(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaObject_invokeMethod18(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3); } -bool QMetaObject_invokeMethod82(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaObject_invokeMethod19(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3, *val4); } -bool QMetaObject_invokeMethod92(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaObject_invokeMethod20(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaObject_invokeMethod102(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaObject_invokeMethod21(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaObject_invokeMethod112(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaObject_invokeMethod22(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaObject_invokeMethod122(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaObject_invokeMethod23(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaObject_invokeMethod132(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaObject_invokeMethod24(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaObject_invokeMethod43(QObject* obj, const char* member, int type, QGenericArgument* val0) { +bool QMetaObject_invokeMethod25(QObject* obj, const char* member, int type, QGenericArgument* val0) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0); } -bool QMetaObject_invokeMethod53(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaObject_invokeMethod26(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1); } -bool QMetaObject_invokeMethod63(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaObject_invokeMethod27(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2); } -bool QMetaObject_invokeMethod73(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaObject_invokeMethod28(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3); } -bool QMetaObject_invokeMethod83(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaObject_invokeMethod29(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3, *val4); } -bool QMetaObject_invokeMethod93(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaObject_invokeMethod30(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaObject_invokeMethod103(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaObject_invokeMethod31(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaObject_invokeMethod113(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaObject_invokeMethod32(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaObject_invokeMethod123(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaObject_invokeMethod33(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaObject_invokeMethod133(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaObject_invokeMethod34(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaObject_invokeMethod32(QObject* obj, const char* member, QGenericArgument* val0) { +bool QMetaObject_invokeMethod35(QObject* obj, const char* member, QGenericArgument* val0) { return QMetaObject::invokeMethod(obj, member, *val0); } -bool QMetaObject_invokeMethod44(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaObject_invokeMethod36(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1) { return QMetaObject::invokeMethod(obj, member, *val0, *val1); } -bool QMetaObject_invokeMethod54(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaObject_invokeMethod37(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2); } -bool QMetaObject_invokeMethod64(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaObject_invokeMethod38(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3); } -bool QMetaObject_invokeMethod74(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaObject_invokeMethod39(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3, *val4); } -bool QMetaObject_invokeMethod84(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaObject_invokeMethod40(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaObject_invokeMethod94(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaObject_invokeMethod41(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaObject_invokeMethod104(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaObject_invokeMethod42(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaObject_invokeMethod114(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaObject_invokeMethod43(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaObject_invokeMethod124(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaObject_invokeMethod44(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -QObject* QMetaObject_newInstance1(const QMetaObject* self, QGenericArgument* val0) { +QObject* QMetaObject_newInstanceWithVal0(const QMetaObject* self, QGenericArgument* val0) { return self->newInstance(*val0); } diff --git a/qt/gen_qobjectdefs.go b/qt/gen_qobjectdefs.go index 2e5c850b..7c31a430 100644 --- a/qt/gen_qobjectdefs.go +++ b/qt/gen_qobjectdefs.go @@ -458,25 +458,25 @@ func (this *QMetaObject) NewInstance() *QObject { return newQObject(C.QMetaObject_newInstance(this.h)) } -func (this *QMetaObject) Tr3(s string, c string, n int) string { +func (this *QMetaObject) Tr2(s string, c string, n int) string { s_Cstring := C.CString(s) defer C.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)) + var _ms C.struct_miqt_string = C.QMetaObject_tr2(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 } -func QMetaObject_Connect5(sender *QObject, signal_index int, receiver *QObject, method_index int, typeVal int) *QMetaObject__Connection { - _goptr := newQMetaObject__Connection(C.QMetaObject_connect5(sender.cPointer(), (C.int)(signal_index), receiver.cPointer(), (C.int)(method_index), (C.int)(typeVal))) +func QMetaObject_Connect2(sender *QObject, signal_index int, receiver *QObject, method_index int, typeVal int) *QMetaObject__Connection { + _goptr := newQMetaObject__Connection(C.QMetaObject_connect2(sender.cPointer(), (C.int)(signal_index), receiver.cPointer(), (C.int)(method_index), (C.int)(typeVal))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QMetaObject_Connect6(sender *QObject, signal_index int, receiver *QObject, method_index int, typeVal int, types *int) *QMetaObject__Connection { - _goptr := newQMetaObject__Connection(C.QMetaObject_connect6(sender.cPointer(), (C.int)(signal_index), receiver.cPointer(), (C.int)(method_index), (C.int)(typeVal), (*C.int)(unsafe.Pointer(types)))) +func QMetaObject_Connect3(sender *QObject, signal_index int, receiver *QObject, method_index int, typeVal int, types *int) *QMetaObject__Connection { + _goptr := newQMetaObject__Connection(C.QMetaObject_connect3(sender.cPointer(), (C.int)(signal_index), receiver.cPointer(), (C.int)(method_index), (C.int)(typeVal), (*C.int)(unsafe.Pointer(types)))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -541,188 +541,188 @@ func QMetaObject_InvokeMethod14(obj *QObject, member string, param3 ConnectionTy return (bool)(C.QMetaObject_invokeMethod14(obj.cPointer(), member_Cstring, (C.int)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func QMetaObject_InvokeMethod42(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument) bool { +func QMetaObject_InvokeMethod15(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod42(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer())) + return (bool)(C.QMetaObject_invokeMethod15(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer())) } -func QMetaObject_InvokeMethod52(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { +func QMetaObject_InvokeMethod16(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod52(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer())) + return (bool)(C.QMetaObject_invokeMethod16(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer())) } -func QMetaObject_InvokeMethod62(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { +func QMetaObject_InvokeMethod17(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod62(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) + return (bool)(C.QMetaObject_invokeMethod17(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func QMetaObject_InvokeMethod72(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { +func QMetaObject_InvokeMethod18(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod72(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) + return (bool)(C.QMetaObject_invokeMethod18(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func QMetaObject_InvokeMethod82(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { +func QMetaObject_InvokeMethod19(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod82(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) + return (bool)(C.QMetaObject_invokeMethod19(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func QMetaObject_InvokeMethod92(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { +func QMetaObject_InvokeMethod20(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod92(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) + return (bool)(C.QMetaObject_invokeMethod20(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func QMetaObject_InvokeMethod102(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { +func QMetaObject_InvokeMethod21(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod102(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) + return (bool)(C.QMetaObject_invokeMethod21(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func QMetaObject_InvokeMethod112(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { +func QMetaObject_InvokeMethod22(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod112(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) + return (bool)(C.QMetaObject_invokeMethod22(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func QMetaObject_InvokeMethod122(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { +func QMetaObject_InvokeMethod23(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod122(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) + return (bool)(C.QMetaObject_invokeMethod23(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func QMetaObject_InvokeMethod132(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { +func QMetaObject_InvokeMethod24(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod132(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) + return (bool)(C.QMetaObject_invokeMethod24(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func QMetaObject_InvokeMethod43(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument) bool { +func QMetaObject_InvokeMethod25(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod43(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer())) + return (bool)(C.QMetaObject_invokeMethod25(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer())) } -func QMetaObject_InvokeMethod53(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument) bool { +func QMetaObject_InvokeMethod26(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod53(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer())) + return (bool)(C.QMetaObject_invokeMethod26(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer())) } -func QMetaObject_InvokeMethod63(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { +func QMetaObject_InvokeMethod27(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod63(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer())) + return (bool)(C.QMetaObject_invokeMethod27(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func QMetaObject_InvokeMethod73(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { +func QMetaObject_InvokeMethod28(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod73(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) + return (bool)(C.QMetaObject_invokeMethod28(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func QMetaObject_InvokeMethod83(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { +func QMetaObject_InvokeMethod29(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod83(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) + return (bool)(C.QMetaObject_invokeMethod29(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func QMetaObject_InvokeMethod93(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { +func QMetaObject_InvokeMethod30(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod93(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) + return (bool)(C.QMetaObject_invokeMethod30(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func QMetaObject_InvokeMethod103(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { +func QMetaObject_InvokeMethod31(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod103(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) + return (bool)(C.QMetaObject_invokeMethod31(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func QMetaObject_InvokeMethod113(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { +func QMetaObject_InvokeMethod32(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod113(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) + return (bool)(C.QMetaObject_invokeMethod32(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func QMetaObject_InvokeMethod123(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { +func QMetaObject_InvokeMethod33(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod123(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) + return (bool)(C.QMetaObject_invokeMethod33(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func QMetaObject_InvokeMethod133(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { +func QMetaObject_InvokeMethod34(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod133(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) + return (bool)(C.QMetaObject_invokeMethod34(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func QMetaObject_InvokeMethod32(obj *QObject, member string, val0 QGenericArgument) bool { +func QMetaObject_InvokeMethod35(obj *QObject, member string, val0 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod32(obj.cPointer(), member_Cstring, val0.cPointer())) + return (bool)(C.QMetaObject_invokeMethod35(obj.cPointer(), member_Cstring, val0.cPointer())) } -func QMetaObject_InvokeMethod44(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument) bool { +func QMetaObject_InvokeMethod36(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod44(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer())) + return (bool)(C.QMetaObject_invokeMethod36(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer())) } -func QMetaObject_InvokeMethod54(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { +func QMetaObject_InvokeMethod37(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod54(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer())) + return (bool)(C.QMetaObject_invokeMethod37(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func QMetaObject_InvokeMethod64(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { +func QMetaObject_InvokeMethod38(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod64(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) + return (bool)(C.QMetaObject_invokeMethod38(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func QMetaObject_InvokeMethod74(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { +func QMetaObject_InvokeMethod39(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod74(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) + return (bool)(C.QMetaObject_invokeMethod39(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func QMetaObject_InvokeMethod84(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { +func QMetaObject_InvokeMethod40(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod84(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) + return (bool)(C.QMetaObject_invokeMethod40(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func QMetaObject_InvokeMethod94(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { +func QMetaObject_InvokeMethod41(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod94(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) + return (bool)(C.QMetaObject_invokeMethod41(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func QMetaObject_InvokeMethod104(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { +func QMetaObject_InvokeMethod42(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod104(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) + return (bool)(C.QMetaObject_invokeMethod42(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func QMetaObject_InvokeMethod114(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { +func QMetaObject_InvokeMethod43(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod114(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) + return (bool)(C.QMetaObject_invokeMethod43(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func QMetaObject_InvokeMethod124(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { +func QMetaObject_InvokeMethod44(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod124(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) + return (bool)(C.QMetaObject_invokeMethod44(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func (this *QMetaObject) NewInstance1(val0 QGenericArgument) *QObject { - return newQObject(C.QMetaObject_newInstance1(this.h, val0.cPointer())) +func (this *QMetaObject) NewInstanceWithVal0(val0 QGenericArgument) *QObject { + return newQObject(C.QMetaObject_newInstanceWithVal0(this.h, val0.cPointer())) } func (this *QMetaObject) NewInstance2(val0 QGenericArgument, val1 QGenericArgument) *QObject { diff --git a/qt/gen_qobjectdefs.h b/qt/gen_qobjectdefs.h index 94b26b97..c2b7a4e1 100644 --- a/qt/gen_qobjectdefs.h +++ b/qt/gen_qobjectdefs.h @@ -104,9 +104,9 @@ bool QMetaObject_invokeMethod2(QObject* obj, const char* member, QGenericReturnA bool QMetaObject_invokeMethod3(QObject* obj, const char* member, int type); 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); -QMetaObject__Connection* QMetaObject_connect5(QObject* sender, int signal_index, QObject* receiver, int method_index, int type); -QMetaObject__Connection* QMetaObject_connect6(QObject* sender, int signal_index, QObject* receiver, int method_index, int type, int* types); +struct miqt_string QMetaObject_tr2(const QMetaObject* self, const char* s, const char* c, int n); +QMetaObject__Connection* QMetaObject_connect2(QObject* sender, int signal_index, QObject* receiver, int method_index, int type); +QMetaObject__Connection* QMetaObject_connect3(QObject* sender, int signal_index, QObject* receiver, int method_index, int type, int* types); bool QMetaObject_invokeMethod5(QObject* obj, const char* member, int param3, QGenericReturnArgument* ret, QGenericArgument* val0); bool QMetaObject_invokeMethod6(QObject* obj, const char* member, int param3, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1); bool QMetaObject_invokeMethod7(QObject* obj, const char* member, int param3, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); @@ -117,37 +117,37 @@ bool QMetaObject_invokeMethod11(QObject* obj, const char* member, int param3, QG bool QMetaObject_invokeMethod12(QObject* obj, const char* member, int param3, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); bool QMetaObject_invokeMethod13(QObject* obj, const char* member, int param3, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); bool QMetaObject_invokeMethod14(QObject* obj, const char* member, int param3, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaObject_invokeMethod42(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0); -bool QMetaObject_invokeMethod52(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaObject_invokeMethod62(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaObject_invokeMethod72(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaObject_invokeMethod82(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaObject_invokeMethod92(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaObject_invokeMethod102(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaObject_invokeMethod112(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaObject_invokeMethod122(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaObject_invokeMethod132(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaObject_invokeMethod43(QObject* obj, const char* member, int type, QGenericArgument* val0); -bool QMetaObject_invokeMethod53(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaObject_invokeMethod63(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaObject_invokeMethod73(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaObject_invokeMethod83(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaObject_invokeMethod93(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaObject_invokeMethod103(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaObject_invokeMethod113(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaObject_invokeMethod123(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaObject_invokeMethod133(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaObject_invokeMethod32(QObject* obj, const char* member, QGenericArgument* val0); -bool QMetaObject_invokeMethod44(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaObject_invokeMethod54(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaObject_invokeMethod64(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaObject_invokeMethod74(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaObject_invokeMethod84(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaObject_invokeMethod94(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaObject_invokeMethod104(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaObject_invokeMethod114(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaObject_invokeMethod124(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -QObject* QMetaObject_newInstance1(const QMetaObject* self, QGenericArgument* val0); +bool QMetaObject_invokeMethod15(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0); +bool QMetaObject_invokeMethod16(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaObject_invokeMethod17(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaObject_invokeMethod18(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaObject_invokeMethod19(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaObject_invokeMethod20(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaObject_invokeMethod21(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaObject_invokeMethod22(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaObject_invokeMethod23(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaObject_invokeMethod24(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaObject_invokeMethod25(QObject* obj, const char* member, int type, QGenericArgument* val0); +bool QMetaObject_invokeMethod26(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaObject_invokeMethod27(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaObject_invokeMethod28(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaObject_invokeMethod29(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaObject_invokeMethod30(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaObject_invokeMethod31(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaObject_invokeMethod32(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaObject_invokeMethod33(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaObject_invokeMethod34(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaObject_invokeMethod35(QObject* obj, const char* member, QGenericArgument* val0); +bool QMetaObject_invokeMethod36(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaObject_invokeMethod37(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaObject_invokeMethod38(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaObject_invokeMethod39(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaObject_invokeMethod40(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaObject_invokeMethod41(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaObject_invokeMethod42(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaObject_invokeMethod43(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaObject_invokeMethod44(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +QObject* QMetaObject_newInstanceWithVal0(const QMetaObject* self, QGenericArgument* val0); QObject* QMetaObject_newInstance2(const QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1); QObject* QMetaObject_newInstance3(const QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); QObject* QMetaObject_newInstance4(const QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); diff --git a/qt/gen_qpagesize.cpp b/qt/gen_qpagesize.cpp index ca0e0cf0..fed5e3bc 100644 --- a/qt/gen_qpagesize.cpp +++ b/qt/gen_qpagesize.cpp @@ -199,12 +199,12 @@ QSize* QPageSize_sizePixels2(int pageSizeId, int resolution) { return new QSize(QPageSize::sizePixels(static_cast(pageSizeId), static_cast(resolution))); } -int QPageSize_id22(QSize* pointSize, int matchPolicy) { +int QPageSize_id3(QSize* pointSize, int matchPolicy) { QPageSize::PageSizeId _ret = QPageSize::id(*pointSize, static_cast(matchPolicy)); return static_cast(_ret); } -int QPageSize_id3(QSizeF* size, int units, int matchPolicy) { +int QPageSize_id4(QSizeF* size, int units, int matchPolicy) { QPageSize::PageSizeId _ret = QPageSize::id(*size, static_cast(units), static_cast(matchPolicy)); return static_cast(_ret); } diff --git a/qt/gen_qpagesize.go b/qt/gen_qpagesize.go index 27059f90..2a93455d 100644 --- a/qt/gen_qpagesize.go +++ b/qt/gen_qpagesize.go @@ -408,12 +408,12 @@ func QPageSize_SizePixels2(pageSizeId QPageSize__PageSizeId, resolution int) *QS return _goptr } -func QPageSize_Id22(pointSize *QSize, matchPolicy QPageSize__SizeMatchPolicy) QPageSize__PageSizeId { - return (QPageSize__PageSizeId)(C.QPageSize_id22(pointSize.cPointer(), (C.int)(matchPolicy))) +func QPageSize_Id3(pointSize *QSize, matchPolicy QPageSize__SizeMatchPolicy) QPageSize__PageSizeId { + return (QPageSize__PageSizeId)(C.QPageSize_id3(pointSize.cPointer(), (C.int)(matchPolicy))) } -func QPageSize_Id3(size *QSizeF, units QPageSize__Unit, matchPolicy QPageSize__SizeMatchPolicy) QPageSize__PageSizeId { - return (QPageSize__PageSizeId)(C.QPageSize_id3(size.cPointer(), (C.int)(units), (C.int)(matchPolicy))) +func QPageSize_Id4(size *QSizeF, units QPageSize__Unit, matchPolicy QPageSize__SizeMatchPolicy) QPageSize__PageSizeId { + return (QPageSize__PageSizeId)(C.QPageSize_id4(size.cPointer(), (C.int)(units), (C.int)(matchPolicy))) } // Delete this object from C++ memory. diff --git a/qt/gen_qpagesize.h b/qt/gen_qpagesize.h index c2cca91d..43ae6e29 100644 --- a/qt/gen_qpagesize.h +++ b/qt/gen_qpagesize.h @@ -64,8 +64,8 @@ int QPageSize_definitionUnitsWithPageSizeId(int pageSizeId); QSizeF* QPageSize_size2(int pageSizeId, int units); QSize* QPageSize_sizePointsWithPageSizeId(int pageSizeId); QSize* QPageSize_sizePixels2(int pageSizeId, int resolution); -int QPageSize_id22(QSize* pointSize, int matchPolicy); -int QPageSize_id3(QSizeF* size, int units, int matchPolicy); +int QPageSize_id3(QSize* pointSize, int matchPolicy); +int QPageSize_id4(QSizeF* size, int units, int matchPolicy); void QPageSize_delete(QPageSize* self); #ifdef __cplusplus diff --git a/qt/gen_qpainter.cpp b/qt/gen_qpainter.cpp index ab43d285..69808543 100644 --- a/qt/gen_qpainter.cpp +++ b/qt/gen_qpainter.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -29,6 +28,7 @@ #include #include #include +#include #include #include "gen_qpainter.h" @@ -929,11 +929,11 @@ void QPainter_endNativePainting(QPainter* self) { self->endNativePainting(); } -void QPainter_setClipRect22(QPainter* self, QRectF* param1, int op) { +void QPainter_setClipRect3(QPainter* self, QRectF* param1, int op) { self->setClipRect(*param1, static_cast(op)); } -void QPainter_setClipRect23(QPainter* self, QRect* param1, int op) { +void QPainter_setClipRect4(QPainter* self, QRect* param1, int op) { self->setClipRect(*param1, static_cast(op)); } @@ -965,11 +965,11 @@ void QPainter_setWorldTransform2(QPainter* self, QTransform* matrix, bool combin self->setWorldTransform(*matrix, combine); } -void QPainter_drawPolygon32(QPainter* self, QPointF* points, int pointCount, int fillRule) { +void QPainter_drawPolygon4(QPainter* self, QPointF* points, int pointCount, int fillRule) { self->drawPolygon(points, static_cast(pointCount), static_cast(fillRule)); } -void QPainter_drawPolygon33(QPainter* self, QPoint* points, int pointCount, int fillRule) { +void QPainter_drawPolygon6(QPainter* self, QPoint* points, int pointCount, int fillRule) { self->drawPolygon(points, static_cast(pointCount), static_cast(fillRule)); } @@ -977,19 +977,19 @@ void QPainter_drawRoundedRect4(QPainter* self, QRectF* rect, double xRadius, dou self->drawRoundedRect(*rect, static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } -void QPainter_drawRoundedRect7(QPainter* self, int x, int y, int w, int h, double xRadius, double yRadius, int mode) { +void QPainter_drawRoundedRect5(QPainter* self, int x, int y, int w, int h, double xRadius, double yRadius, int mode) { self->drawRoundedRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } -void QPainter_drawRoundedRect42(QPainter* self, QRect* rect, double xRadius, double yRadius, int mode) { +void QPainter_drawRoundedRect6(QPainter* self, QRect* rect, double xRadius, double yRadius, int mode) { self->drawRoundedRect(*rect, static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } -void QPainter_drawRoundRect22(QPainter* self, QRectF* r, int xround) { +void QPainter_drawRoundRect3(QPainter* self, QRectF* r, int xround) { self->drawRoundRect(*r, static_cast(xround)); } -void QPainter_drawRoundRect3(QPainter* self, QRectF* r, int xround, int yround) { +void QPainter_drawRoundRect4(QPainter* self, QRectF* r, int xround, int yround) { self->drawRoundRect(*r, static_cast(xround), static_cast(yround)); } @@ -1001,91 +1001,91 @@ void QPainter_drawRoundRect6(QPainter* self, int x, int y, int w, int h, int par self->drawRoundRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(param5), static_cast(param6)); } -void QPainter_drawRoundRect23(QPainter* self, QRect* r, int xround) { +void QPainter_drawRoundRect7(QPainter* self, QRect* r, int xround) { self->drawRoundRect(*r, static_cast(xround)); } -void QPainter_drawRoundRect32(QPainter* self, QRect* r, int xround, int yround) { +void QPainter_drawRoundRect8(QPainter* self, QRect* r, int xround, int yround) { self->drawRoundRect(*r, static_cast(xround), static_cast(yround)); } -void QPainter_drawTiledPixmap32(QPainter* self, QRectF* rect, QPixmap* pm, QPointF* offset) { +void QPainter_drawTiledPixmap4(QPainter* self, QRectF* rect, QPixmap* pm, QPointF* offset) { self->drawTiledPixmap(*rect, *pm, *offset); } -void QPainter_drawTiledPixmap6(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx) { +void QPainter_drawTiledPixmap5(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx) { self->drawTiledPixmap(static_cast(x), static_cast(y), static_cast(w), static_cast(h), *param5, static_cast(sx)); } -void QPainter_drawTiledPixmap7(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx, int sy) { +void QPainter_drawTiledPixmap6(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx, int sy) { self->drawTiledPixmap(static_cast(x), static_cast(y), static_cast(w), static_cast(h), *param5, static_cast(sx), static_cast(sy)); } -void QPainter_drawTiledPixmap33(QPainter* self, QRect* param1, QPixmap* param2, QPoint* param3) { +void QPainter_drawTiledPixmap7(QPainter* self, QRect* param1, QPixmap* param2, QPoint* param3) { self->drawTiledPixmap(*param1, *param2, *param3); } -void QPainter_drawPixmapFragments4(QPainter* self, QPainter__PixmapFragment* fragments, int fragmentCount, QPixmap* pixmap, int hints) { +void QPainter_drawPixmapFragments2(QPainter* self, QPainter__PixmapFragment* fragments, int fragmentCount, QPixmap* pixmap, int hints) { self->drawPixmapFragments(fragments, static_cast(fragmentCount), *pixmap, static_cast(hints)); } -void QPainter_drawImage42(QPainter* self, QRectF* targetRect, QImage* image, QRectF* sourceRect, int flags) { +void QPainter_drawImage10(QPainter* self, QRectF* targetRect, QImage* image, QRectF* sourceRect, int flags) { self->drawImage(*targetRect, *image, *sourceRect, static_cast(flags)); } -void QPainter_drawImage43(QPainter* self, QRect* targetRect, QImage* image, QRect* sourceRect, int flags) { +void QPainter_drawImage11(QPainter* self, QRect* targetRect, QImage* image, QRect* sourceRect, int flags) { self->drawImage(*targetRect, *image, *sourceRect, static_cast(flags)); } -void QPainter_drawImage44(QPainter* self, QPointF* p, QImage* image, QRectF* sr, int flags) { +void QPainter_drawImage12(QPainter* self, QPointF* p, QImage* image, QRectF* sr, int flags) { self->drawImage(*p, *image, *sr, static_cast(flags)); } -void QPainter_drawImage45(QPainter* self, QPoint* p, QImage* image, QRect* sr, int flags) { +void QPainter_drawImage13(QPainter* self, QPoint* p, QImage* image, QRect* sr, int flags) { self->drawImage(*p, *image, *sr, static_cast(flags)); } -void QPainter_drawImage46(QPainter* self, int x, int y, QImage* image, int sx) { +void QPainter_drawImage14(QPainter* self, int x, int y, QImage* image, int sx) { self->drawImage(static_cast(x), static_cast(y), *image, static_cast(sx)); } -void QPainter_drawImage52(QPainter* self, int x, int y, QImage* image, int sx, int sy) { +void QPainter_drawImage15(QPainter* self, int x, int y, QImage* image, int sx, int sy) { self->drawImage(static_cast(x), static_cast(y), *image, static_cast(sx), static_cast(sy)); } -void QPainter_drawImage62(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw) { +void QPainter_drawImage16(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw) { self->drawImage(static_cast(x), static_cast(y), *image, static_cast(sx), static_cast(sy), static_cast(sw)); } -void QPainter_drawImage72(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh) { +void QPainter_drawImage17(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh) { self->drawImage(static_cast(x), static_cast(y), *image, static_cast(sx), static_cast(sy), static_cast(sw), static_cast(sh)); } -void QPainter_drawImage82(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh, int flags) { +void QPainter_drawImage18(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh, int flags) { 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) { +void QPainter_drawText9(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) { +void QPainter_drawText10(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) { +void QPainter_drawText11(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) { +void QPainter_drawText12(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) { +QRectF* QPainter_boundingRect5(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)); } @@ -1098,7 +1098,7 @@ void QPainter_setRenderHints2(QPainter* self, int hints, bool on) { self->setRenderHints(static_cast(hints), on); } -void QPainter_setRedirected3(QPaintDevice* device, QPaintDevice* replacement, QPoint* offset) { +void QPainter_setRedirected2(QPaintDevice* device, QPaintDevice* replacement, QPoint* offset) { QPainter::setRedirected(device, replacement, *offset); } @@ -1114,19 +1114,19 @@ QPainter__PixmapFragment* QPainter__PixmapFragment_create(QPointF* pos, QRectF* return new QPainter::PixmapFragment(QPainter::PixmapFragment::create(*pos, *sourceRect)); } -QPainter__PixmapFragment* QPainter__PixmapFragment_create3(QPointF* pos, QRectF* sourceRect, double scaleX) { +QPainter__PixmapFragment* QPainter__PixmapFragment_create2(QPointF* pos, QRectF* sourceRect, double scaleX) { return new QPainter::PixmapFragment(QPainter::PixmapFragment::create(*pos, *sourceRect, static_cast(scaleX))); } -QPainter__PixmapFragment* QPainter__PixmapFragment_create4(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY) { +QPainter__PixmapFragment* QPainter__PixmapFragment_create3(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY) { return new QPainter::PixmapFragment(QPainter::PixmapFragment::create(*pos, *sourceRect, static_cast(scaleX), static_cast(scaleY))); } -QPainter__PixmapFragment* QPainter__PixmapFragment_create5(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation) { +QPainter__PixmapFragment* QPainter__PixmapFragment_create4(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation) { return new QPainter::PixmapFragment(QPainter::PixmapFragment::create(*pos, *sourceRect, static_cast(scaleX), static_cast(scaleY), static_cast(rotation))); } -QPainter__PixmapFragment* QPainter__PixmapFragment_create6(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation, double opacity) { +QPainter__PixmapFragment* QPainter__PixmapFragment_create5(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation, double opacity) { return new QPainter::PixmapFragment(QPainter::PixmapFragment::create(*pos, *sourceRect, static_cast(scaleX), static_cast(scaleY), static_cast(rotation), static_cast(opacity))); } diff --git a/qt/gen_qpainter.go b/qt/gen_qpainter.go index 6ce7fcdf..a1c9e315 100644 --- a/qt/gen_qpainter.go +++ b/qt/gen_qpainter.go @@ -1038,12 +1038,12 @@ func (this *QPainter) EndNativePainting() { C.QPainter_endNativePainting(this.h) } -func (this *QPainter) SetClipRect22(param1 *QRectF, op ClipOperation) { - C.QPainter_setClipRect22(this.h, param1.cPointer(), (C.int)(op)) +func (this *QPainter) SetClipRect3(param1 *QRectF, op ClipOperation) { + C.QPainter_setClipRect3(this.h, param1.cPointer(), (C.int)(op)) } -func (this *QPainter) SetClipRect23(param1 *QRect, op ClipOperation) { - C.QPainter_setClipRect23(this.h, param1.cPointer(), (C.int)(op)) +func (this *QPainter) SetClipRect4(param1 *QRect, op ClipOperation) { + C.QPainter_setClipRect4(this.h, param1.cPointer(), (C.int)(op)) } func (this *QPainter) SetClipRect5(x int, y int, w int, h int, op ClipOperation) { @@ -1074,32 +1074,32 @@ func (this *QPainter) SetWorldTransform2(matrix *QTransform, combine bool) { C.QPainter_setWorldTransform2(this.h, matrix.cPointer(), (C.bool)(combine)) } -func (this *QPainter) DrawPolygon32(points *QPointF, pointCount int, fillRule FillRule) { - C.QPainter_drawPolygon32(this.h, points.cPointer(), (C.int)(pointCount), (C.int)(fillRule)) +func (this *QPainter) DrawPolygon4(points *QPointF, pointCount int, fillRule FillRule) { + C.QPainter_drawPolygon4(this.h, points.cPointer(), (C.int)(pointCount), (C.int)(fillRule)) } -func (this *QPainter) DrawPolygon33(points *QPoint, pointCount int, fillRule FillRule) { - C.QPainter_drawPolygon33(this.h, points.cPointer(), (C.int)(pointCount), (C.int)(fillRule)) +func (this *QPainter) DrawPolygon6(points *QPoint, pointCount int, fillRule FillRule) { + C.QPainter_drawPolygon6(this.h, points.cPointer(), (C.int)(pointCount), (C.int)(fillRule)) } func (this *QPainter) DrawRoundedRect4(rect *QRectF, xRadius float64, yRadius float64, mode SizeMode) { C.QPainter_drawRoundedRect4(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } -func (this *QPainter) DrawRoundedRect7(x int, y int, w int, h int, xRadius float64, yRadius float64, mode SizeMode) { - C.QPainter_drawRoundedRect7(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) +func (this *QPainter) DrawRoundedRect5(x int, y int, w int, h int, xRadius float64, yRadius float64, mode SizeMode) { + C.QPainter_drawRoundedRect5(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } -func (this *QPainter) DrawRoundedRect42(rect *QRect, xRadius float64, yRadius float64, mode SizeMode) { - C.QPainter_drawRoundedRect42(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) +func (this *QPainter) DrawRoundedRect6(rect *QRect, xRadius float64, yRadius float64, mode SizeMode) { + C.QPainter_drawRoundedRect6(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } -func (this *QPainter) DrawRoundRect22(r *QRectF, xround int) { - C.QPainter_drawRoundRect22(this.h, r.cPointer(), (C.int)(xround)) +func (this *QPainter) DrawRoundRect3(r *QRectF, xround int) { + C.QPainter_drawRoundRect3(this.h, r.cPointer(), (C.int)(xround)) } -func (this *QPainter) DrawRoundRect3(r *QRectF, xround int, yround int) { - C.QPainter_drawRoundRect3(this.h, r.cPointer(), (C.int)(xround), (C.int)(yround)) +func (this *QPainter) DrawRoundRect4(r *QRectF, xround int, yround int) { + C.QPainter_drawRoundRect4(this.h, r.cPointer(), (C.int)(xround), (C.int)(yround)) } func (this *QPainter) DrawRoundRect5(x int, y int, w int, h int, param5 int) { @@ -1110,108 +1110,108 @@ func (this *QPainter) DrawRoundRect6(x int, y int, w int, h int, param5 int, par C.QPainter_drawRoundRect6(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(param5), (C.int)(param6)) } -func (this *QPainter) DrawRoundRect23(r *QRect, xround int) { - C.QPainter_drawRoundRect23(this.h, r.cPointer(), (C.int)(xround)) +func (this *QPainter) DrawRoundRect7(r *QRect, xround int) { + C.QPainter_drawRoundRect7(this.h, r.cPointer(), (C.int)(xround)) } -func (this *QPainter) DrawRoundRect32(r *QRect, xround int, yround int) { - C.QPainter_drawRoundRect32(this.h, r.cPointer(), (C.int)(xround), (C.int)(yround)) +func (this *QPainter) DrawRoundRect8(r *QRect, xround int, yround int) { + C.QPainter_drawRoundRect8(this.h, r.cPointer(), (C.int)(xround), (C.int)(yround)) } -func (this *QPainter) DrawTiledPixmap32(rect *QRectF, pm *QPixmap, offset *QPointF) { - C.QPainter_drawTiledPixmap32(this.h, rect.cPointer(), pm.cPointer(), offset.cPointer()) +func (this *QPainter) DrawTiledPixmap4(rect *QRectF, pm *QPixmap, offset *QPointF) { + C.QPainter_drawTiledPixmap4(this.h, rect.cPointer(), pm.cPointer(), offset.cPointer()) } -func (this *QPainter) DrawTiledPixmap6(x int, y int, w int, h int, param5 *QPixmap, sx int) { - C.QPainter_drawTiledPixmap6(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), param5.cPointer(), (C.int)(sx)) +func (this *QPainter) DrawTiledPixmap5(x int, y int, w int, h int, param5 *QPixmap, sx int) { + C.QPainter_drawTiledPixmap5(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), param5.cPointer(), (C.int)(sx)) } -func (this *QPainter) DrawTiledPixmap7(x int, y int, w int, h int, param5 *QPixmap, sx int, sy int) { - C.QPainter_drawTiledPixmap7(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), param5.cPointer(), (C.int)(sx), (C.int)(sy)) +func (this *QPainter) DrawTiledPixmap6(x int, y int, w int, h int, param5 *QPixmap, sx int, sy int) { + C.QPainter_drawTiledPixmap6(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), param5.cPointer(), (C.int)(sx), (C.int)(sy)) } -func (this *QPainter) DrawTiledPixmap33(param1 *QRect, param2 *QPixmap, param3 *QPoint) { - C.QPainter_drawTiledPixmap33(this.h, param1.cPointer(), param2.cPointer(), param3.cPointer()) +func (this *QPainter) DrawTiledPixmap7(param1 *QRect, param2 *QPixmap, param3 *QPoint) { + C.QPainter_drawTiledPixmap7(this.h, param1.cPointer(), param2.cPointer(), param3.cPointer()) } -func (this *QPainter) DrawPixmapFragments4(fragments *QPainter__PixmapFragment, fragmentCount int, pixmap *QPixmap, hints QPainter__PixmapFragmentHint) { - C.QPainter_drawPixmapFragments4(this.h, fragments.cPointer(), (C.int)(fragmentCount), pixmap.cPointer(), (C.int)(hints)) +func (this *QPainter) DrawPixmapFragments2(fragments *QPainter__PixmapFragment, fragmentCount int, pixmap *QPixmap, hints QPainter__PixmapFragmentHint) { + C.QPainter_drawPixmapFragments2(this.h, fragments.cPointer(), (C.int)(fragmentCount), pixmap.cPointer(), (C.int)(hints)) } -func (this *QPainter) DrawImage42(targetRect *QRectF, image *QImage, sourceRect *QRectF, flags ImageConversionFlag) { - C.QPainter_drawImage42(this.h, targetRect.cPointer(), image.cPointer(), sourceRect.cPointer(), (C.int)(flags)) +func (this *QPainter) DrawImage10(targetRect *QRectF, image *QImage, sourceRect *QRectF, flags ImageConversionFlag) { + C.QPainter_drawImage10(this.h, targetRect.cPointer(), image.cPointer(), sourceRect.cPointer(), (C.int)(flags)) } -func (this *QPainter) DrawImage43(targetRect *QRect, image *QImage, sourceRect *QRect, flags ImageConversionFlag) { - C.QPainter_drawImage43(this.h, targetRect.cPointer(), image.cPointer(), sourceRect.cPointer(), (C.int)(flags)) +func (this *QPainter) DrawImage11(targetRect *QRect, image *QImage, sourceRect *QRect, flags ImageConversionFlag) { + C.QPainter_drawImage11(this.h, targetRect.cPointer(), image.cPointer(), sourceRect.cPointer(), (C.int)(flags)) } -func (this *QPainter) DrawImage44(p *QPointF, image *QImage, sr *QRectF, flags ImageConversionFlag) { - C.QPainter_drawImage44(this.h, p.cPointer(), image.cPointer(), sr.cPointer(), (C.int)(flags)) +func (this *QPainter) DrawImage12(p *QPointF, image *QImage, sr *QRectF, flags ImageConversionFlag) { + C.QPainter_drawImage12(this.h, p.cPointer(), image.cPointer(), sr.cPointer(), (C.int)(flags)) } -func (this *QPainter) DrawImage45(p *QPoint, image *QImage, sr *QRect, flags ImageConversionFlag) { - C.QPainter_drawImage45(this.h, p.cPointer(), image.cPointer(), sr.cPointer(), (C.int)(flags)) +func (this *QPainter) DrawImage13(p *QPoint, image *QImage, sr *QRect, flags ImageConversionFlag) { + C.QPainter_drawImage13(this.h, p.cPointer(), image.cPointer(), sr.cPointer(), (C.int)(flags)) } -func (this *QPainter) DrawImage46(x int, y int, image *QImage, sx int) { - C.QPainter_drawImage46(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx)) +func (this *QPainter) DrawImage14(x int, y int, image *QImage, sx int) { + C.QPainter_drawImage14(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx)) } -func (this *QPainter) DrawImage52(x int, y int, image *QImage, sx int, sy int) { - C.QPainter_drawImage52(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy)) +func (this *QPainter) DrawImage15(x int, y int, image *QImage, sx int, sy int) { + C.QPainter_drawImage15(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy)) } -func (this *QPainter) DrawImage62(x int, y int, image *QImage, sx int, sy int, sw int) { - C.QPainter_drawImage62(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw)) +func (this *QPainter) DrawImage16(x int, y int, image *QImage, sx int, sy int, sw int) { + C.QPainter_drawImage16(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw)) } -func (this *QPainter) DrawImage72(x int, y int, image *QImage, sx int, sy int, sw int, sh int) { - C.QPainter_drawImage72(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw), (C.int)(sh)) +func (this *QPainter) DrawImage17(x int, y int, image *QImage, sx int, sy int, sw int, sh int) { + C.QPainter_drawImage17(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw), (C.int)(sh)) } -func (this *QPainter) DrawImage82(x int, y int, image *QImage, sx int, sy int, sw int, sh int, flags ImageConversionFlag) { - C.QPainter_drawImage82(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw), (C.int)(sh), (C.int)(flags)) +func (this *QPainter) DrawImage18(x int, y int, image *QImage, sx int, sy int, sw int, sh int, flags ImageConversionFlag) { + C.QPainter_drawImage18(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw), (C.int)(sh), (C.int)(flags)) } -func (this *QPainter) DrawText42(r *QRectF, flags int, text string, br *QRectF) { +func (this *QPainter) DrawText9(r *QRectF, flags int, text string, br *QRectF) { text_ms := C.struct_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()) + C.QPainter_drawText9(this.h, r.cPointer(), (C.int)(flags), text_ms, br.cPointer()) } -func (this *QPainter) DrawText43(r *QRect, flags int, text string, br *QRect) { +func (this *QPainter) DrawText10(r *QRect, flags int, text string, br *QRect) { text_ms := C.struct_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()) + C.QPainter_drawText10(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) { +func (this *QPainter) DrawText11(x int, y int, w int, h int, flags int, text string, br *QRect) { text_ms := C.struct_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()) + C.QPainter_drawText11(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) { +func (this *QPainter) DrawText12(r *QRectF, text string, o *QTextOption) { text_ms := C.struct_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()) + C.QPainter_drawText12(this.h, r.cPointer(), text_ms, o.cPointer()) } -func (this *QPainter) BoundingRect32(rect *QRectF, text string, o *QTextOption) *QRectF { +func (this *QPainter) BoundingRect5(rect *QRectF, text string, o *QTextOption) *QRectF { text_ms := C.struct_miqt_string{} text_ms.data = C.CString(text) text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - _goptr := newQRectF(C.QPainter_boundingRect32(this.h, rect.cPointer(), text_ms, o.cPointer())) + _goptr := newQRectF(C.QPainter_boundingRect5(this.h, rect.cPointer(), text_ms, o.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1224,8 +1224,8 @@ func (this *QPainter) SetRenderHints2(hints QPainter__RenderHint, on bool) { C.QPainter_setRenderHints2(this.h, (C.int)(hints), (C.bool)(on)) } -func QPainter_SetRedirected3(device *QPaintDevice, replacement *QPaintDevice, offset *QPoint) { - C.QPainter_setRedirected3(device.cPointer(), replacement.cPointer(), offset.cPointer()) +func QPainter_SetRedirected2(device *QPaintDevice, replacement *QPaintDevice, offset *QPoint) { + C.QPainter_setRedirected2(device.cPointer(), replacement.cPointer(), offset.cPointer()) } func QPainter_Redirected2(device *QPaintDevice, offset *QPoint) *QPaintDevice { @@ -1284,26 +1284,26 @@ func QPainter__PixmapFragment_Create(pos *QPointF, sourceRect *QRectF) *QPainter return _goptr } -func QPainter__PixmapFragment_Create3(pos *QPointF, sourceRect *QRectF, scaleX float64) *QPainter__PixmapFragment { - _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create3(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX))) +func QPainter__PixmapFragment_Create2(pos *QPointF, sourceRect *QRectF, scaleX float64) *QPainter__PixmapFragment { + _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create2(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QPainter__PixmapFragment_Create4(pos *QPointF, sourceRect *QRectF, scaleX float64, scaleY float64) *QPainter__PixmapFragment { - _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create4(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX), (C.double)(scaleY))) +func QPainter__PixmapFragment_Create3(pos *QPointF, sourceRect *QRectF, scaleX float64, scaleY float64) *QPainter__PixmapFragment { + _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create3(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX), (C.double)(scaleY))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QPainter__PixmapFragment_Create5(pos *QPointF, sourceRect *QRectF, scaleX float64, scaleY float64, rotation float64) *QPainter__PixmapFragment { - _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create5(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX), (C.double)(scaleY), (C.double)(rotation))) +func QPainter__PixmapFragment_Create4(pos *QPointF, sourceRect *QRectF, scaleX float64, scaleY float64, rotation float64) *QPainter__PixmapFragment { + _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create4(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX), (C.double)(scaleY), (C.double)(rotation))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QPainter__PixmapFragment_Create6(pos *QPointF, sourceRect *QRectF, scaleX float64, scaleY float64, rotation float64, opacity float64) *QPainter__PixmapFragment { - _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create6(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX), (C.double)(scaleY), (C.double)(rotation), (C.double)(opacity))) +func QPainter__PixmapFragment_Create5(pos *QPointF, sourceRect *QRectF, scaleX float64, scaleY float64, rotation float64, opacity float64) *QPainter__PixmapFragment { + _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create5(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX), (C.double)(scaleY), (C.double)(rotation), (C.double)(opacity))) _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 0f1578bf..e7735974 100644 --- a/qt/gen_qpainter.h +++ b/qt/gen_qpainter.h @@ -280,8 +280,8 @@ QPaintDevice* QPainter_redirected(QPaintDevice* device); void QPainter_restoreRedirected(QPaintDevice* device); void QPainter_beginNativePainting(QPainter* self); void QPainter_endNativePainting(QPainter* self); -void QPainter_setClipRect22(QPainter* self, QRectF* param1, int op); -void QPainter_setClipRect23(QPainter* self, QRect* param1, int op); +void QPainter_setClipRect3(QPainter* self, QRectF* param1, int op); +void QPainter_setClipRect4(QPainter* self, QRect* param1, int op); void QPainter_setClipRect5(QPainter* self, int x, int y, int w, int h, int op); void QPainter_setClipRegion2(QPainter* self, QRegion* param1, int op); void QPainter_setClipPath2(QPainter* self, QPainterPath* path, int op); @@ -289,47 +289,47 @@ void QPainter_setMatrix2(QPainter* self, QMatrix* matrix, bool combine); void QPainter_setTransform2(QPainter* self, QTransform* transform, bool combine); void QPainter_setWorldMatrix2(QPainter* self, QMatrix* matrix, bool combine); void QPainter_setWorldTransform2(QPainter* self, QTransform* matrix, bool combine); -void QPainter_drawPolygon32(QPainter* self, QPointF* points, int pointCount, int fillRule); -void QPainter_drawPolygon33(QPainter* self, QPoint* points, int pointCount, int fillRule); +void QPainter_drawPolygon4(QPainter* self, QPointF* points, int pointCount, int fillRule); +void QPainter_drawPolygon6(QPainter* self, QPoint* points, int pointCount, int fillRule); void QPainter_drawRoundedRect4(QPainter* self, QRectF* rect, double xRadius, double yRadius, int mode); -void QPainter_drawRoundedRect7(QPainter* self, int x, int y, int w, int h, double xRadius, double yRadius, int mode); -void QPainter_drawRoundedRect42(QPainter* self, QRect* rect, double xRadius, double yRadius, int mode); -void QPainter_drawRoundRect22(QPainter* self, QRectF* r, int xround); -void QPainter_drawRoundRect3(QPainter* self, QRectF* r, int xround, int yround); +void QPainter_drawRoundedRect5(QPainter* self, int x, int y, int w, int h, double xRadius, double yRadius, int mode); +void QPainter_drawRoundedRect6(QPainter* self, QRect* rect, double xRadius, double yRadius, int mode); +void QPainter_drawRoundRect3(QPainter* self, QRectF* r, int xround); +void QPainter_drawRoundRect4(QPainter* self, QRectF* r, int xround, int yround); void QPainter_drawRoundRect5(QPainter* self, int x, int y, int w, int h, int param5); void QPainter_drawRoundRect6(QPainter* self, int x, int y, int w, int h, int param5, int param6); -void QPainter_drawRoundRect23(QPainter* self, QRect* r, int xround); -void QPainter_drawRoundRect32(QPainter* self, QRect* r, int xround, int yround); -void QPainter_drawTiledPixmap32(QPainter* self, QRectF* rect, QPixmap* pm, QPointF* offset); -void QPainter_drawTiledPixmap6(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx); -void QPainter_drawTiledPixmap7(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx, int sy); -void QPainter_drawTiledPixmap33(QPainter* self, QRect* param1, QPixmap* param2, QPoint* param3); -void QPainter_drawPixmapFragments4(QPainter* self, QPainter__PixmapFragment* fragments, int fragmentCount, QPixmap* pixmap, int hints); -void QPainter_drawImage42(QPainter* self, QRectF* targetRect, QImage* image, QRectF* sourceRect, int flags); -void QPainter_drawImage43(QPainter* self, QRect* targetRect, QImage* image, QRect* sourceRect, int flags); -void QPainter_drawImage44(QPainter* self, QPointF* p, QImage* image, QRectF* sr, int flags); -void QPainter_drawImage45(QPainter* self, QPoint* p, QImage* image, QRect* sr, int flags); -void QPainter_drawImage46(QPainter* self, int x, int y, QImage* image, int sx); -void QPainter_drawImage52(QPainter* self, int x, int y, QImage* image, int sx, int sy); -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_drawRoundRect7(QPainter* self, QRect* r, int xround); +void QPainter_drawRoundRect8(QPainter* self, QRect* r, int xround, int yround); +void QPainter_drawTiledPixmap4(QPainter* self, QRectF* rect, QPixmap* pm, QPointF* offset); +void QPainter_drawTiledPixmap5(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx); +void QPainter_drawTiledPixmap6(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx, int sy); +void QPainter_drawTiledPixmap7(QPainter* self, QRect* param1, QPixmap* param2, QPoint* param3); +void QPainter_drawPixmapFragments2(QPainter* self, QPainter__PixmapFragment* fragments, int fragmentCount, QPixmap* pixmap, int hints); +void QPainter_drawImage10(QPainter* self, QRectF* targetRect, QImage* image, QRectF* sourceRect, int flags); +void QPainter_drawImage11(QPainter* self, QRect* targetRect, QImage* image, QRect* sourceRect, int flags); +void QPainter_drawImage12(QPainter* self, QPointF* p, QImage* image, QRectF* sr, int flags); +void QPainter_drawImage13(QPainter* self, QPoint* p, QImage* image, QRect* sr, int flags); +void QPainter_drawImage14(QPainter* self, int x, int y, QImage* image, int sx); +void QPainter_drawImage15(QPainter* self, int x, int y, QImage* image, int sx, int sy); +void QPainter_drawImage16(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw); +void QPainter_drawImage17(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh); +void QPainter_drawImage18(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh, int flags); +void QPainter_drawText9(QPainter* self, QRectF* r, int flags, struct miqt_string text, QRectF* br); +void QPainter_drawText10(QPainter* self, QRect* r, int flags, struct miqt_string text, QRect* br); +void QPainter_drawText11(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string text, QRect* br); +void QPainter_drawText12(QPainter* self, QRectF* r, struct miqt_string text, QTextOption* o); +QRectF* QPainter_boundingRect5(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); +void QPainter_setRedirected2(QPaintDevice* device, QPaintDevice* replacement, QPoint* offset); QPaintDevice* QPainter_redirected2(QPaintDevice* device, QPoint* offset); void QPainter_delete(QPainter* self); QPainter__PixmapFragment* QPainter__PixmapFragment_create(QPointF* pos, QRectF* sourceRect); -QPainter__PixmapFragment* QPainter__PixmapFragment_create3(QPointF* pos, QRectF* sourceRect, double scaleX); -QPainter__PixmapFragment* QPainter__PixmapFragment_create4(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY); -QPainter__PixmapFragment* QPainter__PixmapFragment_create5(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation); -QPainter__PixmapFragment* QPainter__PixmapFragment_create6(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation, double opacity); +QPainter__PixmapFragment* QPainter__PixmapFragment_create2(QPointF* pos, QRectF* sourceRect, double scaleX); +QPainter__PixmapFragment* QPainter__PixmapFragment_create3(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY); +QPainter__PixmapFragment* QPainter__PixmapFragment_create4(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation); +QPainter__PixmapFragment* QPainter__PixmapFragment_create5(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation, double opacity); void QPainter__PixmapFragment_delete(QPainter__PixmapFragment* self); #ifdef __cplusplus diff --git a/qt/gen_qpainterpath.cpp b/qt/gen_qpainterpath.cpp index 13458a8f..4d511a03 100644 --- a/qt/gen_qpainterpath.cpp +++ b/qt/gen_qpainterpath.cpp @@ -1,5 +1,4 @@ #include -#include #include #define WORKAROUND_INNER_CLASS_DEFINITION_QPainterPath__Element #include @@ -10,6 +9,7 @@ #include #include #include +#include #include #include "gen_qpainterpath.h" @@ -336,11 +336,11 @@ QPainterPath* QPainterPath_operatorMinusAssign(QPainterPath* self, QPainterPath* return &_ret; } -void QPainterPath_addRoundedRect4(QPainterPath* self, QRectF* rect, double xRadius, double yRadius, int mode) { +void QPainterPath_addRoundedRect3(QPainterPath* self, QRectF* rect, double xRadius, double yRadius, int mode) { self->addRoundedRect(*rect, static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } -void QPainterPath_addRoundedRect7(QPainterPath* self, double x, double y, double w, double h, double xRadius, double yRadius, int mode) { +void QPainterPath_addRoundedRect4(QPainterPath* self, double x, double y, double w, double h, double xRadius, double yRadius, int mode) { self->addRoundedRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } diff --git a/qt/gen_qpainterpath.go b/qt/gen_qpainterpath.go index f1f701d1..87665814 100644 --- a/qt/gen_qpainterpath.go +++ b/qt/gen_qpainterpath.go @@ -406,12 +406,12 @@ func (this *QPainterPath) OperatorMinusAssign(other *QPainterPath) *QPainterPath return newQPainterPath(C.QPainterPath_operatorMinusAssign(this.h, other.cPointer())) } -func (this *QPainterPath) AddRoundedRect4(rect *QRectF, xRadius float64, yRadius float64, mode SizeMode) { - C.QPainterPath_addRoundedRect4(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) +func (this *QPainterPath) AddRoundedRect3(rect *QRectF, xRadius float64, yRadius float64, mode SizeMode) { + C.QPainterPath_addRoundedRect3(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } -func (this *QPainterPath) AddRoundedRect7(x float64, y float64, w float64, h float64, xRadius float64, yRadius float64, mode SizeMode) { - C.QPainterPath_addRoundedRect7(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) +func (this *QPainterPath) AddRoundedRect4(x float64, y float64, w float64, h float64, xRadius float64, yRadius float64, mode SizeMode) { + C.QPainterPath_addRoundedRect4(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } // Delete this object from C++ memory. diff --git a/qt/gen_qpainterpath.h b/qt/gen_qpainterpath.h index e74405e1..b1b51969 100644 --- a/qt/gen_qpainterpath.h +++ b/qt/gen_qpainterpath.h @@ -114,8 +114,8 @@ void QPainterPath_operatorBitwiseAndAssign(QPainterPath* self, QPainterPath* oth void QPainterPath_operatorBitwiseOrAssign(QPainterPath* self, QPainterPath* other); QPainterPath* QPainterPath_operatorPlusAssign(QPainterPath* self, QPainterPath* other); QPainterPath* QPainterPath_operatorMinusAssign(QPainterPath* self, QPainterPath* other); -void QPainterPath_addRoundedRect4(QPainterPath* self, QRectF* rect, double xRadius, double yRadius, int mode); -void QPainterPath_addRoundedRect7(QPainterPath* self, double x, double y, double w, double h, double xRadius, double yRadius, int mode); +void QPainterPath_addRoundedRect3(QPainterPath* self, QRectF* rect, double xRadius, double yRadius, int mode); +void QPainterPath_addRoundedRect4(QPainterPath* self, double x, double y, double w, double h, double xRadius, double yRadius, int mode); void QPainterPath_delete(QPainterPath* self); QPainterPathStroker* QPainterPathStroker_new(); diff --git a/qt/gen_qpdfwriter.cpp b/qt/gen_qpdfwriter.cpp index bf91599e..d11313af 100644 --- a/qt/gen_qpdfwriter.cpp +++ b/qt/gen_qpdfwriter.cpp @@ -557,7 +557,7 @@ struct miqt_string QPdfWriter_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QPdfWriter_addFileAttachment3(QPdfWriter* self, struct miqt_string fileName, struct miqt_string data, struct miqt_string mimeType) { +void QPdfWriter_addFileAttachment2(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); diff --git a/qt/gen_qpdfwriter.go b/qt/gen_qpdfwriter.go index d70d0f1a..cbc229a0 100644 --- a/qt/gen_qpdfwriter.go +++ b/qt/gen_qpdfwriter.go @@ -236,7 +236,7 @@ func QPdfWriter_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QPdfWriter) AddFileAttachment3(fileName string, data []byte, mimeType string) { +func (this *QPdfWriter) AddFileAttachment2(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)) @@ -252,7 +252,7 @@ func (this *QPdfWriter) AddFileAttachment3(fileName string, data []byte, mimeTyp 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) + C.QPdfWriter_addFileAttachment2(this.h, fileName_ms, data_alias, mimeType_ms) } // Sender can only be called from a QPdfWriter that was directly constructed. diff --git a/qt/gen_qpdfwriter.h b/qt/gen_qpdfwriter.h index c8cf2b8a..3c61e7b8 100644 --- a/qt/gen_qpdfwriter.h +++ b/qt/gen_qpdfwriter.h @@ -82,7 +82,7 @@ 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_addFileAttachment2(QPdfWriter* self, struct miqt_string fileName, struct miqt_string data, struct miqt_string mimeType); bool QPdfWriter_override_virtual_newPage(void* self, intptr_t slot); bool QPdfWriter_virtualbase_newPage(void* self); bool QPdfWriter_override_virtual_setPageSize(void* self, intptr_t slot); diff --git a/qt/gen_qpen.cpp b/qt/gen_qpen.cpp index 1713302f..148b7bdf 100644 --- a/qt/gen_qpen.cpp +++ b/qt/gen_qpen.cpp @@ -1,8 +1,8 @@ #include #include -#include #include #include +#include #include #include "gen_qpen.h" diff --git a/qt/gen_qpicture.cpp b/qt/gen_qpicture.cpp index 04a43c6e..72fe0c09 100644 --- a/qt/gen_qpicture.cpp +++ b/qt/gen_qpicture.cpp @@ -340,7 +340,7 @@ 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) { +bool QPicture_load3(QPicture* self, struct miqt_string fileName, const char* format) { QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->load(fileName_QString, format); } @@ -349,7 +349,7 @@ 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) { +bool QPicture_save3(QPicture* self, struct miqt_string fileName, const char* format) { QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); return self->save(fileName_QString, format); } diff --git a/qt/gen_qpicture.go b/qt/gen_qpicture.go index 79186a8e..aeaeae88 100644 --- a/qt/gen_qpicture.go +++ b/qt/gen_qpicture.go @@ -216,14 +216,14 @@ func (this *QPicture) Load2(dev *QIODevice, format string) bool { return (bool)(C.QPicture_load2(this.h, dev.cPointer(), format_Cstring)) } -func (this *QPicture) Load22(fileName string, format string) bool { +func (this *QPicture) Load3(fileName string, format string) bool { 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, fileName_ms, format_Cstring)) + return (bool)(C.QPicture_load3(this.h, fileName_ms, format_Cstring)) } func (this *QPicture) Save2(dev *QIODevice, format string) bool { @@ -232,14 +232,14 @@ func (this *QPicture) Save2(dev *QIODevice, format string) bool { return (bool)(C.QPicture_save2(this.h, dev.cPointer(), format_Cstring)) } -func (this *QPicture) Save22(fileName string, format string) bool { +func (this *QPicture) Save3(fileName string, format string) bool { 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, fileName_ms, format_Cstring)) + return (bool)(C.QPicture_save3(this.h, fileName_ms, format_Cstring)) } func (this *QPicture) callVirtualBase_DevType() int { diff --git a/qt/gen_qpicture.h b/qt/gen_qpicture.h index f69391e6..55a8e1d9 100644 --- a/qt/gen_qpicture.h +++ b/qt/gen_qpicture.h @@ -62,9 +62,9 @@ struct miqt_array /* of struct miqt_string */ QPicture_outputFormatList(); QPaintEngine* QPicture_paintEngine(const QPicture* self); int QPicture_metric(const QPicture* self, int m); bool QPicture_load2(QPicture* self, QIODevice* dev, const char* format); -bool QPicture_load22(QPicture* self, struct miqt_string fileName, const char* format); +bool QPicture_load3(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_save3(QPicture* self, struct miqt_string fileName, const char* format); bool QPicture_override_virtual_devType(void* self, intptr_t slot); int QPicture_virtualbase_devType(const void* self); bool QPicture_override_virtual_setData(void* self, intptr_t slot); diff --git a/qt/gen_qpixmap.cpp b/qt/gen_qpixmap.cpp index daa1062d..723ce460 100644 --- a/qt/gen_qpixmap.cpp +++ b/qt/gen_qpixmap.cpp @@ -406,11 +406,11 @@ bool QPixmap_operatorNot(const QPixmap* self) { return self->operator!(); } -void QPixmap_fill1(QPixmap* self, QColor* fillColor) { +void QPixmap_fillWithFillColor(QPixmap* self, QColor* fillColor) { self->fill(*fillColor); } -QBitmap* QPixmap_createHeuristicMask1(const QPixmap* self, bool clipTight) { +QBitmap* QPixmap_createHeuristicMaskWithClipTight(const QPixmap* self, bool clipTight) { return new QBitmap(self->createHeuristicMask(clipTight)); } @@ -450,19 +450,19 @@ QPixmap* QPixmap_grabWidget5(QObject* widget, int x, int y, int w, int h) { return new QPixmap(QPixmap::grabWidget(widget, static_cast(x), static_cast(y), static_cast(w), static_cast(h))); } -QPixmap* QPixmap_scaled3(const QPixmap* self, int w, int h, int aspectMode) { +QPixmap* QPixmap_scaled2(const QPixmap* self, int w, int h, int aspectMode) { return new QPixmap(self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode))); } -QPixmap* QPixmap_scaled4(const QPixmap* self, int w, int h, int aspectMode, int mode) { +QPixmap* QPixmap_scaled3(const QPixmap* self, int w, int h, int aspectMode, int mode) { return new QPixmap(self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode), static_cast(mode))); } -QPixmap* QPixmap_scaled2(const QPixmap* self, QSize* s, int aspectMode) { +QPixmap* QPixmap_scaled4(const QPixmap* self, QSize* s, int aspectMode) { return new QPixmap(self->scaled(*s, static_cast(aspectMode))); } -QPixmap* QPixmap_scaled32(const QPixmap* self, QSize* s, int aspectMode, int mode) { +QPixmap* QPixmap_scaled5(const QPixmap* self, QSize* s, int aspectMode, int mode) { return new QPixmap(self->scaled(*s, static_cast(aspectMode), static_cast(mode))); } @@ -478,7 +478,7 @@ QPixmap* QPixmap_transformed2(const QPixmap* self, QMatrix* param1, int mode) { return new QPixmap(self->transformed(*param1, static_cast(mode))); } -QPixmap* QPixmap_transformed22(const QPixmap* self, QTransform* param1, int mode) { +QPixmap* QPixmap_transformed3(const QPixmap* self, QTransform* param1, int mode) { return new QPixmap(self->transformed(*param1, static_cast(mode))); } @@ -500,20 +500,20 @@ bool QPixmap_load3(QPixmap* self, struct miqt_string fileName, const char* forma return self->load(fileName_QString, format, static_cast(flags)); } -bool QPixmap_loadFromData3(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format) { +bool QPixmap_loadFromData2(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format) { return self->loadFromData(static_cast(buf), static_cast(len), format); } -bool QPixmap_loadFromData4(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format, int flags) { +bool QPixmap_loadFromData3(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format, int flags) { return self->loadFromData(static_cast(buf), static_cast(len), format, static_cast(flags)); } -bool QPixmap_loadFromData2(QPixmap* self, struct miqt_string data, const char* format) { +bool QPixmap_loadFromData4(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, struct miqt_string data, const char* format, int flags) { +bool QPixmap_loadFromData5(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)); } @@ -528,11 +528,11 @@ bool QPixmap_save3(const QPixmap* self, struct miqt_string fileName, const char* return self->save(fileName_QString, format, static_cast(quality)); } -bool QPixmap_save22(const QPixmap* self, QIODevice* device, const char* format) { +bool QPixmap_save4(const QPixmap* self, QIODevice* device, const char* format) { return self->save(device, format); } -bool QPixmap_save32(const QPixmap* self, QIODevice* device, const char* format, int quality) { +bool QPixmap_save5(const QPixmap* self, QIODevice* device, const char* format, int quality) { return self->save(device, format, static_cast(quality)); } @@ -540,11 +540,11 @@ bool QPixmap_convertFromImage2(QPixmap* self, QImage* img, int flags) { return self->convertFromImage(*img, static_cast(flags)); } -QPixmap* QPixmap_copy1(const QPixmap* self, QRect* rect) { +QPixmap* QPixmap_copyWithRect(const QPixmap* self, QRect* rect) { return new QPixmap(self->copy(*rect)); } -void QPixmap_scroll7(QPixmap* self, int dx, int dy, int x, int y, int width, int height, QRegion* exposed) { +void QPixmap_scroll3(QPixmap* self, int dx, int dy, int x, int y, int width, int height, QRegion* exposed) { self->scroll(static_cast(dx), static_cast(dy), static_cast(x), static_cast(y), static_cast(width), static_cast(height), exposed); } diff --git a/qt/gen_qpixmap.go b/qt/gen_qpixmap.go index 9065fb2e..146717f5 100644 --- a/qt/gen_qpixmap.go +++ b/qt/gen_qpixmap.go @@ -375,12 +375,12 @@ func (this *QPixmap) OperatorNot() bool { return (bool)(C.QPixmap_operatorNot(this.h)) } -func (this *QPixmap) Fill1(fillColor *QColor) { - C.QPixmap_fill1(this.h, fillColor.cPointer()) +func (this *QPixmap) FillWithFillColor(fillColor *QColor) { + C.QPixmap_fillWithFillColor(this.h, fillColor.cPointer()) } -func (this *QPixmap) CreateHeuristicMask1(clipTight bool) *QBitmap { - _goptr := newQBitmap(C.QPixmap_createHeuristicMask1(this.h, (C.bool)(clipTight))) +func (this *QPixmap) CreateHeuristicMaskWithClipTight(clipTight bool) *QBitmap { + _goptr := newQBitmap(C.QPixmap_createHeuristicMaskWithClipTight(this.h, (C.bool)(clipTight))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -439,26 +439,26 @@ func QPixmap_GrabWidget5(widget *QObject, x int, y int, w int, h int) *QPixmap { return _goptr } -func (this *QPixmap) Scaled3(w int, h int, aspectMode AspectRatioMode) *QPixmap { - _goptr := newQPixmap(C.QPixmap_scaled3(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode))) +func (this *QPixmap) Scaled2(w int, h int, aspectMode AspectRatioMode) *QPixmap { + _goptr := newQPixmap(C.QPixmap_scaled2(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QPixmap) Scaled4(w int, h int, aspectMode AspectRatioMode, mode TransformationMode) *QPixmap { - _goptr := newQPixmap(C.QPixmap_scaled4(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode), (C.int)(mode))) +func (this *QPixmap) Scaled3(w int, h int, aspectMode AspectRatioMode, mode TransformationMode) *QPixmap { + _goptr := newQPixmap(C.QPixmap_scaled3(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QPixmap) Scaled2(s *QSize, aspectMode AspectRatioMode) *QPixmap { - _goptr := newQPixmap(C.QPixmap_scaled2(this.h, s.cPointer(), (C.int)(aspectMode))) +func (this *QPixmap) Scaled4(s *QSize, aspectMode AspectRatioMode) *QPixmap { + _goptr := newQPixmap(C.QPixmap_scaled4(this.h, s.cPointer(), (C.int)(aspectMode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QPixmap) Scaled32(s *QSize, aspectMode AspectRatioMode, mode TransformationMode) *QPixmap { - _goptr := newQPixmap(C.QPixmap_scaled32(this.h, s.cPointer(), (C.int)(aspectMode), (C.int)(mode))) +func (this *QPixmap) Scaled5(s *QSize, aspectMode AspectRatioMode, mode TransformationMode) *QPixmap { + _goptr := newQPixmap(C.QPixmap_scaled5(this.h, s.cPointer(), (C.int)(aspectMode), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -481,8 +481,8 @@ func (this *QPixmap) Transformed2(param1 *QMatrix, mode TransformationMode) *QPi return _goptr } -func (this *QPixmap) Transformed22(param1 *QTransform, mode TransformationMode) *QPixmap { - _goptr := newQPixmap(C.QPixmap_transformed22(this.h, param1.cPointer(), (C.int)(mode))) +func (this *QPixmap) Transformed3(param1 *QTransform, mode TransformationMode) *QPixmap { + _goptr := newQPixmap(C.QPixmap_transformed3(this.h, param1.cPointer(), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -519,19 +519,19 @@ func (this *QPixmap) Load3(fileName string, format string, flags ImageConversion 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 { +func (this *QPixmap) LoadFromData2(buf *byte, lenVal uint, format string) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_loadFromData3(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.uint)(lenVal), format_Cstring)) + return (bool)(C.QPixmap_loadFromData2(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.uint)(lenVal), format_Cstring)) } -func (this *QPixmap) LoadFromData4(buf *byte, lenVal uint, format string, flags ImageConversionFlag) bool { +func (this *QPixmap) LoadFromData3(buf *byte, lenVal uint, format string, flags ImageConversionFlag) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_loadFromData4(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.uint)(lenVal), format_Cstring, (C.int)(flags))) + return (bool)(C.QPixmap_loadFromData3(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.uint)(lenVal), format_Cstring, (C.int)(flags))) } -func (this *QPixmap) LoadFromData2(data []byte, format string) bool { +func (this *QPixmap) LoadFromData4(data []byte, format string) bool { data_alias := C.struct_miqt_string{} if len(data) > 0 { data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) @@ -541,10 +541,10 @@ func (this *QPixmap) LoadFromData2(data []byte, format string) bool { 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_alias, format_Cstring)) + return (bool)(C.QPixmap_loadFromData4(this.h, data_alias, format_Cstring)) } -func (this *QPixmap) LoadFromData32(data []byte, format string, flags ImageConversionFlag) bool { +func (this *QPixmap) LoadFromData5(data []byte, format string, flags ImageConversionFlag) bool { data_alias := C.struct_miqt_string{} if len(data) > 0 { data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) @@ -554,7 +554,7 @@ func (this *QPixmap) LoadFromData32(data []byte, format string, flags ImageConve 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_alias, format_Cstring, (C.int)(flags))) + return (bool)(C.QPixmap_loadFromData5(this.h, data_alias, format_Cstring, (C.int)(flags))) } func (this *QPixmap) Save2(fileName string, format string) bool { @@ -577,30 +577,30 @@ func (this *QPixmap) Save3(fileName string, format string, quality int) bool { return (bool)(C.QPixmap_save3(this.h, fileName_ms, format_Cstring, (C.int)(quality))) } -func (this *QPixmap) Save22(device *QIODevice, format string) bool { +func (this *QPixmap) Save4(device *QIODevice, format string) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_save22(this.h, device.cPointer(), format_Cstring)) + return (bool)(C.QPixmap_save4(this.h, device.cPointer(), format_Cstring)) } -func (this *QPixmap) Save32(device *QIODevice, format string, quality int) bool { +func (this *QPixmap) Save5(device *QIODevice, format string, quality int) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_save32(this.h, device.cPointer(), format_Cstring, (C.int)(quality))) + return (bool)(C.QPixmap_save5(this.h, device.cPointer(), format_Cstring, (C.int)(quality))) } func (this *QPixmap) ConvertFromImage2(img *QImage, flags ImageConversionFlag) bool { return (bool)(C.QPixmap_convertFromImage2(this.h, img.cPointer(), (C.int)(flags))) } -func (this *QPixmap) Copy1(rect *QRect) *QPixmap { - _goptr := newQPixmap(C.QPixmap_copy1(this.h, rect.cPointer())) +func (this *QPixmap) CopyWithRect(rect *QRect) *QPixmap { + _goptr := newQPixmap(C.QPixmap_copyWithRect(this.h, rect.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QPixmap) Scroll7(dx int, dy int, x int, y int, width int, height int, exposed *QRegion) { - C.QPixmap_scroll7(this.h, (C.int)(dx), (C.int)(dy), (C.int)(x), (C.int)(y), (C.int)(width), (C.int)(height), exposed.cPointer()) +func (this *QPixmap) Scroll3(dx int, dy int, x int, y int, width int, height int, exposed *QRegion) { + C.QPixmap_scroll3(this.h, (C.int)(dx), (C.int)(dy), (C.int)(x), (C.int)(y), (C.int)(width), (C.int)(height), exposed.cPointer()) } func (this *QPixmap) Scroll4(dx int, dy int, rect *QRect, exposed *QRegion) { diff --git a/qt/gen_qpixmap.h b/qt/gen_qpixmap.h index b1e54b22..e06aef92 100644 --- a/qt/gen_qpixmap.h +++ b/qt/gen_qpixmap.h @@ -113,8 +113,8 @@ bool QPixmap_isQBitmap(const QPixmap* self); QPaintEngine* QPixmap_paintEngine(const QPixmap* self); bool QPixmap_operatorNot(const QPixmap* self); int QPixmap_metric(const QPixmap* self, int param1); -void QPixmap_fill1(QPixmap* self, QColor* fillColor); -QBitmap* QPixmap_createHeuristicMask1(const QPixmap* self, bool clipTight); +void QPixmap_fillWithFillColor(QPixmap* self, QColor* fillColor); +QBitmap* QPixmap_createHeuristicMaskWithClipTight(const QPixmap* self, bool clipTight); QBitmap* QPixmap_createMaskFromColor2(const QPixmap* self, QColor* maskColor, int mode); QPixmap* QPixmap_grabWindow2(uintptr_t param1, int x); QPixmap* QPixmap_grabWindow3(uintptr_t param1, int x, int y); @@ -124,29 +124,29 @@ QPixmap* QPixmap_grabWidget2(QObject* widget, int x); QPixmap* QPixmap_grabWidget3(QObject* widget, int x, int y); QPixmap* QPixmap_grabWidget4(QObject* widget, int x, int y, int w); QPixmap* QPixmap_grabWidget5(QObject* widget, int x, int y, int w, int h); -QPixmap* QPixmap_scaled3(const QPixmap* self, int w, int h, int aspectMode); -QPixmap* QPixmap_scaled4(const QPixmap* self, int w, int h, int aspectMode, int mode); -QPixmap* QPixmap_scaled2(const QPixmap* self, QSize* s, int aspectMode); -QPixmap* QPixmap_scaled32(const QPixmap* self, QSize* s, int aspectMode, int mode); +QPixmap* QPixmap_scaled2(const QPixmap* self, int w, int h, int aspectMode); +QPixmap* QPixmap_scaled3(const QPixmap* self, int w, int h, int aspectMode, int mode); +QPixmap* QPixmap_scaled4(const QPixmap* self, QSize* s, int aspectMode); +QPixmap* QPixmap_scaled5(const QPixmap* self, QSize* s, int aspectMode, int mode); QPixmap* QPixmap_scaledToWidth2(const QPixmap* self, int w, int mode); QPixmap* QPixmap_scaledToHeight2(const QPixmap* self, int h, int mode); QPixmap* QPixmap_transformed2(const QPixmap* self, QMatrix* param1, int mode); -QPixmap* QPixmap_transformed22(const QPixmap* self, QTransform* param1, int mode); +QPixmap* QPixmap_transformed3(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_loadFromData3(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format); -bool QPixmap_loadFromData4(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format, int flags); -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_loadFromData2(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format); +bool QPixmap_loadFromData3(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format, int flags); +bool QPixmap_loadFromData4(QPixmap* self, struct miqt_string data, const char* format); +bool QPixmap_loadFromData5(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_save4(const QPixmap* self, QIODevice* device, const char* format); +bool QPixmap_save5(const QPixmap* self, QIODevice* device, const char* format, int quality); bool QPixmap_convertFromImage2(QPixmap* self, QImage* img, int flags); -QPixmap* QPixmap_copy1(const QPixmap* self, QRect* rect); -void QPixmap_scroll7(QPixmap* self, int dx, int dy, int x, int y, int width, int height, QRegion* exposed); +QPixmap* QPixmap_copyWithRect(const QPixmap* self, QRect* rect); +void QPixmap_scroll3(QPixmap* self, int dx, int dy, int x, int y, int width, int height, QRegion* exposed); void QPixmap_scroll4(QPixmap* self, int dx, int dy, QRect* rect, QRegion* exposed); bool QPixmap_override_virtual_devType(void* self, intptr_t slot); int QPixmap_virtualbase_devType(const void* self); diff --git a/qt/gen_qplaintextedit.cpp b/qt/gen_qplaintextedit.cpp index e7884ef3..c5ef9f08 100644 --- a/qt/gen_qplaintextedit.cpp +++ b/qt/gen_qplaintextedit.cpp @@ -1775,16 +1775,16 @@ struct miqt_string QPlainTextEdit_trUtf83(const char* s, const char* c, int n) { return _ms; } -bool QPlainTextEdit_find22(QPlainTextEdit* self, struct miqt_string exp, int options) { +bool QPlainTextEdit_find3(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)); } -bool QPlainTextEdit_find23(QPlainTextEdit* self, QRegExp* exp, int options) { +bool QPlainTextEdit_find4(QPlainTextEdit* self, QRegExp* exp, int options) { return self->find(*exp, static_cast(options)); } -bool QPlainTextEdit_find24(QPlainTextEdit* self, QRegularExpression* exp, int options) { +bool QPlainTextEdit_find5(QPlainTextEdit* self, QRegularExpression* exp, int options) { return self->find(*exp, static_cast(options)); } @@ -1792,11 +1792,11 @@ void QPlainTextEdit_moveCursor2(QPlainTextEdit* self, int operation, int mode) { self->moveCursor(static_cast(operation), static_cast(mode)); } -void QPlainTextEdit_zoomIn1(QPlainTextEdit* self, int range) { +void QPlainTextEdit_zoomInWithRange(QPlainTextEdit* self, int range) { self->zoomIn(static_cast(range)); } -void QPlainTextEdit_zoomOut1(QPlainTextEdit* self, int range) { +void QPlainTextEdit_zoomOutWithRange(QPlainTextEdit* self, int range) { self->zoomOut(static_cast(range)); } diff --git a/qt/gen_qplaintextedit.go b/qt/gen_qplaintextedit.go index a90d0bfb..9d506d52 100644 --- a/qt/gen_qplaintextedit.go +++ b/qt/gen_qplaintextedit.go @@ -688,32 +688,32 @@ func QPlainTextEdit_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QPlainTextEdit) Find22(exp string, options QTextDocument__FindFlag) bool { +func (this *QPlainTextEdit) Find3(exp string, options QTextDocument__FindFlag) bool { 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))) + return (bool)(C.QPlainTextEdit_find3(this.h, exp_ms, (C.int)(options))) } -func (this *QPlainTextEdit) Find23(exp *QRegExp, options QTextDocument__FindFlag) bool { - return (bool)(C.QPlainTextEdit_find23(this.h, exp.cPointer(), (C.int)(options))) +func (this *QPlainTextEdit) Find4(exp *QRegExp, options QTextDocument__FindFlag) bool { + return (bool)(C.QPlainTextEdit_find4(this.h, exp.cPointer(), (C.int)(options))) } -func (this *QPlainTextEdit) Find24(exp *QRegularExpression, options QTextDocument__FindFlag) bool { - return (bool)(C.QPlainTextEdit_find24(this.h, exp.cPointer(), (C.int)(options))) +func (this *QPlainTextEdit) Find5(exp *QRegularExpression, options QTextDocument__FindFlag) bool { + return (bool)(C.QPlainTextEdit_find5(this.h, exp.cPointer(), (C.int)(options))) } func (this *QPlainTextEdit) MoveCursor2(operation QTextCursor__MoveOperation, mode QTextCursor__MoveMode) { C.QPlainTextEdit_moveCursor2(this.h, (C.int)(operation), (C.int)(mode)) } -func (this *QPlainTextEdit) ZoomIn1(rangeVal int) { - C.QPlainTextEdit_zoomIn1(this.h, (C.int)(rangeVal)) +func (this *QPlainTextEdit) ZoomInWithRange(rangeVal int) { + C.QPlainTextEdit_zoomInWithRange(this.h, (C.int)(rangeVal)) } -func (this *QPlainTextEdit) ZoomOut1(rangeVal int) { - C.QPlainTextEdit_zoomOut1(this.h, (C.int)(rangeVal)) +func (this *QPlainTextEdit) ZoomOutWithRange(rangeVal int) { + C.QPlainTextEdit_zoomOutWithRange(this.h, (C.int)(rangeVal)) } // FirstVisibleBlock can only be called from a QPlainTextEdit that was directly constructed. diff --git a/qt/gen_qplaintextedit.h b/qt/gen_qplaintextedit.h index 319a9353..40434454 100644 --- a/qt/gen_qplaintextedit.h +++ b/qt/gen_qplaintextedit.h @@ -269,12 +269,12 @@ 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); +bool QPlainTextEdit_find3(QPlainTextEdit* self, struct miqt_string exp, int options); +bool QPlainTextEdit_find4(QPlainTextEdit* self, QRegExp* exp, int options); +bool QPlainTextEdit_find5(QPlainTextEdit* self, QRegularExpression* exp, int options); void QPlainTextEdit_moveCursor2(QPlainTextEdit* self, int operation, int mode); -void QPlainTextEdit_zoomIn1(QPlainTextEdit* self, int range); -void QPlainTextEdit_zoomOut1(QPlainTextEdit* self, int range); +void QPlainTextEdit_zoomInWithRange(QPlainTextEdit* self, int range); +void QPlainTextEdit_zoomOutWithRange(QPlainTextEdit* self, int range); bool QPlainTextEdit_override_virtual_loadResource(void* self, intptr_t slot); QVariant* QPlainTextEdit_virtualbase_loadResource(void* self, int type, QUrl* name); bool QPlainTextEdit_override_virtual_inputMethodQuery(void* self, intptr_t slot); diff --git a/qt/gen_qpluginloader.cpp b/qt/gen_qpluginloader.cpp index 482c3b56..73ba89d9 100644 --- a/qt/gen_qpluginloader.cpp +++ b/qt/gen_qpluginloader.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "gen_qpluginloader.h" diff --git a/qt/gen_qprocess.cpp b/qt/gen_qprocess.cpp index 2fec7acb..01c1df55 100644 --- a/qt/gen_qprocess.cpp +++ b/qt/gen_qprocess.cpp @@ -1156,16 +1156,16 @@ void QProcess_start3(QProcess* self, struct miqt_string program, struct miqt_arr self->start(program_QString, arguments_QList, static_cast(mode)); } -void QProcess_start22(QProcess* self, struct miqt_string command, int mode) { +void QProcess_start4(QProcess* self, struct miqt_string command, int mode) { QString command_QString = QString::fromUtf8(command.data, command.len); self->start(command_QString, static_cast(mode)); } -void QProcess_start1(QProcess* self, int mode) { +void QProcess_startWithMode(QProcess* self, int mode) { self->start(static_cast(mode)); } -bool QProcess_startDetached1(QProcess* self, long long* pid) { +bool QProcess_startDetachedWithPid(QProcess* self, long long* pid) { return self->startDetached(static_cast(pid)); } @@ -1179,11 +1179,11 @@ void QProcess_setStandardErrorFile2(QProcess* self, struct miqt_string fileName, self->setStandardErrorFile(fileName_QString, static_cast(mode)); } -bool QProcess_waitForStarted1(QProcess* self, int msecs) { +bool QProcess_waitForStartedWithMsecs(QProcess* self, int msecs) { return self->waitForStarted(static_cast(msecs)); } -bool QProcess_waitForFinished1(QProcess* self, int msecs) { +bool QProcess_waitForFinishedWithMsecs(QProcess* self, int msecs) { return self->waitForFinished(static_cast(msecs)); } diff --git a/qt/gen_qprocess.go b/qt/gen_qprocess.go index ce2d648b..27cf15a5 100644 --- a/qt/gen_qprocess.go +++ b/qt/gen_qprocess.go @@ -840,20 +840,20 @@ func (this *QProcess) Start3(program string, arguments []string, mode QIODevice_ C.QProcess_start3(this.h, program_ms, arguments_ma, (C.int)(mode)) } -func (this *QProcess) Start22(command string, mode QIODevice__OpenModeFlag) { +func (this *QProcess) Start4(command string, mode QIODevice__OpenModeFlag) { 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)) + C.QProcess_start4(this.h, command_ms, (C.int)(mode)) } -func (this *QProcess) Start1(mode QIODevice__OpenModeFlag) { - C.QProcess_start1(this.h, (C.int)(mode)) +func (this *QProcess) StartWithMode(mode QIODevice__OpenModeFlag) { + C.QProcess_startWithMode(this.h, (C.int)(mode)) } -func (this *QProcess) StartDetached1(pid *int64) bool { - return (bool)(C.QProcess_startDetached1(this.h, (*C.longlong)(unsafe.Pointer(pid)))) +func (this *QProcess) StartDetachedWithPid(pid *int64) bool { + return (bool)(C.QProcess_startDetachedWithPid(this.h, (*C.longlong)(unsafe.Pointer(pid)))) } func (this *QProcess) SetStandardOutputFile2(fileName string, mode QIODevice__OpenModeFlag) { @@ -872,12 +872,12 @@ func (this *QProcess) SetStandardErrorFile2(fileName string, mode QIODevice__Ope C.QProcess_setStandardErrorFile2(this.h, fileName_ms, (C.int)(mode)) } -func (this *QProcess) WaitForStarted1(msecs int) bool { - return (bool)(C.QProcess_waitForStarted1(this.h, (C.int)(msecs))) +func (this *QProcess) WaitForStartedWithMsecs(msecs int) bool { + return (bool)(C.QProcess_waitForStartedWithMsecs(this.h, (C.int)(msecs))) } -func (this *QProcess) WaitForFinished1(msecs int) bool { - return (bool)(C.QProcess_waitForFinished1(this.h, (C.int)(msecs))) +func (this *QProcess) WaitForFinishedWithMsecs(msecs int) bool { + return (bool)(C.QProcess_waitForFinishedWithMsecs(this.h, (C.int)(msecs))) } func QProcess_StartDetached4(program string, arguments []string, workingDirectory string, pid *int64) bool { diff --git a/qt/gen_qprocess.h b/qt/gen_qprocess.h index 17fb43c4..36b677fb 100644 --- a/qt/gen_qprocess.h +++ b/qt/gen_qprocess.h @@ -134,13 +134,13 @@ 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); +void QProcess_start4(QProcess* self, struct miqt_string command, int mode); +void QProcess_startWithMode(QProcess* self, int mode); +bool QProcess_startDetachedWithPid(QProcess* self, long long* pid); 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_waitForFinished1(QProcess* self, int msecs); +bool QProcess_waitForStartedWithMsecs(QProcess* self, int msecs); +bool QProcess_waitForFinishedWithMsecs(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_override_virtual_open(void* self, intptr_t slot); bool QProcess_virtualbase_open(void* self, int mode); diff --git a/qt/gen_qrandom.cpp b/qt/gen_qrandom.cpp index b451c45e..aff786d1 100644 --- a/qt/gen_qrandom.cpp +++ b/qt/gen_qrandom.cpp @@ -110,7 +110,7 @@ QRandomGenerator* QRandomGenerator_securelySeeded() { return new QRandomGenerator(QRandomGenerator::securelySeeded()); } -void QRandomGenerator_seed1(QRandomGenerator* self, unsigned int s) { +void QRandomGenerator_seedWithQuint32(QRandomGenerator* self, unsigned int s) { self->seed(static_cast(s)); } diff --git a/qt/gen_qrandom.go b/qt/gen_qrandom.go index bbc1bac2..dd807dfd 100644 --- a/qt/gen_qrandom.go +++ b/qt/gen_qrandom.go @@ -149,8 +149,8 @@ func QRandomGenerator_SecurelySeeded() *QRandomGenerator { return _goptr } -func (this *QRandomGenerator) Seed1(s uint) { - C.QRandomGenerator_seed1(this.h, (C.uint)(s)) +func (this *QRandomGenerator) SeedWithQuint32(s uint) { + C.QRandomGenerator_seedWithQuint32(this.h, (C.uint)(s)) } // Delete this object from C++ memory. diff --git a/qt/gen_qrandom.h b/qt/gen_qrandom.h index 10edb03a..806a81b0 100644 --- a/qt/gen_qrandom.h +++ b/qt/gen_qrandom.h @@ -45,7 +45,7 @@ unsigned int QRandomGenerator_max(); QRandomGenerator* QRandomGenerator_system(); QRandomGenerator* QRandomGenerator_global(); QRandomGenerator* QRandomGenerator_securelySeeded(); -void QRandomGenerator_seed1(QRandomGenerator* self, unsigned int s); +void QRandomGenerator_seedWithQuint32(QRandomGenerator* self, unsigned int s); void QRandomGenerator_delete(QRandomGenerator* self); QRandomGenerator64* QRandomGenerator64_new(); diff --git a/qt/gen_qrawfont.cpp b/qt/gen_qrawfont.cpp index 241e0508..8ca25ae7 100644 --- a/qt/gen_qrawfont.cpp +++ b/qt/gen_qrawfont.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "gen_qrawfont.h" diff --git a/qt/gen_qrect.cpp b/qt/gen_qrect.cpp index c8290350..7637b72e 100644 --- a/qt/gen_qrect.cpp +++ b/qt/gen_qrect.cpp @@ -313,11 +313,11 @@ QRect* QRect_operatorMinusAssign(QRect* self, QMargins* margins) { return &_ret; } -bool QRect_contains22(const QRect* self, QRect* r, bool proper) { +bool QRect_contains4(const QRect* self, QRect* r, bool proper) { return self->contains(*r, proper); } -bool QRect_contains23(const QRect* self, QPoint* p, bool proper) { +bool QRect_contains5(const QRect* self, QPoint* p, bool proper) { return self->contains(*p, proper); } diff --git a/qt/gen_qrect.go b/qt/gen_qrect.go index 62047965..bb174ace 100644 --- a/qt/gen_qrect.go +++ b/qt/gen_qrect.go @@ -381,12 +381,12 @@ func (this *QRect) OperatorMinusAssign(margins *QMargins) *QRect { return newQRect(C.QRect_operatorMinusAssign(this.h, margins.cPointer())) } -func (this *QRect) Contains22(r *QRect, proper bool) bool { - return (bool)(C.QRect_contains22(this.h, r.cPointer(), (C.bool)(proper))) +func (this *QRect) Contains4(r *QRect, proper bool) bool { + return (bool)(C.QRect_contains4(this.h, r.cPointer(), (C.bool)(proper))) } -func (this *QRect) Contains23(p *QPoint, proper bool) bool { - return (bool)(C.QRect_contains23(this.h, p.cPointer(), (C.bool)(proper))) +func (this *QRect) Contains5(p *QPoint, proper bool) bool { + return (bool)(C.QRect_contains5(this.h, p.cPointer(), (C.bool)(proper))) } // Delete this object from C++ memory. diff --git a/qt/gen_qrect.h b/qt/gen_qrect.h index 91b36b04..8f0e0885 100644 --- a/qt/gen_qrect.h +++ b/qt/gen_qrect.h @@ -107,8 +107,8 @@ QRect* QRect_marginsAdded(const QRect* self, QMargins* margins); QRect* QRect_marginsRemoved(const QRect* self, QMargins* margins); QRect* QRect_operatorPlusAssign(QRect* self, QMargins* margins); QRect* QRect_operatorMinusAssign(QRect* self, QMargins* margins); -bool QRect_contains22(const QRect* self, QRect* r, bool proper); -bool QRect_contains23(const QRect* self, QPoint* p, bool proper); +bool QRect_contains4(const QRect* self, QRect* r, bool proper); +bool QRect_contains5(const QRect* self, QPoint* p, bool proper); void QRect_delete(QRect* self); QRectF* QRectF_new(); diff --git a/qt/gen_qregexp.cpp b/qt/gen_qregexp.cpp index d6d8408d..c73e7451 100644 --- a/qt/gen_qregexp.cpp +++ b/qt/gen_qregexp.cpp @@ -250,7 +250,7 @@ int QRegExp_lastIndexIn3(const QRegExp* self, struct miqt_string str, int offset 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_capWithNth(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(); @@ -261,7 +261,7 @@ struct miqt_string QRegExp_cap1(const QRegExp* self, int nth) { return _ms; } -struct miqt_string QRegExp_cap1WithNth(QRegExp* self, int nth) { +struct miqt_string QRegExp_cap3(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(); @@ -272,11 +272,11 @@ struct miqt_string QRegExp_cap1WithNth(QRegExp* self, int nth) { return _ms; } -int QRegExp_pos1(const QRegExp* self, int nth) { +int QRegExp_posWithNth(const QRegExp* self, int nth) { return self->pos(static_cast(nth)); } -int QRegExp_pos1WithNth(QRegExp* self, int nth) { +int QRegExp_pos3(QRegExp* self, int nth) { return self->pos(static_cast(nth)); } diff --git a/qt/gen_qregexp.go b/qt/gen_qregexp.go index 707dfa20..48af5691 100644 --- a/qt/gen_qregexp.go +++ b/qt/gen_qregexp.go @@ -306,26 +306,26 @@ func (this *QRegExp) LastIndexIn3(str string, offset int, caretMode QRegExp__Car 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)) +func (this *QRegExp) CapWithNth(nth int) string { + var _ms C.struct_miqt_string = C.QRegExp_capWithNth(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)) +func (this *QRegExp) Cap3(nth int) string { + var _ms C.struct_miqt_string = C.QRegExp_cap3(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) Pos1(nth int) int { - return (int)(C.QRegExp_pos1(this.h, (C.int)(nth))) +func (this *QRegExp) PosWithNth(nth int) int { + return (int)(C.QRegExp_posWithNth(this.h, (C.int)(nth))) } -func (this *QRegExp) Pos1WithNth(nth int) int { - return (int)(C.QRegExp_pos1WithNth(this.h, (C.int)(nth))) +func (this *QRegExp) Pos3(nth int) int { + return (int)(C.QRegExp_pos3(this.h, (C.int)(nth))) } // Delete this object from C++ memory. diff --git a/qt/gen_qregexp.h b/qt/gen_qregexp.h index c21dff87..b3e5bb2e 100644 --- a/qt/gen_qregexp.h +++ b/qt/gen_qregexp.h @@ -57,10 +57,10 @@ 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); +struct miqt_string QRegExp_capWithNth(const QRegExp* self, int nth); +struct miqt_string QRegExp_cap3(QRegExp* self, int nth); +int QRegExp_posWithNth(const QRegExp* self, int nth); +int QRegExp_pos3(QRegExp* self, int nth); void QRegExp_delete(QRegExp* self); #ifdef __cplusplus diff --git a/qt/gen_qregion.cpp b/qt/gen_qregion.cpp index 3d75ab68..fe361894 100644 --- a/qt/gen_qregion.cpp +++ b/qt/gen_qregion.cpp @@ -1,9 +1,9 @@ #include -#include #include #include #include #include +#include #include #include "gen_qregion.h" diff --git a/qt/gen_qregularexpression.cpp b/qt/gen_qregularexpression.cpp index 4ac78bf3..8c2445d4 100644 --- a/qt/gen_qregularexpression.cpp +++ b/qt/gen_qregularexpression.cpp @@ -318,7 +318,7 @@ int QRegularExpressionMatch_capturedEndWithName(const QRegularExpressionMatch* s return self->capturedEnd(name_QString); } -struct miqt_string QRegularExpressionMatch_captured1(const QRegularExpressionMatch* self, int nth) { +struct miqt_string QRegularExpressionMatch_capturedWithNth(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(); @@ -329,15 +329,15 @@ struct miqt_string QRegularExpressionMatch_captured1(const QRegularExpressionMat return _ms; } -int QRegularExpressionMatch_capturedStart1(const QRegularExpressionMatch* self, int nth) { +int QRegularExpressionMatch_capturedStartWithNth(const QRegularExpressionMatch* self, int nth) { return self->capturedStart(static_cast(nth)); } -int QRegularExpressionMatch_capturedLength1(const QRegularExpressionMatch* self, int nth) { +int QRegularExpressionMatch_capturedLengthWithNth(const QRegularExpressionMatch* self, int nth) { return self->capturedLength(static_cast(nth)); } -int QRegularExpressionMatch_capturedEnd1(const QRegularExpressionMatch* self, int nth) { +int QRegularExpressionMatch_capturedEndWithNth(const QRegularExpressionMatch* self, int nth) { return self->capturedEnd(static_cast(nth)); } diff --git a/qt/gen_qregularexpression.go b/qt/gen_qregularexpression.go index 836699f4..6eb1871e 100644 --- a/qt/gen_qregularexpression.go +++ b/qt/gen_qregularexpression.go @@ -460,23 +460,23 @@ func (this *QRegularExpressionMatch) CapturedEndWithName(name string) int { 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)) +func (this *QRegularExpressionMatch) CapturedWithNth(nth int) string { + var _ms C.struct_miqt_string = C.QRegularExpressionMatch_capturedWithNth(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 *QRegularExpressionMatch) CapturedStart1(nth int) int { - return (int)(C.QRegularExpressionMatch_capturedStart1(this.h, (C.int)(nth))) +func (this *QRegularExpressionMatch) CapturedStartWithNth(nth int) int { + return (int)(C.QRegularExpressionMatch_capturedStartWithNth(this.h, (C.int)(nth))) } -func (this *QRegularExpressionMatch) CapturedLength1(nth int) int { - return (int)(C.QRegularExpressionMatch_capturedLength1(this.h, (C.int)(nth))) +func (this *QRegularExpressionMatch) CapturedLengthWithNth(nth int) int { + return (int)(C.QRegularExpressionMatch_capturedLengthWithNth(this.h, (C.int)(nth))) } -func (this *QRegularExpressionMatch) CapturedEnd1(nth int) int { - return (int)(C.QRegularExpressionMatch_capturedEnd1(this.h, (C.int)(nth))) +func (this *QRegularExpressionMatch) CapturedEndWithNth(nth int) int { + return (int)(C.QRegularExpressionMatch_capturedEndWithNth(this.h, (C.int)(nth))) } // Delete this object from C++ memory. diff --git a/qt/gen_qregularexpression.h b/qt/gen_qregularexpression.h index f9ac8531..1c69fd3c 100644 --- a/qt/gen_qregularexpression.h +++ b/qt/gen_qregularexpression.h @@ -75,10 +75,10 @@ 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_capturedStart1(const QRegularExpressionMatch* self, int nth); -int QRegularExpressionMatch_capturedLength1(const QRegularExpressionMatch* self, int nth); -int QRegularExpressionMatch_capturedEnd1(const QRegularExpressionMatch* self, int nth); +struct miqt_string QRegularExpressionMatch_capturedWithNth(const QRegularExpressionMatch* self, int nth); +int QRegularExpressionMatch_capturedStartWithNth(const QRegularExpressionMatch* self, int nth); +int QRegularExpressionMatch_capturedLengthWithNth(const QRegularExpressionMatch* self, int nth); +int QRegularExpressionMatch_capturedEndWithNth(const QRegularExpressionMatch* self, int nth); void QRegularExpressionMatch_delete(QRegularExpressionMatch* self); QRegularExpressionMatchIterator* QRegularExpressionMatchIterator_new(); diff --git a/qt/gen_qresource.cpp b/qt/gen_qresource.cpp index ebf0be08..e2df49d7 100644 --- a/qt/gen_qresource.cpp +++ b/qt/gen_qresource.cpp @@ -162,12 +162,12 @@ bool QResource_unregisterResource2(struct miqt_string rccFilename, struct miqt_s return QResource::unregisterResource(rccFilename_QString, resourceRoot_QString); } -bool QResource_registerResource22(const unsigned char* rccData, struct miqt_string resourceRoot) { +bool QResource_registerResource3(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) { +bool QResource_unregisterResource3(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 baa7d4d9..9a44c29f 100644 --- a/qt/gen_qresource.go +++ b/qt/gen_qresource.go @@ -217,20 +217,20 @@ func QResource_UnregisterResource2(rccFilename string, resourceRoot string) bool return (bool)(C.QResource_unregisterResource2(rccFilename_ms, resourceRoot_ms)) } -func QResource_RegisterResource22(rccData *byte, resourceRoot string) bool { +func QResource_RegisterResource3(rccData *byte, resourceRoot string) bool { 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)) + return (bool)(C.QResource_registerResource3((*C.uchar)(unsafe.Pointer(rccData)), resourceRoot_ms)) } -func QResource_UnregisterResource22(rccData *byte, resourceRoot string) bool { +func QResource_UnregisterResource3(rccData *byte, resourceRoot string) bool { 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)) + return (bool)(C.QResource_unregisterResource3((*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 57230ae0..6d2f277a 100644 --- a/qt/gen_qresource.h +++ b/qt/gen_qresource.h @@ -48,8 +48,8 @@ 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_registerResource3(const unsigned char* rccData, struct miqt_string resourceRoot); +bool QResource_unregisterResource3(const unsigned char* rccData, struct miqt_string resourceRoot); void QResource_delete(QResource* self); #ifdef __cplusplus diff --git a/qt/gen_qrgba64.cpp b/qt/gen_qrgba64.cpp index bf1f5133..dd393450 100644 --- a/qt/gen_qrgba64.cpp +++ b/qt/gen_qrgba64.cpp @@ -22,7 +22,7 @@ QRgba64* QRgba64_fromRgba64(unsigned long long c) { return new QRgba64(QRgba64::fromRgba64(static_cast(c))); } -QRgba64* QRgba64_fromRgba642(uint16_t red, uint16_t green, uint16_t blue, uint16_t alpha) { +QRgba64* QRgba64_fromRgba642(unsigned short red, unsigned short green, unsigned short blue, unsigned short alpha) { return new QRgba64(QRgba64::fromRgba64(static_cast(red), static_cast(green), static_cast(blue), static_cast(alpha))); } @@ -42,39 +42,39 @@ bool QRgba64_isTransparent(const QRgba64* self) { return self->isTransparent(); } -uint16_t QRgba64_red(const QRgba64* self) { +unsigned short QRgba64_red(const QRgba64* self) { quint16 _ret = self->red(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QRgba64_green(const QRgba64* self) { +unsigned short QRgba64_green(const QRgba64* self) { quint16 _ret = self->green(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QRgba64_blue(const QRgba64* self) { +unsigned short QRgba64_blue(const QRgba64* self) { quint16 _ret = self->blue(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QRgba64_alpha(const QRgba64* self) { +unsigned short QRgba64_alpha(const QRgba64* self) { quint16 _ret = self->alpha(); - return static_cast(_ret); + return static_cast(_ret); } -void QRgba64_setRed(QRgba64* self, uint16_t _red) { +void QRgba64_setRed(QRgba64* self, unsigned short _red) { self->setRed(static_cast(_red)); } -void QRgba64_setGreen(QRgba64* self, uint16_t _green) { +void QRgba64_setGreen(QRgba64* self, unsigned short _green) { self->setGreen(static_cast(_green)); } -void QRgba64_setBlue(QRgba64* self, uint16_t _blue) { +void QRgba64_setBlue(QRgba64* self, unsigned short _blue) { self->setBlue(static_cast(_blue)); } -void QRgba64_setAlpha(QRgba64* self, uint16_t _alpha) { +void QRgba64_setAlpha(QRgba64* self, unsigned short _alpha) { self->setAlpha(static_cast(_alpha)); } @@ -103,9 +103,9 @@ unsigned int QRgba64_toArgb32(const QRgba64* self) { return static_cast(_ret); } -uint16_t QRgba64_toRgb16(const QRgba64* self) { +unsigned short QRgba64_toRgb16(const QRgba64* self) { ushort _ret = self->toRgb16(); - return static_cast(_ret); + return static_cast(_ret); } QRgba64* QRgba64_premultiplied(const QRgba64* self) { diff --git a/qt/gen_qrgba64.go b/qt/gen_qrgba64.go index e72af825..cc4d82a4 100644 --- a/qt/gen_qrgba64.go +++ b/qt/gen_qrgba64.go @@ -64,7 +64,7 @@ func QRgba64_FromRgba64(c uint64) *QRgba64 { } func QRgba64_FromRgba642(red uint16, green uint16, blue uint16, alpha uint16) *QRgba64 { - _goptr := newQRgba64(C.QRgba64_fromRgba642((C.uint16_t)(red), (C.uint16_t)(green), (C.uint16_t)(blue), (C.uint16_t)(alpha))) + _goptr := newQRgba64(C.QRgba64_fromRgba642((C.ushort)(red), (C.ushort)(green), (C.ushort)(blue), (C.ushort)(alpha))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -106,19 +106,19 @@ func (this *QRgba64) Alpha() uint16 { } func (this *QRgba64) SetRed(_red uint16) { - C.QRgba64_setRed(this.h, (C.uint16_t)(_red)) + C.QRgba64_setRed(this.h, (C.ushort)(_red)) } func (this *QRgba64) SetGreen(_green uint16) { - C.QRgba64_setGreen(this.h, (C.uint16_t)(_green)) + C.QRgba64_setGreen(this.h, (C.ushort)(_green)) } func (this *QRgba64) SetBlue(_blue uint16) { - C.QRgba64_setBlue(this.h, (C.uint16_t)(_blue)) + C.QRgba64_setBlue(this.h, (C.ushort)(_blue)) } func (this *QRgba64) SetAlpha(_alpha uint16) { - C.QRgba64_setAlpha(this.h, (C.uint16_t)(_alpha)) + C.QRgba64_setAlpha(this.h, (C.ushort)(_alpha)) } func (this *QRgba64) Red8() byte { diff --git a/qt/gen_qrgba64.h b/qt/gen_qrgba64.h index fadb0c84..17d6a08c 100644 --- a/qt/gen_qrgba64.h +++ b/qt/gen_qrgba64.h @@ -23,25 +23,25 @@ typedef struct QRgba64 QRgba64; QRgba64* QRgba64_new(); QRgba64* QRgba64_new2(QRgba64* param1); QRgba64* QRgba64_fromRgba64(unsigned long long c); -QRgba64* QRgba64_fromRgba642(uint16_t red, uint16_t green, uint16_t blue, uint16_t alpha); +QRgba64* QRgba64_fromRgba642(unsigned short red, unsigned short green, unsigned short blue, unsigned short alpha); QRgba64* QRgba64_fromRgba(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha); QRgba64* QRgba64_fromArgb32(unsigned int rgb); bool QRgba64_isOpaque(const QRgba64* self); bool QRgba64_isTransparent(const QRgba64* self); -uint16_t QRgba64_red(const QRgba64* self); -uint16_t QRgba64_green(const QRgba64* self); -uint16_t QRgba64_blue(const QRgba64* self); -uint16_t QRgba64_alpha(const QRgba64* self); -void QRgba64_setRed(QRgba64* self, uint16_t _red); -void QRgba64_setGreen(QRgba64* self, uint16_t _green); -void QRgba64_setBlue(QRgba64* self, uint16_t _blue); -void QRgba64_setAlpha(QRgba64* self, uint16_t _alpha); +unsigned short QRgba64_red(const QRgba64* self); +unsigned short QRgba64_green(const QRgba64* self); +unsigned short QRgba64_blue(const QRgba64* self); +unsigned short QRgba64_alpha(const QRgba64* self); +void QRgba64_setRed(QRgba64* self, unsigned short _red); +void QRgba64_setGreen(QRgba64* self, unsigned short _green); +void QRgba64_setBlue(QRgba64* self, unsigned short _blue); +void QRgba64_setAlpha(QRgba64* self, unsigned short _alpha); unsigned char QRgba64_red8(const QRgba64* self); unsigned char QRgba64_green8(const QRgba64* self); unsigned char QRgba64_blue8(const QRgba64* self); unsigned char QRgba64_alpha8(const QRgba64* self); unsigned int QRgba64_toArgb32(const QRgba64* self); -uint16_t QRgba64_toRgb16(const QRgba64* self); +unsigned short QRgba64_toRgb16(const QRgba64* self); QRgba64* QRgba64_premultiplied(const QRgba64* self); QRgba64* QRgba64_unpremultiplied(const QRgba64* self); unsigned long long QRgba64_ToUnsignedLongLong(const QRgba64* self); diff --git a/qt/gen_qscrollarea.cpp b/qt/gen_qscrollarea.cpp index 07197f4e..1deecf2f 100644 --- a/qt/gen_qscrollarea.cpp +++ b/qt/gen_qscrollarea.cpp @@ -1216,11 +1216,11 @@ struct miqt_string QScrollArea_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QScrollArea_ensureVisible3(QScrollArea* self, int x, int y, int xmargin) { +void QScrollArea_ensureVisible2(QScrollArea* self, int x, int y, int xmargin) { self->ensureVisible(static_cast(x), static_cast(y), static_cast(xmargin)); } -void QScrollArea_ensureVisible4(QScrollArea* self, int x, int y, int xmargin, int ymargin) { +void QScrollArea_ensureVisible3(QScrollArea* self, int x, int y, int xmargin, int ymargin) { self->ensureVisible(static_cast(x), static_cast(y), static_cast(xmargin), static_cast(ymargin)); } diff --git a/qt/gen_qscrollarea.go b/qt/gen_qscrollarea.go index 6550a462..31108f8f 100644 --- a/qt/gen_qscrollarea.go +++ b/qt/gen_qscrollarea.go @@ -180,12 +180,12 @@ func QScrollArea_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QScrollArea) EnsureVisible3(x int, y int, xmargin int) { - C.QScrollArea_ensureVisible3(this.h, (C.int)(x), (C.int)(y), (C.int)(xmargin)) +func (this *QScrollArea) EnsureVisible2(x int, y int, xmargin int) { + C.QScrollArea_ensureVisible2(this.h, (C.int)(x), (C.int)(y), (C.int)(xmargin)) } -func (this *QScrollArea) EnsureVisible4(x int, y int, xmargin int, ymargin int) { - C.QScrollArea_ensureVisible4(this.h, (C.int)(x), (C.int)(y), (C.int)(xmargin), (C.int)(ymargin)) +func (this *QScrollArea) EnsureVisible3(x int, y int, xmargin int, ymargin int) { + C.QScrollArea_ensureVisible3(this.h, (C.int)(x), (C.int)(y), (C.int)(xmargin), (C.int)(ymargin)) } func (this *QScrollArea) EnsureWidgetVisible2(childWidget *QWidget, xmargin int) { diff --git a/qt/gen_qscrollarea.h b/qt/gen_qscrollarea.h index 74cb6be8..0cd0d0b5 100644 --- a/qt/gen_qscrollarea.h +++ b/qt/gen_qscrollarea.h @@ -117,8 +117,8 @@ 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_ensureVisible2(QScrollArea* self, int x, int y, int xmargin); +void QScrollArea_ensureVisible3(QScrollArea* self, int x, int y, int xmargin, int ymargin); void QScrollArea_ensureWidgetVisible2(QScrollArea* self, QWidget* childWidget, int xmargin); void QScrollArea_ensureWidgetVisible3(QScrollArea* self, QWidget* childWidget, int xmargin, int ymargin); bool QScrollArea_override_virtual_sizeHint(void* self, intptr_t slot); diff --git a/qt/gen_qscroller.cpp b/qt/gen_qscroller.cpp index 396a12d8..8c7f68a1 100644 --- a/qt/gen_qscroller.cpp +++ b/qt/gen_qscroller.cpp @@ -254,7 +254,7 @@ int QScroller_grabGesture2(QObject* target, int gestureType) { return static_cast(_ret); } -bool QScroller_handleInput3(QScroller* self, int input, QPointF* position, long long timestamp) { +bool QScroller_handleInput2(QScroller* self, int input, QPointF* position, long long timestamp) { return self->handleInput(static_cast(input), *position, static_cast(timestamp)); } diff --git a/qt/gen_qscroller.go b/qt/gen_qscroller.go index fe02c595..bf54346a 100644 --- a/qt/gen_qscroller.go +++ b/qt/gen_qscroller.go @@ -317,6 +317,6 @@ func QScroller_GrabGesture2(target *QObject, gestureType QScroller__ScrollerGest return (GestureType)(C.QScroller_grabGesture2(target.cPointer(), (C.int)(gestureType))) } -func (this *QScroller) HandleInput3(input QScroller__Input, position *QPointF, timestamp int64) bool { - return (bool)(C.QScroller_handleInput3(this.h, (C.int)(input), position.cPointer(), (C.longlong)(timestamp))) +func (this *QScroller) HandleInput2(input QScroller__Input, position *QPointF, timestamp int64) bool { + return (bool)(C.QScroller_handleInput2(this.h, (C.int)(input), position.cPointer(), (C.longlong)(timestamp))) } diff --git a/qt/gen_qscroller.h b/qt/gen_qscroller.h index e14a3389..d5f3b7a6 100644 --- a/qt/gen_qscroller.h +++ b/qt/gen_qscroller.h @@ -71,7 +71,7 @@ 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); +bool QScroller_handleInput2(QScroller* self, int input, QPointF* position, long long timestamp); #ifdef __cplusplus } /* extern C */ diff --git a/qt/gen_qsemaphore.cpp b/qt/gen_qsemaphore.cpp index 2da97075..157a1f6a 100644 --- a/qt/gen_qsemaphore.cpp +++ b/qt/gen_qsemaphore.cpp @@ -39,15 +39,15 @@ int QSemaphore_available(const QSemaphore* self) { return self->available(); } -void QSemaphore_acquire1(QSemaphore* self, int n) { +void QSemaphore_acquireWithInt(QSemaphore* self, int n) { self->acquire(static_cast(n)); } -bool QSemaphore_tryAcquire1(QSemaphore* self, int n) { +bool QSemaphore_tryAcquireWithInt(QSemaphore* self, int n) { return self->tryAcquire(static_cast(n)); } -void QSemaphore_release1(QSemaphore* self, int n) { +void QSemaphore_releaseWithInt(QSemaphore* self, int n) { self->release(static_cast(n)); } diff --git a/qt/gen_qsemaphore.go b/qt/gen_qsemaphore.go index 276606df..29efc777 100644 --- a/qt/gen_qsemaphore.go +++ b/qt/gen_qsemaphore.go @@ -77,16 +77,16 @@ func (this *QSemaphore) Available() int { return (int)(C.QSemaphore_available(this.h)) } -func (this *QSemaphore) Acquire1(n int) { - C.QSemaphore_acquire1(this.h, (C.int)(n)) +func (this *QSemaphore) AcquireWithInt(n int) { + C.QSemaphore_acquireWithInt(this.h, (C.int)(n)) } -func (this *QSemaphore) TryAcquire1(n int) bool { - return (bool)(C.QSemaphore_tryAcquire1(this.h, (C.int)(n))) +func (this *QSemaphore) TryAcquireWithInt(n int) bool { + return (bool)(C.QSemaphore_tryAcquireWithInt(this.h, (C.int)(n))) } -func (this *QSemaphore) Release1(n int) { - C.QSemaphore_release1(this.h, (C.int)(n)) +func (this *QSemaphore) ReleaseWithInt(n int) { + C.QSemaphore_releaseWithInt(this.h, (C.int)(n)) } // Delete this object from C++ memory. diff --git a/qt/gen_qsemaphore.h b/qt/gen_qsemaphore.h index be4f875d..f449fab9 100644 --- a/qt/gen_qsemaphore.h +++ b/qt/gen_qsemaphore.h @@ -29,9 +29,9 @@ bool QSemaphore_tryAcquire(QSemaphore* self); bool QSemaphore_tryAcquire2(QSemaphore* self, int n, int timeout); void QSemaphore_release(QSemaphore* self); int QSemaphore_available(const QSemaphore* self); -void QSemaphore_acquire1(QSemaphore* self, int n); -bool QSemaphore_tryAcquire1(QSemaphore* self, int n); -void QSemaphore_release1(QSemaphore* self, int n); +void QSemaphore_acquireWithInt(QSemaphore* self, int n); +bool QSemaphore_tryAcquireWithInt(QSemaphore* self, int n); +void QSemaphore_releaseWithInt(QSemaphore* self, int n); void QSemaphore_delete(QSemaphore* self); QSemaphoreReleaser* QSemaphoreReleaser_new(); diff --git a/qt/gen_qsharedmemory.cpp b/qt/gen_qsharedmemory.cpp index 8d946666..36aa3220 100644 --- a/qt/gen_qsharedmemory.cpp +++ b/qt/gen_qsharedmemory.cpp @@ -369,7 +369,7 @@ bool QSharedMemory_create2(QSharedMemory* self, int size, int mode) { return self->create(static_cast(size), static_cast(mode)); } -bool QSharedMemory_attach1(QSharedMemory* self, int mode) { +bool QSharedMemory_attachWithMode(QSharedMemory* self, int mode) { return self->attach(static_cast(mode)); } diff --git a/qt/gen_qsharedmemory.go b/qt/gen_qsharedmemory.go index b45a1896..1c02110b 100644 --- a/qt/gen_qsharedmemory.go +++ b/qt/gen_qsharedmemory.go @@ -263,8 +263,8 @@ func (this *QSharedMemory) Create2(size int, mode QSharedMemory__AccessMode) boo return (bool)(C.QSharedMemory_create2(this.h, (C.int)(size), (C.int)(mode))) } -func (this *QSharedMemory) Attach1(mode QSharedMemory__AccessMode) bool { - return (bool)(C.QSharedMemory_attach1(this.h, (C.int)(mode))) +func (this *QSharedMemory) AttachWithMode(mode QSharedMemory__AccessMode) bool { + return (bool)(C.QSharedMemory_attachWithMode(this.h, (C.int)(mode))) } // Sender can only be called from a QSharedMemory that was directly constructed. diff --git a/qt/gen_qsharedmemory.h b/qt/gen_qsharedmemory.h index 71f97567..ad94c1fe 100644 --- a/qt/gen_qsharedmemory.h +++ b/qt/gen_qsharedmemory.h @@ -62,7 +62,7 @@ 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); +bool QSharedMemory_attachWithMode(QSharedMemory* self, int mode); bool QSharedMemory_override_virtual_event(void* self, intptr_t slot); bool QSharedMemory_virtualbase_event(void* self, QEvent* event); bool QSharedMemory_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt/gen_qsocketnotifier.cpp b/qt/gen_qsocketnotifier.cpp index 3a06241b..7552db93 100644 --- a/qt/gen_qsocketnotifier.cpp +++ b/qt/gen_qsocketnotifier.cpp @@ -451,7 +451,11 @@ void QSocketNotifier_delete(QSocketNotifier* self) { } QSocketDescriptor* QSocketDescriptor_new() { +#ifndef Q_OS_LINUX + return nullptr; +#else return new QSocketDescriptor(); +#endif } QSocketDescriptor* QSocketDescriptor_new2(QSocketDescriptor* param1) { diff --git a/qt/gen_qsocketnotifier.go b/qt/gen_qsocketnotifier.go index fe082457..bcdb4143 100644 --- a/qt/gen_qsocketnotifier.go +++ b/qt/gen_qsocketnotifier.go @@ -453,6 +453,10 @@ func UnsafeNewQSocketDescriptor(h unsafe.Pointer) *QSocketDescriptor { // NewQSocketDescriptor constructs a new QSocketDescriptor object. func NewQSocketDescriptor() *QSocketDescriptor { + if runtime.GOOS != "linux" { + panic("Unsupported OS") + } + return newQSocketDescriptor(C.QSocketDescriptor_new()) } diff --git a/qt/gen_qsortfilterproxymodel.cpp b/qt/gen_qsortfilterproxymodel.cpp index 60337e11..ad598aeb 100644 --- a/qt/gen_qsortfilterproxymodel.cpp +++ b/qt/gen_qsortfilterproxymodel.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qsplitter.cpp b/qt/gen_qsplitter.cpp index 75c7cdf4..4c586e41 100644 --- a/qt/gen_qsplitter.cpp +++ b/qt/gen_qsplitter.cpp @@ -1308,7 +1308,7 @@ struct miqt_string QSplitter_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QSplitter_setOpaqueResize1(QSplitter* self, bool opaque) { +void QSplitter_setOpaqueResizeWithOpaque(QSplitter* self, bool opaque) { self->setOpaqueResize(opaque); } diff --git a/qt/gen_qsplitter.go b/qt/gen_qsplitter.go index ff34d231..633ffab5 100644 --- a/qt/gen_qsplitter.go +++ b/qt/gen_qsplitter.go @@ -298,8 +298,8 @@ func QSplitter_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QSplitter) SetOpaqueResize1(opaque bool) { - C.QSplitter_setOpaqueResize1(this.h, (C.bool)(opaque)) +func (this *QSplitter) SetOpaqueResizeWithOpaque(opaque bool) { + C.QSplitter_setOpaqueResizeWithOpaque(this.h, (C.bool)(opaque)) } // MoveSplitter can only be called from a QSplitter that was directly constructed. diff --git a/qt/gen_qsplitter.h b/qt/gen_qsplitter.h index 6e0df95a..4dbd3af7 100644 --- a/qt/gen_qsplitter.h +++ b/qt/gen_qsplitter.h @@ -134,7 +134,7 @@ 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_setOpaqueResizeWithOpaque(QSplitter* self, bool opaque); bool QSplitter_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QSplitter_virtualbase_sizeHint(const void* self); bool QSplitter_override_virtual_minimumSizeHint(void* self, intptr_t slot); diff --git a/qt/gen_qstandarditemmodel.cpp b/qt/gen_qstandarditemmodel.cpp index 88237f3e..3083577c 100644 --- a/qt/gen_qstandarditemmodel.cpp +++ b/qt/gen_qstandarditemmodel.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -2234,7 +2235,7 @@ QStandardItem* QStandardItemModel_item2(const QStandardItemModel* self, int row, return self->item(static_cast(row), static_cast(column)); } -bool QStandardItemModel_insertRow22(QStandardItemModel* self, int row, QModelIndex* parent) { +bool QStandardItemModel_insertRow3(QStandardItemModel* self, int row, QModelIndex* parent) { return self->insertRow(static_cast(row), *parent); } diff --git a/qt/gen_qstandarditemmodel.go b/qt/gen_qstandarditemmodel.go index aff8ce5c..fad0775a 100644 --- a/qt/gen_qstandarditemmodel.go +++ b/qt/gen_qstandarditemmodel.go @@ -1288,8 +1288,8 @@ func (this *QStandardItemModel) Item2(row int, column int) *QStandardItem { return newQStandardItem(C.QStandardItemModel_item2(this.h, (C.int)(row), (C.int)(column))) } -func (this *QStandardItemModel) InsertRow22(row int, parent *QModelIndex) bool { - return (bool)(C.QStandardItemModel_insertRow22(this.h, (C.int)(row), parent.cPointer())) +func (this *QStandardItemModel) InsertRow3(row int, parent *QModelIndex) bool { + return (bool)(C.QStandardItemModel_insertRow3(this.h, (C.int)(row), parent.cPointer())) } func (this *QStandardItemModel) InsertColumn2(column int, parent *QModelIndex) bool { diff --git a/qt/gen_qstandarditemmodel.h b/qt/gen_qstandarditemmodel.h index 1c851235..14de6106 100644 --- a/qt/gen_qstandarditemmodel.h +++ b/qt/gen_qstandarditemmodel.h @@ -235,7 +235,7 @@ 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); QStandardItem* QStandardItemModel_item2(const QStandardItemModel* self, int row, int column); -bool QStandardItemModel_insertRow22(QStandardItemModel* self, int row, QModelIndex* parent); +bool QStandardItemModel_insertRow3(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 /* of QStandardItem* */ QStandardItemModel_findItems2(const QStandardItemModel* self, struct miqt_string text, int flags); diff --git a/qt/gen_qstandardpaths.cpp b/qt/gen_qstandardpaths.cpp index fd3c5af0..1449a285 100644 --- a/qt/gen_qstandardpaths.cpp +++ b/qt/gen_qstandardpaths.cpp @@ -113,7 +113,7 @@ bool QStandardPaths_isTestModeEnabled() { return QStandardPaths::isTestModeEnabled(); } -struct miqt_string QStandardPaths_locate3(int type, struct miqt_string fileName, int options) { +struct miqt_string QStandardPaths_locate2(int type, struct miqt_string fileName, int options) { QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QString _ret = QStandardPaths::locate(static_cast(type), fileName_QString, static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -125,7 +125,7 @@ struct miqt_string QStandardPaths_locate3(int type, struct miqt_string fileName, return _ms; } -struct miqt_array /* of struct miqt_string */ QStandardPaths_locateAll3(int type, struct miqt_string fileName, int options) { +struct miqt_array /* of struct miqt_string */ QStandardPaths_locateAll2(int type, struct miqt_string fileName, int options) { QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QStringList _ret = QStandardPaths::locateAll(static_cast(type), fileName_QString, static_cast(options)); // Convert QList<> from C++ memory to manually-managed C memory diff --git a/qt/gen_qstandardpaths.go b/qt/gen_qstandardpaths.go index 047f9a67..80a95372 100644 --- a/qt/gen_qstandardpaths.go +++ b/qt/gen_qstandardpaths.go @@ -154,23 +154,23 @@ func QStandardPaths_IsTestModeEnabled() bool { return (bool)(C.QStandardPaths_isTestModeEnabled()) } -func QStandardPaths_Locate3(typeVal QStandardPaths__StandardLocation, fileName string, options QStandardPaths__LocateOption) string { +func QStandardPaths_Locate2(typeVal QStandardPaths__StandardLocation, fileName string, options QStandardPaths__LocateOption) 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)) - var _ms C.struct_miqt_string = C.QStandardPaths_locate3((C.int)(typeVal), fileName_ms, (C.int)(options)) + var _ms C.struct_miqt_string = C.QStandardPaths_locate2((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 { +func QStandardPaths_LocateAll2(typeVal QStandardPaths__StandardLocation, fileName string, options QStandardPaths__LocateOption) []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)) - var _ma C.struct_miqt_array = C.QStandardPaths_locateAll3((C.int)(typeVal), fileName_ms, (C.int)(options)) + var _ma C.struct_miqt_array = C.QStandardPaths_locateAll2((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 for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qstandardpaths.h b/qt/gen_qstandardpaths.h index 32b83e23..b3823ffd 100644 --- a/qt/gen_qstandardpaths.h +++ b/qt/gen_qstandardpaths.h @@ -29,8 +29,8 @@ struct miqt_string QStandardPaths_findExecutable(struct miqt_string executableNa void QStandardPaths_enableTestMode(bool testMode); void QStandardPaths_setTestModeEnabled(bool testMode); bool QStandardPaths_isTestModeEnabled(); -struct miqt_string QStandardPaths_locate3(int type, struct miqt_string fileName, int options); -struct miqt_array /* of struct miqt_string */ QStandardPaths_locateAll3(int type, struct miqt_string fileName, int options); +struct miqt_string QStandardPaths_locate2(int type, struct miqt_string fileName, int options); +struct miqt_array /* of struct miqt_string */ QStandardPaths_locateAll2(int type, 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 diff --git a/qt/gen_qstatemachine.cpp b/qt/gen_qstatemachine.cpp index ad9f7a6e..37154584 100644 --- a/qt/gen_qstatemachine.cpp +++ b/qt/gen_qstatemachine.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include "gen_qstatemachine.h" @@ -793,7 +794,17 @@ void QStateMachine_delete(QStateMachine* self) { delete self; } -QStateMachine__SignalEvent* QStateMachine__SignalEvent_new(QStateMachine__SignalEvent* param1) { +QStateMachine__SignalEvent* QStateMachine__SignalEvent_new(QObject* sender, int signalIndex, struct miqt_array /* of QVariant* */ arguments) { + QList arguments_QList; + arguments_QList.reserve(arguments.len); + QVariant** arguments_arr = static_cast(arguments.data); + for(size_t i = 0; i < arguments.len; ++i) { + arguments_QList.push_back(*(arguments_arr[i])); + } + return new QStateMachine::SignalEvent(sender, static_cast(signalIndex), arguments_QList); +} + +QStateMachine__SignalEvent* QStateMachine__SignalEvent_new2(QStateMachine__SignalEvent* param1) { return new QStateMachine::SignalEvent(*param1); } @@ -809,6 +820,19 @@ int QStateMachine__SignalEvent_signalIndex(const QStateMachine__SignalEvent* sel return self->signalIndex(); } +struct miqt_array /* of QVariant* */ QStateMachine__SignalEvent_arguments(const QStateMachine__SignalEvent* self) { + QList _ret = self->arguments(); + // Convert QList<> from C++ memory to manually-managed C memory + QVariant** _arr = static_cast(malloc(sizeof(QVariant*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = new QVariant(_ret[i]); + } + struct miqt_array _out; + _out.len = _ret.length(); + _out.data = static_cast(_arr); + return _out; +} + void QStateMachine__SignalEvent_delete(QStateMachine__SignalEvent* self) { delete self; } diff --git a/qt/gen_qstatemachine.go b/qt/gen_qstatemachine.go index 1c21e809..db3fc2dd 100644 --- a/qt/gen_qstatemachine.go +++ b/qt/gen_qstatemachine.go @@ -741,9 +741,21 @@ func UnsafeNewQStateMachine__SignalEvent(h unsafe.Pointer) *QStateMachine__Signa } // NewQStateMachine__SignalEvent constructs a new QStateMachine::SignalEvent object. -func NewQStateMachine__SignalEvent(param1 *QStateMachine__SignalEvent) *QStateMachine__SignalEvent { +func NewQStateMachine__SignalEvent(sender *QObject, signalIndex int, arguments []QVariant) *QStateMachine__SignalEvent { + arguments_CArray := (*[0xffff]*C.QVariant)(C.malloc(C.size_t(8 * len(arguments)))) + defer C.free(unsafe.Pointer(arguments_CArray)) + for i := range arguments { + arguments_CArray[i] = arguments[i].cPointer() + } + arguments_ma := C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} - return newQStateMachine__SignalEvent(C.QStateMachine__SignalEvent_new(param1.cPointer())) + return newQStateMachine__SignalEvent(C.QStateMachine__SignalEvent_new(sender.cPointer(), (C.int)(signalIndex), arguments_ma)) +} + +// NewQStateMachine__SignalEvent2 constructs a new QStateMachine::SignalEvent object. +func NewQStateMachine__SignalEvent2(param1 *QStateMachine__SignalEvent) *QStateMachine__SignalEvent { + + return newQStateMachine__SignalEvent(C.QStateMachine__SignalEvent_new2(param1.cPointer())) } func (this *QStateMachine__SignalEvent) Sender() *QObject { @@ -754,6 +766,18 @@ func (this *QStateMachine__SignalEvent) SignalIndex() int { return (int)(C.QStateMachine__SignalEvent_signalIndex(this.h)) } +func (this *QStateMachine__SignalEvent) Arguments() []QVariant { + var _ma C.struct_miqt_array = C.QStateMachine__SignalEvent_arguments(this.h) + _ret := make([]QVariant, int(_ma.len)) + _outCast := (*[0xffff]*C.QVariant)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _lv_goptr := newQVariant(_outCast[i]) + _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + _ret[i] = *_lv_goptr + } + return _ret +} + // Delete this object from C++ memory. func (this *QStateMachine__SignalEvent) Delete() { C.QStateMachine__SignalEvent_delete(this.h) diff --git a/qt/gen_qstatemachine.h b/qt/gen_qstatemachine.h index 3c331346..9f8489bb 100644 --- a/qt/gen_qstatemachine.h +++ b/qt/gen_qstatemachine.h @@ -35,6 +35,7 @@ typedef QStateMachine::WrappedEvent QStateMachine__WrappedEvent; class QStateMachine__WrappedEvent; #endif class QTimerEvent; +class QVariant; #else typedef struct QAbstractAnimation QAbstractAnimation; typedef struct QAbstractState QAbstractState; @@ -48,6 +49,7 @@ typedef struct QStateMachine QStateMachine; typedef struct QStateMachine__SignalEvent QStateMachine__SignalEvent; typedef struct QStateMachine__WrappedEvent QStateMachine__WrappedEvent; typedef struct QTimerEvent QTimerEvent; +typedef struct QVariant QVariant; #endif QStateMachine* QStateMachine_new(); @@ -126,10 +128,12 @@ int QStateMachine_protectedbase_receivers(bool* _dynamic_cast_ok, const void* se bool QStateMachine_protectedbase_isSignalConnected(bool* _dynamic_cast_ok, const void* self, QMetaMethod* signal); void QStateMachine_delete(QStateMachine* self); -QStateMachine__SignalEvent* QStateMachine__SignalEvent_new(QStateMachine__SignalEvent* param1); +QStateMachine__SignalEvent* QStateMachine__SignalEvent_new(QObject* sender, int signalIndex, struct miqt_array /* of QVariant* */ arguments); +QStateMachine__SignalEvent* QStateMachine__SignalEvent_new2(QStateMachine__SignalEvent* param1); void QStateMachine__SignalEvent_virtbase(QStateMachine__SignalEvent* src, QEvent** outptr_QEvent); QObject* QStateMachine__SignalEvent_sender(const QStateMachine__SignalEvent* self); int QStateMachine__SignalEvent_signalIndex(const QStateMachine__SignalEvent* self); +struct miqt_array /* of QVariant* */ QStateMachine__SignalEvent_arguments(const QStateMachine__SignalEvent* self); void QStateMachine__SignalEvent_delete(QStateMachine__SignalEvent* self); QStateMachine__WrappedEvent* QStateMachine__WrappedEvent_new(QObject* object, QEvent* event); diff --git a/qt/gen_qstatictext.cpp b/qt/gen_qstatictext.cpp index 626d38fc..cebbc5b3 100644 --- a/qt/gen_qstatictext.cpp +++ b/qt/gen_qstatictext.cpp @@ -105,7 +105,7 @@ bool QStaticText_operatorNotEqual(const QStaticText* self, QStaticText* param1) return (*self != *param1); } -void QStaticText_prepare1(QStaticText* self, QTransform* matrix) { +void QStaticText_prepareWithMatrix(QStaticText* self, QTransform* matrix) { self->prepare(*matrix); } diff --git a/qt/gen_qstatictext.go b/qt/gen_qstatictext.go index 045c8c6c..e8c80c0f 100644 --- a/qt/gen_qstatictext.go +++ b/qt/gen_qstatictext.go @@ -149,8 +149,8 @@ func (this *QStaticText) OperatorNotEqual(param1 *QStaticText) bool { return (bool)(C.QStaticText_operatorNotEqual(this.h, param1.cPointer())) } -func (this *QStaticText) Prepare1(matrix *QTransform) { - C.QStaticText_prepare1(this.h, matrix.cPointer()) +func (this *QStaticText) PrepareWithMatrix(matrix *QTransform) { + C.QStaticText_prepareWithMatrix(this.h, matrix.cPointer()) } func (this *QStaticText) Prepare2(matrix *QTransform, font *QFont) { diff --git a/qt/gen_qstatictext.h b/qt/gen_qstatictext.h index 5c98c668..0e67a42a 100644 --- a/qt/gen_qstatictext.h +++ b/qt/gen_qstatictext.h @@ -47,7 +47,7 @@ void QStaticText_setPerformanceHint(QStaticText* self, int performanceHint); int QStaticText_performanceHint(const QStaticText* self); bool QStaticText_operatorEqual(const QStaticText* self, QStaticText* param1); bool QStaticText_operatorNotEqual(const QStaticText* self, QStaticText* param1); -void QStaticText_prepare1(QStaticText* self, QTransform* matrix); +void QStaticText_prepareWithMatrix(QStaticText* self, QTransform* matrix); void QStaticText_prepare2(QStaticText* self, QTransform* matrix, QFont* font); void QStaticText_delete(QStaticText* self); diff --git a/qt/gen_qstatusbar.cpp b/qt/gen_qstatusbar.cpp index 420a3984..ce8f68ad 100644 --- a/qt/gen_qstatusbar.cpp +++ b/qt/gen_qstatusbar.cpp @@ -1159,7 +1159,7 @@ void QStatusBar_addWidget2(QStatusBar* self, QWidget* widget, int stretch) { self->addWidget(widget, static_cast(stretch)); } -int QStatusBar_insertWidget3(QStatusBar* self, int index, QWidget* widget, int stretch) { +int QStatusBar_insertWidget2(QStatusBar* self, int index, QWidget* widget, int stretch) { return self->insertWidget(static_cast(index), widget, static_cast(stretch)); } @@ -1167,7 +1167,7 @@ void QStatusBar_addPermanentWidget2(QStatusBar* self, QWidget* widget, int stret self->addPermanentWidget(widget, static_cast(stretch)); } -int QStatusBar_insertPermanentWidget3(QStatusBar* self, int index, QWidget* widget, int stretch) { +int QStatusBar_insertPermanentWidget2(QStatusBar* self, int index, QWidget* widget, int stretch) { return self->insertPermanentWidget(static_cast(index), widget, static_cast(stretch)); } diff --git a/qt/gen_qstatusbar.go b/qt/gen_qstatusbar.go index 7903867b..10c51fc9 100644 --- a/qt/gen_qstatusbar.go +++ b/qt/gen_qstatusbar.go @@ -212,16 +212,16 @@ func (this *QStatusBar) AddWidget2(widget *QWidget, stretch int) { C.QStatusBar_addWidget2(this.h, widget.cPointer(), (C.int)(stretch)) } -func (this *QStatusBar) InsertWidget3(index int, widget *QWidget, stretch int) int { - return (int)(C.QStatusBar_insertWidget3(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch))) +func (this *QStatusBar) InsertWidget2(index int, widget *QWidget, stretch int) int { + return (int)(C.QStatusBar_insertWidget2(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch))) } func (this *QStatusBar) AddPermanentWidget2(widget *QWidget, stretch int) { C.QStatusBar_addPermanentWidget2(this.h, widget.cPointer(), (C.int)(stretch)) } -func (this *QStatusBar) InsertPermanentWidget3(index int, widget *QWidget, stretch int) int { - return (int)(C.QStatusBar_insertPermanentWidget3(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch))) +func (this *QStatusBar) InsertPermanentWidget2(index int, widget *QWidget, stretch int) int { + return (int)(C.QStatusBar_insertPermanentWidget2(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch))) } func (this *QStatusBar) ShowMessage2(text string, timeout int) { diff --git a/qt/gen_qstatusbar.h b/qt/gen_qstatusbar.h index 21df199c..e03fc848 100644 --- a/qt/gen_qstatusbar.h +++ b/qt/gen_qstatusbar.h @@ -110,9 +110,9 @@ 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); +int QStatusBar_insertWidget2(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); +int QStatusBar_insertPermanentWidget2(QStatusBar* self, int index, QWidget* widget, int stretch); void QStatusBar_showMessage2(QStatusBar* self, struct miqt_string text, int timeout); bool QStatusBar_override_virtual_showEvent(void* self, intptr_t slot); void QStatusBar_virtualbase_showEvent(void* self, QShowEvent* param1); diff --git a/qt/gen_qstringlistmodel.cpp b/qt/gen_qstringlistmodel.cpp index dd9dd274..e276ec71 100644 --- a/qt/gen_qstringlistmodel.cpp +++ b/qt/gen_qstringlistmodel.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qstringmatcher.cpp b/qt/gen_qstringmatcher.cpp index 2049d6fd..94e0b574 100644 --- a/qt/gen_qstringmatcher.cpp +++ b/qt/gen_qstringmatcher.cpp @@ -78,12 +78,12 @@ int QStringMatcher_caseSensitivity(const QStringMatcher* self) { return static_cast(_ret); } -int QStringMatcher_indexIn22(const QStringMatcher* self, struct miqt_string str, int from) { +int QStringMatcher_indexIn3(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)); } -int QStringMatcher_indexIn3(const QStringMatcher* self, QChar* str, int length, int from) { +int QStringMatcher_indexIn4(const QStringMatcher* self, QChar* str, int length, int from) { return self->indexIn(str, static_cast(length), static_cast(from)); } diff --git a/qt/gen_qstringmatcher.go b/qt/gen_qstringmatcher.go index 142e48b8..97c615d5 100644 --- a/qt/gen_qstringmatcher.go +++ b/qt/gen_qstringmatcher.go @@ -128,16 +128,16 @@ func (this *QStringMatcher) CaseSensitivity() CaseSensitivity { return (CaseSensitivity)(C.QStringMatcher_caseSensitivity(this.h)) } -func (this *QStringMatcher) IndexIn22(str string, from int) int { +func (this *QStringMatcher) IndexIn3(str string, from int) int { 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))) + return (int)(C.QStringMatcher_indexIn3(this.h, str_ms, (C.int)(from))) } -func (this *QStringMatcher) IndexIn3(str *QChar, length int, from int) int { - return (int)(C.QStringMatcher_indexIn3(this.h, str.cPointer(), (C.int)(length), (C.int)(from))) +func (this *QStringMatcher) IndexIn4(str *QChar, length int, from int) int { + return (int)(C.QStringMatcher_indexIn4(this.h, str.cPointer(), (C.int)(length), (C.int)(from))) } // Delete this object from C++ memory. diff --git a/qt/gen_qstringmatcher.h b/qt/gen_qstringmatcher.h index 8c88e569..902b92f6 100644 --- a/qt/gen_qstringmatcher.h +++ b/qt/gen_qstringmatcher.h @@ -35,8 +35,8 @@ 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); int QStringMatcher_caseSensitivity(const QStringMatcher* self); -int QStringMatcher_indexIn22(const QStringMatcher* self, struct miqt_string str, int from); -int QStringMatcher_indexIn3(const QStringMatcher* self, QChar* str, int length, int from); +int QStringMatcher_indexIn3(const QStringMatcher* self, struct miqt_string str, int from); +int QStringMatcher_indexIn4(const QStringMatcher* self, QChar* str, int length, int from); void QStringMatcher_delete(QStringMatcher* self); #ifdef __cplusplus diff --git a/qt/gen_qstringview.cpp b/qt/gen_qstringview.cpp index 09d71632..e9495380 100644 --- a/qt/gen_qstringview.cpp +++ b/qt/gen_qstringview.cpp @@ -1,10 +1,10 @@ #include #include -#include #include #include #include #include +#include #include #include "gen_qstringview.h" @@ -148,13 +148,13 @@ bool QStringView_isValidUtf16(const QStringView* self) { return self->isValidUtf16(); } -int16_t QStringView_toShort(const QStringView* self) { +short QStringView_toShort(const QStringView* self) { return self->toShort(); } -uint16_t QStringView_toUShort(const QStringView* self) { +unsigned short QStringView_toUShort(const QStringView* self) { ushort _ret = self->toUShort(); - return static_cast(_ret); + return static_cast(_ret); } int QStringView_toInt(const QStringView* self) { @@ -274,25 +274,25 @@ ptrdiff_t QStringView_lastIndexOf3(const QStringView* self, QChar* c, ptrdiff_t return static_cast(_ret); } -int16_t QStringView_toShort1(const QStringView* self, bool* ok) { +short QStringView_toShortWithOk(const QStringView* self, bool* ok) { return self->toShort(ok); } -int16_t QStringView_toShort2(const QStringView* self, bool* ok, int base) { +short QStringView_toShort2(const QStringView* self, bool* ok, int base) { return self->toShort(ok, static_cast(base)); } -uint16_t QStringView_toUShort1(const QStringView* self, bool* ok) { +unsigned short QStringView_toUShortWithOk(const QStringView* self, bool* ok) { ushort _ret = self->toUShort(ok); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QStringView_toUShort2(const QStringView* self, bool* ok, int base) { +unsigned short QStringView_toUShort2(const QStringView* self, bool* ok, int base) { ushort _ret = self->toUShort(ok, static_cast(base)); - return static_cast(_ret); + return static_cast(_ret); } -int QStringView_toInt1(const QStringView* self, bool* ok) { +int QStringView_toIntWithOk(const QStringView* self, bool* ok) { return self->toInt(ok); } @@ -300,7 +300,7 @@ int QStringView_toInt2(const QStringView* self, bool* ok, int base) { return self->toInt(ok, static_cast(base)); } -unsigned int QStringView_toUInt1(const QStringView* self, bool* ok) { +unsigned int QStringView_toUIntWithOk(const QStringView* self, bool* ok) { uint _ret = self->toUInt(ok); return static_cast(_ret); } @@ -310,7 +310,7 @@ unsigned int QStringView_toUInt2(const QStringView* self, bool* ok, int base) { return static_cast(_ret); } -long QStringView_toLong1(const QStringView* self, bool* ok) { +long QStringView_toLongWithOk(const QStringView* self, bool* ok) { return self->toLong(ok); } @@ -318,7 +318,7 @@ long QStringView_toLong2(const QStringView* self, bool* ok, int base) { return self->toLong(ok, static_cast(base)); } -unsigned long QStringView_toULong1(const QStringView* self, bool* ok) { +unsigned long QStringView_toULongWithOk(const QStringView* self, bool* ok) { ulong _ret = self->toULong(ok); return static_cast(_ret); } @@ -328,7 +328,7 @@ unsigned long QStringView_toULong2(const QStringView* self, bool* ok, int base) return static_cast(_ret); } -long long QStringView_toLongLong1(const QStringView* self, bool* ok) { +long long QStringView_toLongLongWithOk(const QStringView* self, bool* ok) { qlonglong _ret = self->toLongLong(ok); return static_cast(_ret); } @@ -338,7 +338,7 @@ long long QStringView_toLongLong2(const QStringView* self, bool* ok, int base) { return static_cast(_ret); } -unsigned long long QStringView_toULongLong1(const QStringView* self, bool* ok) { +unsigned long long QStringView_toULongLongWithOk(const QStringView* self, bool* ok) { qulonglong _ret = self->toULongLong(ok); return static_cast(_ret); } @@ -348,11 +348,11 @@ unsigned long long QStringView_toULongLong2(const QStringView* self, bool* ok, i return static_cast(_ret); } -float QStringView_toFloat1(const QStringView* self, bool* ok) { +float QStringView_toFloatWithOk(const QStringView* self, bool* ok) { return self->toFloat(ok); } -double QStringView_toDouble1(const QStringView* self, bool* ok) { +double QStringView_toDoubleWithOk(const QStringView* self, bool* ok) { return self->toDouble(ok); } diff --git a/qt/gen_qstringview.go b/qt/gen_qstringview.go index 7167b942..81e1e650 100644 --- a/qt/gen_qstringview.go +++ b/qt/gen_qstringview.go @@ -285,76 +285,76 @@ func (this *QStringView) LastIndexOf3(c QChar, from int64, cs CaseSensitivity) i return (int64)(C.QStringView_lastIndexOf3(this.h, c.cPointer(), (C.ptrdiff_t)(from), (C.int)(cs))) } -func (this *QStringView) ToShort1(ok *bool) int16 { - return (int16)(C.QStringView_toShort1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToShortWithOk(ok *bool) int16 { + return (int16)(C.QStringView_toShortWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToShort2(ok *bool, base int) int16 { return (int16)(C.QStringView_toShort2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToUShort1(ok *bool) uint16 { - return (uint16)(C.QStringView_toUShort1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToUShortWithOk(ok *bool) uint16 { + return (uint16)(C.QStringView_toUShortWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToUShort2(ok *bool, base int) uint16 { return (uint16)(C.QStringView_toUShort2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToInt1(ok *bool) int { - return (int)(C.QStringView_toInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToIntWithOk(ok *bool) int { + return (int)(C.QStringView_toIntWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToInt2(ok *bool, base int) int { return (int)(C.QStringView_toInt2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToUInt1(ok *bool) uint { - return (uint)(C.QStringView_toUInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToUIntWithOk(ok *bool) uint { + return (uint)(C.QStringView_toUIntWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToUInt2(ok *bool, base int) uint { return (uint)(C.QStringView_toUInt2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToLong1(ok *bool) int64 { - return (int64)(C.QStringView_toLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToLongWithOk(ok *bool) int64 { + return (int64)(C.QStringView_toLongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToLong2(ok *bool, base int) int64 { return (int64)(C.QStringView_toLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToULong1(ok *bool) uint64 { - return (uint64)(C.QStringView_toULong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToULongWithOk(ok *bool) uint64 { + return (uint64)(C.QStringView_toULongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToULong2(ok *bool, base int) uint64 { return (uint64)(C.QStringView_toULong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToLongLong1(ok *bool) int64 { - return (int64)(C.QStringView_toLongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToLongLongWithOk(ok *bool) int64 { + return (int64)(C.QStringView_toLongLongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToLongLong2(ok *bool, base int) int64 { return (int64)(C.QStringView_toLongLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToULongLong1(ok *bool) uint64 { - return (uint64)(C.QStringView_toULongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToULongLongWithOk(ok *bool) uint64 { + return (uint64)(C.QStringView_toULongLongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToULongLong2(ok *bool, base int) uint64 { return (uint64)(C.QStringView_toULongLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToFloat1(ok *bool) float32 { - return (float32)(C.QStringView_toFloat1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToFloatWithOk(ok *bool) float32 { + return (float32)(C.QStringView_toFloatWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QStringView) ToDouble1(ok *bool) float64 { - return (float64)(C.QStringView_toDouble1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToDoubleWithOk(ok *bool) float64 { + return (float64)(C.QStringView_toDoubleWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } // Delete this object from C++ memory. diff --git a/qt/gen_qstringview.h b/qt/gen_qstringview.h index f976e296..d79d2392 100644 --- a/qt/gen_qstringview.h +++ b/qt/gen_qstringview.h @@ -46,8 +46,8 @@ ptrdiff_t QStringView_count(const QStringView* self, QChar* c); ptrdiff_t QStringView_lastIndexOf(const QStringView* self, QChar* c); bool QStringView_isRightToLeft(const QStringView* self); bool QStringView_isValidUtf16(const QStringView* self); -int16_t QStringView_toShort(const QStringView* self); -uint16_t QStringView_toUShort(const QStringView* self); +short QStringView_toShort(const QStringView* self); +unsigned short QStringView_toUShort(const QStringView* self); int QStringView_toInt(const QStringView* self); unsigned int QStringView_toUInt(const QStringView* self); long QStringView_toLong(const QStringView* self); @@ -74,24 +74,24 @@ bool QStringView_contains2(const QStringView* self, QChar* c, int cs); ptrdiff_t QStringView_count2(const QStringView* self, QChar* c, int cs); ptrdiff_t QStringView_lastIndexOf2(const QStringView* self, QChar* c, ptrdiff_t from); ptrdiff_t QStringView_lastIndexOf3(const QStringView* self, QChar* c, ptrdiff_t from, int cs); -int16_t QStringView_toShort1(const QStringView* self, bool* ok); -int16_t QStringView_toShort2(const QStringView* self, bool* ok, int base); -uint16_t QStringView_toUShort1(const QStringView* self, bool* ok); -uint16_t QStringView_toUShort2(const QStringView* self, bool* ok, int base); -int QStringView_toInt1(const QStringView* self, bool* ok); +short QStringView_toShortWithOk(const QStringView* self, bool* ok); +short QStringView_toShort2(const QStringView* self, bool* ok, int base); +unsigned short QStringView_toUShortWithOk(const QStringView* self, bool* ok); +unsigned short QStringView_toUShort2(const QStringView* self, bool* ok, int base); +int QStringView_toIntWithOk(const QStringView* self, bool* ok); int QStringView_toInt2(const QStringView* self, bool* ok, int base); -unsigned int QStringView_toUInt1(const QStringView* self, bool* ok); +unsigned int QStringView_toUIntWithOk(const QStringView* self, bool* ok); unsigned int QStringView_toUInt2(const QStringView* self, bool* ok, int base); -long QStringView_toLong1(const QStringView* self, bool* ok); +long QStringView_toLongWithOk(const QStringView* self, bool* ok); long QStringView_toLong2(const QStringView* self, bool* ok, int base); -unsigned long QStringView_toULong1(const QStringView* self, bool* ok); +unsigned long QStringView_toULongWithOk(const QStringView* self, bool* ok); unsigned long QStringView_toULong2(const QStringView* self, bool* ok, int base); -long long QStringView_toLongLong1(const QStringView* self, bool* ok); +long long QStringView_toLongLongWithOk(const QStringView* self, bool* ok); long long QStringView_toLongLong2(const QStringView* self, bool* ok, int base); -unsigned long long QStringView_toULongLong1(const QStringView* self, bool* ok); +unsigned long long QStringView_toULongLongWithOk(const QStringView* self, bool* ok); unsigned long long QStringView_toULongLong2(const QStringView* self, bool* ok, int base); -float QStringView_toFloat1(const QStringView* self, bool* ok); -double QStringView_toDouble1(const QStringView* self, bool* ok); +float QStringView_toFloatWithOk(const QStringView* self, bool* ok); +double QStringView_toDoubleWithOk(const QStringView* self, bool* ok); void QStringView_delete(QStringView* self); #ifdef __cplusplus diff --git a/qt/gen_qstyle.cpp b/qt/gen_qstyle.cpp index 79eedfd8..c9879cab 100644 --- a/qt/gen_qstyle.cpp +++ b/qt/gen_qstyle.cpp @@ -921,19 +921,19 @@ struct miqt_string QStyle_trUtf83(const char* s, const char* c, int n) { return _ms; } -int QStyle_sliderPositionFromValue5(int min, int max, int val, int space, bool upsideDown) { +int QStyle_sliderPositionFromValue2(int min, int max, int val, int space, bool upsideDown) { return QStyle::sliderPositionFromValue(static_cast(min), static_cast(max), static_cast(val), static_cast(space), upsideDown); } -int QStyle_sliderValueFromPosition5(int min, int max, int pos, int space, bool upsideDown) { +int QStyle_sliderValueFromPosition2(int min, int max, int pos, int space, bool upsideDown) { return QStyle::sliderValueFromPosition(static_cast(min), static_cast(max), static_cast(pos), static_cast(space), upsideDown); } -int QStyle_combinedLayoutSpacing4(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option) { +int QStyle_combinedLayoutSpacing2(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option) { return self->combinedLayoutSpacing(static_cast(controls1), static_cast(controls2), static_cast(orientation), option); } -int QStyle_combinedLayoutSpacing5(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option, QWidget* widget) { +int QStyle_combinedLayoutSpacing3(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option, QWidget* widget) { return self->combinedLayoutSpacing(static_cast(controls1), static_cast(controls2), static_cast(orientation), option, widget); } diff --git a/qt/gen_qstyle.go b/qt/gen_qstyle.go index d3bc0ad1..0570d626 100644 --- a/qt/gen_qstyle.go +++ b/qt/gen_qstyle.go @@ -898,20 +898,20 @@ func QStyle_TrUtf83(s string, c string, n int) string { return _ret } -func QStyle_SliderPositionFromValue5(min int, max int, val int, space int, upsideDown bool) int { - return (int)(C.QStyle_sliderPositionFromValue5((C.int)(min), (C.int)(max), (C.int)(val), (C.int)(space), (C.bool)(upsideDown))) +func QStyle_SliderPositionFromValue2(min int, max int, val int, space int, upsideDown bool) int { + return (int)(C.QStyle_sliderPositionFromValue2((C.int)(min), (C.int)(max), (C.int)(val), (C.int)(space), (C.bool)(upsideDown))) } -func QStyle_SliderValueFromPosition5(min int, max int, pos int, space int, upsideDown bool) int { - return (int)(C.QStyle_sliderValueFromPosition5((C.int)(min), (C.int)(max), (C.int)(pos), (C.int)(space), (C.bool)(upsideDown))) +func QStyle_SliderValueFromPosition2(min int, max int, pos int, space int, upsideDown bool) int { + return (int)(C.QStyle_sliderValueFromPosition2((C.int)(min), (C.int)(max), (C.int)(pos), (C.int)(space), (C.bool)(upsideDown))) } -func (this *QStyle) CombinedLayoutSpacing4(controls1 QSizePolicy__ControlType, controls2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption) int { - return (int)(C.QStyle_combinedLayoutSpacing4(this.h, (C.int)(controls1), (C.int)(controls2), (C.int)(orientation), option.cPointer())) +func (this *QStyle) CombinedLayoutSpacing2(controls1 QSizePolicy__ControlType, controls2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption) int { + return (int)(C.QStyle_combinedLayoutSpacing2(this.h, (C.int)(controls1), (C.int)(controls2), (C.int)(orientation), option.cPointer())) } -func (this *QStyle) CombinedLayoutSpacing5(controls1 QSizePolicy__ControlType, controls2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption, widget *QWidget) int { - return (int)(C.QStyle_combinedLayoutSpacing5(this.h, (C.int)(controls1), (C.int)(controls2), (C.int)(orientation), option.cPointer(), widget.cPointer())) +func (this *QStyle) CombinedLayoutSpacing3(controls1 QSizePolicy__ControlType, controls2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption, widget *QWidget) int { + return (int)(C.QStyle_combinedLayoutSpacing3(this.h, (C.int)(controls1), (C.int)(controls2), (C.int)(orientation), option.cPointer(), widget.cPointer())) } // Sender can only be called from a QStyle that was directly constructed. diff --git a/qt/gen_qstyle.h b/qt/gen_qstyle.h index f81034d9..46b65224 100644 --- a/qt/gen_qstyle.h +++ b/qt/gen_qstyle.h @@ -99,10 +99,10 @@ 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); -int QStyle_sliderPositionFromValue5(int min, int max, int val, int space, bool upsideDown); -int QStyle_sliderValueFromPosition5(int min, int max, int pos, int space, bool upsideDown); -int QStyle_combinedLayoutSpacing4(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option); -int QStyle_combinedLayoutSpacing5(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option, QWidget* widget); +int QStyle_sliderPositionFromValue2(int min, int max, int val, int space, bool upsideDown); +int QStyle_sliderValueFromPosition2(int min, int max, int pos, int space, bool upsideDown); +int QStyle_combinedLayoutSpacing2(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option); +int QStyle_combinedLayoutSpacing3(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option, QWidget* widget); bool QStyle_override_virtual_polish(void* self, intptr_t slot); void QStyle_virtualbase_polish(void* self, QWidget* widget); bool QStyle_override_virtual_unpolish(void* self, intptr_t slot); diff --git a/qt/gen_qstyleditemdelegate.cpp b/qt/gen_qstyleditemdelegate.cpp index bf2b5096..79db8da9 100644 --- a/qt/gen_qstyleditemdelegate.cpp +++ b/qt/gen_qstyleditemdelegate.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -20,6 +19,7 @@ #include #include #include +#include #include #include #include "gen_qstyleditemdelegate.h" diff --git a/qt/gen_qstylepainter.cpp b/qt/gen_qstylepainter.cpp index e2d7914c..549b2b71 100644 --- a/qt/gen_qstylepainter.cpp +++ b/qt/gen_qstylepainter.cpp @@ -71,7 +71,7 @@ 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) { +void QStylePainter_drawItemText2(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 1c33832c..e74aa6ff 100644 --- a/qt/gen_qstylepainter.go +++ b/qt/gen_qstylepainter.go @@ -103,12 +103,12 @@ func (this *QStylePainter) Style() *QStyle { return newQStyle(C.QStylePainter_style(this.h)) } -func (this *QStylePainter) DrawItemText6(r *QRect, flags int, pal *QPalette, enabled bool, text string, textRole QPalette__ColorRole) { +func (this *QStylePainter) DrawItemText2(r *QRect, flags int, pal *QPalette, enabled bool, text string, textRole QPalette__ColorRole) { text_ms := C.struct_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)) + C.QStylePainter_drawItemText2(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 a467684c..3e133caa 100644 --- a/qt/gen_qstylepainter.h +++ b/qt/gen_qstylepainter.h @@ -50,7 +50,7 @@ void QStylePainter_drawComplexControl(QStylePainter* self, int cc, QStyleOptionC 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_drawItemText2(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_qsystemsemaphore.cpp b/qt/gen_qsystemsemaphore.cpp index 790ec32f..2b918d3d 100644 --- a/qt/gen_qsystemsemaphore.cpp +++ b/qt/gen_qsystemsemaphore.cpp @@ -78,7 +78,7 @@ void QSystemSemaphore_setKey3(QSystemSemaphore* self, struct miqt_string key, in self->setKey(key_QString, static_cast(initialValue), static_cast(mode)); } -bool QSystemSemaphore_release1(QSystemSemaphore* self, int n) { +bool QSystemSemaphore_releaseWithInt(QSystemSemaphore* self, int n) { return self->release(static_cast(n)); } diff --git a/qt/gen_qsystemsemaphore.go b/qt/gen_qsystemsemaphore.go index ff3e9372..8414d8e9 100644 --- a/qt/gen_qsystemsemaphore.go +++ b/qt/gen_qsystemsemaphore.go @@ -144,8 +144,8 @@ func (this *QSystemSemaphore) SetKey3(key string, initialValue int, mode QSystem C.QSystemSemaphore_setKey3(this.h, key_ms, (C.int)(initialValue), (C.int)(mode)) } -func (this *QSystemSemaphore) Release1(n int) bool { - return (bool)(C.QSystemSemaphore_release1(this.h, (C.int)(n))) +func (this *QSystemSemaphore) ReleaseWithInt(n int) bool { + return (bool)(C.QSystemSemaphore_releaseWithInt(this.h, (C.int)(n))) } // Delete this object from C++ memory. diff --git a/qt/gen_qsystemsemaphore.h b/qt/gen_qsystemsemaphore.h index 8f4b742b..00810990 100644 --- a/qt/gen_qsystemsemaphore.h +++ b/qt/gen_qsystemsemaphore.h @@ -31,7 +31,7 @@ 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); -bool QSystemSemaphore_release1(QSystemSemaphore* self, int n); +bool QSystemSemaphore_releaseWithInt(QSystemSemaphore* self, int n); void QSystemSemaphore_delete(QSystemSemaphore* self); #ifdef __cplusplus diff --git a/qt/gen_qsystemtrayicon.cpp b/qt/gen_qsystemtrayicon.cpp index 3bfd4de3..34de9917 100644 --- a/qt/gen_qsystemtrayicon.cpp +++ b/qt/gen_qsystemtrayicon.cpp @@ -372,19 +372,19 @@ struct miqt_string QSystemTrayIcon_trUtf83(const char* s, const char* c, int n) return _ms; } -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, 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) { +void QSystemTrayIcon_showMessage4(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) { +void QSystemTrayIcon_showMessage5(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 795efb7b..9cc986b3 100644 --- a/qt/gen_qsystemtrayicon.go +++ b/qt/gen_qsystemtrayicon.go @@ -289,7 +289,7 @@ func QSystemTrayIcon_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QSystemTrayIcon) ShowMessage4(title string, msg string, icon *QIcon, msecs int) { +func (this *QSystemTrayIcon) ShowMessage3(title string, msg string, icon *QIcon, msecs int) { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -298,10 +298,10 @@ func (this *QSystemTrayIcon) ShowMessage4(title string, msg string, icon *QIcon, 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)) + C.QSystemTrayIcon_showMessage3(this.h, title_ms, msg_ms, icon.cPointer(), (C.int)(msecs)) } -func (this *QSystemTrayIcon) ShowMessage3(title string, msg string, icon QSystemTrayIcon__MessageIcon) { +func (this *QSystemTrayIcon) ShowMessage4(title string, msg string, icon QSystemTrayIcon__MessageIcon) { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -310,10 +310,10 @@ func (this *QSystemTrayIcon) ShowMessage3(title string, msg string, icon QSystem 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)) + C.QSystemTrayIcon_showMessage4(this.h, title_ms, msg_ms, (C.int)(icon)) } -func (this *QSystemTrayIcon) ShowMessage42(title string, msg string, icon QSystemTrayIcon__MessageIcon, msecs int) { +func (this *QSystemTrayIcon) ShowMessage5(title string, msg string, icon QSystemTrayIcon__MessageIcon, msecs int) { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -322,7 +322,7 @@ func (this *QSystemTrayIcon) ShowMessage42(title string, msg string, icon QSyste 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)) + C.QSystemTrayIcon_showMessage5(this.h, title_ms, msg_ms, (C.int)(icon), (C.int)(msecs)) } // Sender can only be called from a QSystemTrayIcon that was directly constructed. diff --git a/qt/gen_qsystemtrayicon.h b/qt/gen_qsystemtrayicon.h index 736aa9c2..7701c423 100644 --- a/qt/gen_qsystemtrayicon.h +++ b/qt/gen_qsystemtrayicon.h @@ -71,9 +71,9 @@ 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_showMessage3(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, QIcon* icon, int msecs); +void QSystemTrayIcon_showMessage4(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, int icon); +void QSystemTrayIcon_showMessage5(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, int icon, int msecs); bool QSystemTrayIcon_override_virtual_event(void* self, intptr_t slot); bool QSystemTrayIcon_virtualbase_event(void* self, QEvent* event); bool QSystemTrayIcon_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt/gen_qtableview.cpp b/qt/gen_qtableview.cpp index 043fa5f7..1558e1b6 100644 --- a/qt/gen_qtableview.cpp +++ b/qt/gen_qtableview.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qtablewidget.cpp b/qt/gen_qtablewidget.cpp index 001f5519..eab3efc8 100644 --- a/qt/gen_qtablewidget.cpp +++ b/qt/gen_qtablewidget.cpp @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qtabwidget.cpp b/qt/gen_qtabwidget.cpp index 90b74f52..9739e075 100644 --- a/qt/gen_qtabwidget.cpp +++ b/qt/gen_qtabwidget.cpp @@ -1413,7 +1413,7 @@ void QTabWidget_setCornerWidget2(QTabWidget* self, QWidget* w, int corner) { self->setCornerWidget(w, static_cast(corner)); } -QWidget* QTabWidget_cornerWidget1(const QTabWidget* self, int corner) { +QWidget* QTabWidget_cornerWidgetWithCorner(const QTabWidget* self, int corner) { return self->cornerWidget(static_cast(corner)); } diff --git a/qt/gen_qtabwidget.go b/qt/gen_qtabwidget.go index a582b7ca..5b128cfb 100644 --- a/qt/gen_qtabwidget.go +++ b/qt/gen_qtabwidget.go @@ -479,8 +479,8 @@ func (this *QTabWidget) SetCornerWidget2(w *QWidget, corner Corner) { C.QTabWidget_setCornerWidget2(this.h, w.cPointer(), (C.int)(corner)) } -func (this *QTabWidget) CornerWidget1(corner Corner) *QWidget { - return newQWidget(C.QTabWidget_cornerWidget1(this.h, (C.int)(corner))) +func (this *QTabWidget) CornerWidgetWithCorner(corner Corner) *QWidget { + return newQWidget(C.QTabWidget_cornerWidgetWithCorner(this.h, (C.int)(corner))) } // SetTabBar can only be called from a QTabWidget that was directly constructed. diff --git a/qt/gen_qtabwidget.h b/qt/gen_qtabwidget.h index df615ae3..703ca230 100644 --- a/qt/gen_qtabwidget.h +++ b/qt/gen_qtabwidget.h @@ -166,7 +166,7 @@ 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); +QWidget* QTabWidget_cornerWidgetWithCorner(const QTabWidget* self, int corner); bool QTabWidget_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QTabWidget_virtualbase_sizeHint(const void* self); bool QTabWidget_override_virtual_minimumSizeHint(void* self, intptr_t slot); diff --git a/qt/gen_qtextcodec.cpp b/qt/gen_qtextcodec.cpp index 2480540e..2e64cda3 100644 --- a/qt/gen_qtextcodec.cpp +++ b/qt/gen_qtextcodec.cpp @@ -212,11 +212,11 @@ struct miqt_string QTextCodec_fromUnicode3(const QTextCodec* self, QChar* in, in return _ms; } -QTextDecoder* QTextCodec_makeDecoder1(const QTextCodec* self, int flags) { +QTextDecoder* QTextCodec_makeDecoderWithFlags(const QTextCodec* self, int flags) { return self->makeDecoder(static_cast(flags)); } -QTextEncoder* QTextCodec_makeEncoder1(const QTextCodec* self, int flags) { +QTextEncoder* QTextCodec_makeEncoderWithFlags(const QTextCodec* self, int flags) { return self->makeEncoder(static_cast(flags)); } diff --git a/qt/gen_qtextcodec.go b/qt/gen_qtextcodec.go index f1a2085d..c0bd2b05 100644 --- a/qt/gen_qtextcodec.go +++ b/qt/gen_qtextcodec.go @@ -259,12 +259,12 @@ func (this *QTextCodec) FromUnicode3(in *QChar, length int, state *QTextCodec__C return _ret } -func (this *QTextCodec) MakeDecoder1(flags QTextCodec__ConversionFlag) *QTextDecoder { - return newQTextDecoder(C.QTextCodec_makeDecoder1(this.h, (C.int)(flags))) +func (this *QTextCodec) MakeDecoderWithFlags(flags QTextCodec__ConversionFlag) *QTextDecoder { + return newQTextDecoder(C.QTextCodec_makeDecoderWithFlags(this.h, (C.int)(flags))) } -func (this *QTextCodec) MakeEncoder1(flags QTextCodec__ConversionFlag) *QTextEncoder { - return newQTextEncoder(C.QTextCodec_makeEncoder1(this.h, (C.int)(flags))) +func (this *QTextCodec) MakeEncoderWithFlags(flags QTextCodec__ConversionFlag) *QTextEncoder { + return newQTextEncoder(C.QTextCodec_makeEncoderWithFlags(this.h, (C.int)(flags))) } type QTextEncoder struct { diff --git a/qt/gen_qtextcodec.h b/qt/gen_qtextcodec.h index 7ca76f93..906a1dd8 100644 --- a/qt/gen_qtextcodec.h +++ b/qt/gen_qtextcodec.h @@ -59,8 +59,8 @@ struct miqt_string QTextCodec_convertToUnicode(const QTextCodec* self, const cha struct miqt_string QTextCodec_convertFromUnicode(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); +QTextDecoder* QTextCodec_makeDecoderWithFlags(const QTextCodec* self, int flags); +QTextEncoder* QTextCodec_makeEncoderWithFlags(const QTextCodec* self, int flags); QTextEncoder* QTextEncoder_new(QTextCodec* codec); QTextEncoder* QTextEncoder_new2(QTextCodec* codec, int flags); diff --git a/qt/gen_qtextdocument.cpp b/qt/gen_qtextdocument.cpp index 65647ce3..87b18859 100644 --- a/qt/gen_qtextdocument.cpp +++ b/qt/gen_qtextdocument.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -28,6 +27,7 @@ #include #include #include +#include #include #include "gen_qtextdocument.h" @@ -887,11 +887,11 @@ struct miqt_string QTextDocument_trUtf83(const char* s, const char* c, int n) { return _ms; } -QTextDocument* QTextDocument_clone1(const QTextDocument* self, QObject* parent) { +QTextDocument* QTextDocument_cloneWithParent(const QTextDocument* self, QObject* parent) { return self->clone(parent); } -struct miqt_string QTextDocument_toHtml1(const QTextDocument* self, struct miqt_string encoding) { +struct miqt_string QTextDocument_toHtmlWithEncoding(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 @@ -903,7 +903,7 @@ struct miqt_string QTextDocument_toHtml1(const QTextDocument* self, struct miqt_ return _ms; } -struct miqt_string QTextDocument_toMarkdown1(const QTextDocument* self, int features) { +struct miqt_string QTextDocument_toMarkdownWithFeatures(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(); @@ -919,42 +919,42 @@ void QTextDocument_setMarkdown2(QTextDocument* self, struct miqt_string markdown self->setMarkdown(markdown_QString, static_cast(features)); } -QTextCursor* QTextDocument_find22(const QTextDocument* self, struct miqt_string subString, int from) { +QTextCursor* QTextDocument_find6(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) { +QTextCursor* QTextDocument_find7(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) { +QTextCursor* QTextDocument_find8(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))); } -QTextCursor* QTextDocument_find23(const QTextDocument* self, QRegExp* expr, int from) { +QTextCursor* QTextDocument_find9(const QTextDocument* self, QRegExp* expr, int from) { return new QTextCursor(self->find(*expr, static_cast(from))); } -QTextCursor* QTextDocument_find34(const QTextDocument* self, QRegExp* expr, int from, int options) { +QTextCursor* QTextDocument_find10(const QTextDocument* self, QRegExp* expr, int from, int options) { return new QTextCursor(self->find(*expr, static_cast(from), static_cast(options))); } -QTextCursor* QTextDocument_find35(const QTextDocument* self, QRegExp* expr, QTextCursor* cursor, int options) { +QTextCursor* QTextDocument_find11(const QTextDocument* self, QRegExp* expr, QTextCursor* cursor, int options) { return new QTextCursor(self->find(*expr, *cursor, static_cast(options))); } -QTextCursor* QTextDocument_find24(const QTextDocument* self, QRegularExpression* expr, int from) { +QTextCursor* QTextDocument_find12(const QTextDocument* self, QRegularExpression* expr, int from) { return new QTextCursor(self->find(*expr, static_cast(from))); } -QTextCursor* QTextDocument_find36(const QTextDocument* self, QRegularExpression* expr, int from, int options) { +QTextCursor* QTextDocument_find13(const QTextDocument* self, QRegularExpression* expr, int from, int options) { return new QTextCursor(self->find(*expr, static_cast(from), static_cast(options))); } -QTextCursor* QTextDocument_find37(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options) { +QTextCursor* QTextDocument_find14(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options) { return new QTextCursor(self->find(*expr, *cursor, static_cast(options))); } @@ -962,11 +962,11 @@ void QTextDocument_drawContents2(QTextDocument* self, QPainter* painter, QRectF* self->drawContents(painter, *rect); } -void QTextDocument_clearUndoRedoStacks1(QTextDocument* self, int historyToClear) { +void QTextDocument_clearUndoRedoStacksWithHistoryToClear(QTextDocument* self, int historyToClear) { self->clearUndoRedoStacks(static_cast(historyToClear)); } -void QTextDocument_setModified1(QTextDocument* self, bool m) { +void QTextDocument_setModifiedWithBool(QTextDocument* self, bool m) { self->setModified(m); } diff --git a/qt/gen_qtextdocument.go b/qt/gen_qtextdocument.go index d50ed217..ba06e746 100644 --- a/qt/gen_qtextdocument.go +++ b/qt/gen_qtextdocument.go @@ -871,11 +871,11 @@ func QTextDocument_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QTextDocument) Clone1(parent *QObject) *QTextDocument { - return newQTextDocument(C.QTextDocument_clone1(this.h, parent.cPointer())) +func (this *QTextDocument) CloneWithParent(parent *QObject) *QTextDocument { + return newQTextDocument(C.QTextDocument_cloneWithParent(this.h, parent.cPointer())) } -func (this *QTextDocument) ToHtml1(encoding []byte) string { +func (this *QTextDocument) ToHtmlWithEncoding(encoding []byte) string { encoding_alias := C.struct_miqt_string{} if len(encoding) > 0 { encoding_alias.data = (*C.char)(unsafe.Pointer(&encoding[0])) @@ -883,14 +883,14 @@ func (this *QTextDocument) ToHtml1(encoding []byte) string { encoding_alias.data = (*C.char)(unsafe.Pointer(nil)) } encoding_alias.len = C.size_t(len(encoding)) - var _ms C.struct_miqt_string = C.QTextDocument_toHtml1(this.h, encoding_alias) + var _ms C.struct_miqt_string = C.QTextDocument_toHtmlWithEncoding(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)) +func (this *QTextDocument) ToMarkdownWithFeatures(features QTextDocument__MarkdownFeature) string { + var _ms C.struct_miqt_string = C.QTextDocument_toMarkdownWithFeatures(this.h, (C.int)(features)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -904,68 +904,68 @@ func (this *QTextDocument) SetMarkdown2(markdown string, features QTextDocument_ C.QTextDocument_setMarkdown2(this.h, markdown_ms, (C.int)(features)) } -func (this *QTextDocument) Find22(subString string, from int) *QTextCursor { +func (this *QTextDocument) Find6(subString string, from int) *QTextCursor { 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)) - _goptr := newQTextCursor(C.QTextDocument_find22(this.h, subString_ms, (C.int)(from))) + _goptr := newQTextCursor(C.QTextDocument_find6(this.h, subString_ms, (C.int)(from))) _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 { +func (this *QTextDocument) Find7(subString string, from int, options QTextDocument__FindFlag) *QTextCursor { 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)) - _goptr := newQTextCursor(C.QTextDocument_find32(this.h, subString_ms, (C.int)(from), (C.int)(options))) + _goptr := newQTextCursor(C.QTextDocument_find7(this.h, subString_ms, (C.int)(from), (C.int)(options))) _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 { +func (this *QTextDocument) Find8(subString string, cursor *QTextCursor, options QTextDocument__FindFlag) *QTextCursor { 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)) - _goptr := newQTextCursor(C.QTextDocument_find33(this.h, subString_ms, cursor.cPointer(), (C.int)(options))) + _goptr := newQTextCursor(C.QTextDocument_find8(this.h, subString_ms, cursor.cPointer(), (C.int)(options))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocument) Find23(expr *QRegExp, from int) *QTextCursor { - _goptr := newQTextCursor(C.QTextDocument_find23(this.h, expr.cPointer(), (C.int)(from))) +func (this *QTextDocument) Find9(expr *QRegExp, from int) *QTextCursor { + _goptr := newQTextCursor(C.QTextDocument_find9(this.h, expr.cPointer(), (C.int)(from))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocument) Find34(expr *QRegExp, from int, options QTextDocument__FindFlag) *QTextCursor { - _goptr := newQTextCursor(C.QTextDocument_find34(this.h, expr.cPointer(), (C.int)(from), (C.int)(options))) +func (this *QTextDocument) Find10(expr *QRegExp, from int, options QTextDocument__FindFlag) *QTextCursor { + _goptr := newQTextCursor(C.QTextDocument_find10(this.h, expr.cPointer(), (C.int)(from), (C.int)(options))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocument) Find35(expr *QRegExp, cursor *QTextCursor, options QTextDocument__FindFlag) *QTextCursor { - _goptr := newQTextCursor(C.QTextDocument_find35(this.h, expr.cPointer(), cursor.cPointer(), (C.int)(options))) +func (this *QTextDocument) Find11(expr *QRegExp, cursor *QTextCursor, options QTextDocument__FindFlag) *QTextCursor { + _goptr := newQTextCursor(C.QTextDocument_find11(this.h, expr.cPointer(), cursor.cPointer(), (C.int)(options))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocument) Find24(expr *QRegularExpression, from int) *QTextCursor { - _goptr := newQTextCursor(C.QTextDocument_find24(this.h, expr.cPointer(), (C.int)(from))) +func (this *QTextDocument) Find12(expr *QRegularExpression, from int) *QTextCursor { + _goptr := newQTextCursor(C.QTextDocument_find12(this.h, expr.cPointer(), (C.int)(from))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocument) Find36(expr *QRegularExpression, from int, options QTextDocument__FindFlag) *QTextCursor { - _goptr := newQTextCursor(C.QTextDocument_find36(this.h, expr.cPointer(), (C.int)(from), (C.int)(options))) +func (this *QTextDocument) Find13(expr *QRegularExpression, from int, options QTextDocument__FindFlag) *QTextCursor { + _goptr := newQTextCursor(C.QTextDocument_find13(this.h, expr.cPointer(), (C.int)(from), (C.int)(options))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocument) Find37(expr *QRegularExpression, cursor *QTextCursor, options QTextDocument__FindFlag) *QTextCursor { - _goptr := newQTextCursor(C.QTextDocument_find37(this.h, expr.cPointer(), cursor.cPointer(), (C.int)(options))) +func (this *QTextDocument) Find14(expr *QRegularExpression, cursor *QTextCursor, options QTextDocument__FindFlag) *QTextCursor { + _goptr := newQTextCursor(C.QTextDocument_find14(this.h, expr.cPointer(), cursor.cPointer(), (C.int)(options))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -974,12 +974,12 @@ func (this *QTextDocument) DrawContents2(painter *QPainter, rect *QRectF) { C.QTextDocument_drawContents2(this.h, painter.cPointer(), rect.cPointer()) } -func (this *QTextDocument) ClearUndoRedoStacks1(historyToClear QTextDocument__Stacks) { - C.QTextDocument_clearUndoRedoStacks1(this.h, (C.int)(historyToClear)) +func (this *QTextDocument) ClearUndoRedoStacksWithHistoryToClear(historyToClear QTextDocument__Stacks) { + C.QTextDocument_clearUndoRedoStacksWithHistoryToClear(this.h, (C.int)(historyToClear)) } -func (this *QTextDocument) SetModified1(m bool) { - C.QTextDocument_setModified1(this.h, (C.bool)(m)) +func (this *QTextDocument) SetModifiedWithBool(m bool) { + C.QTextDocument_setModifiedWithBool(this.h, (C.bool)(m)) } // Sender can only be called from a QTextDocument that was directly constructed. diff --git a/qt/gen_qtextdocument.h b/qt/gen_qtextdocument.h index fade6086..8c149c9c 100644 --- a/qt/gen_qtextdocument.h +++ b/qt/gen_qtextdocument.h @@ -190,22 +190,22 @@ 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, struct miqt_string encoding); -struct miqt_string QTextDocument_toMarkdown1(const QTextDocument* self, int features); +QTextDocument* QTextDocument_cloneWithParent(const QTextDocument* self, QObject* parent); +struct miqt_string QTextDocument_toHtmlWithEncoding(const QTextDocument* self, struct miqt_string encoding); +struct miqt_string QTextDocument_toMarkdownWithFeatures(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); -QTextCursor* QTextDocument_find24(const QTextDocument* self, QRegularExpression* expr, int from); -QTextCursor* QTextDocument_find36(const QTextDocument* self, QRegularExpression* expr, int from, int options); -QTextCursor* QTextDocument_find37(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options); +QTextCursor* QTextDocument_find6(const QTextDocument* self, struct miqt_string subString, int from); +QTextCursor* QTextDocument_find7(const QTextDocument* self, struct miqt_string subString, int from, int options); +QTextCursor* QTextDocument_find8(const QTextDocument* self, struct miqt_string subString, QTextCursor* cursor, int options); +QTextCursor* QTextDocument_find9(const QTextDocument* self, QRegExp* expr, int from); +QTextCursor* QTextDocument_find10(const QTextDocument* self, QRegExp* expr, int from, int options); +QTextCursor* QTextDocument_find11(const QTextDocument* self, QRegExp* expr, QTextCursor* cursor, int options); +QTextCursor* QTextDocument_find12(const QTextDocument* self, QRegularExpression* expr, int from); +QTextCursor* QTextDocument_find13(const QTextDocument* self, QRegularExpression* expr, int from, int options); +QTextCursor* QTextDocument_find14(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options); void QTextDocument_drawContents2(QTextDocument* self, QPainter* painter, QRectF* rect); -void QTextDocument_clearUndoRedoStacks1(QTextDocument* self, int historyToClear); -void QTextDocument_setModified1(QTextDocument* self, bool m); +void QTextDocument_clearUndoRedoStacksWithHistoryToClear(QTextDocument* self, int historyToClear); +void QTextDocument_setModifiedWithBool(QTextDocument* self, bool m); bool QTextDocument_override_virtual_clear(void* self, intptr_t slot); void QTextDocument_virtualbase_clear(void* self); bool QTextDocument_override_virtual_createObject(void* self, intptr_t slot); diff --git a/qt/gen_qtextdocumentfragment.cpp b/qt/gen_qtextdocumentfragment.cpp index 48b82d92..14bc19bf 100644 --- a/qt/gen_qtextdocumentfragment.cpp +++ b/qt/gen_qtextdocumentfragment.cpp @@ -77,7 +77,7 @@ QTextDocumentFragment* QTextDocumentFragment_fromHtml2(struct miqt_string html, return new QTextDocumentFragment(QTextDocumentFragment::fromHtml(html_QString, resourceProvider)); } -struct miqt_string QTextDocumentFragment_toHtml1(const QTextDocumentFragment* self, struct miqt_string encoding) { +struct miqt_string QTextDocumentFragment_toHtmlWithEncoding(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 diff --git a/qt/gen_qtextdocumentfragment.go b/qt/gen_qtextdocumentfragment.go index a8becf00..60b1a499 100644 --- a/qt/gen_qtextdocumentfragment.go +++ b/qt/gen_qtextdocumentfragment.go @@ -121,7 +121,7 @@ func QTextDocumentFragment_FromHtml2(html string, resourceProvider *QTextDocumen return _goptr } -func (this *QTextDocumentFragment) ToHtml1(encoding []byte) string { +func (this *QTextDocumentFragment) ToHtmlWithEncoding(encoding []byte) string { encoding_alias := C.struct_miqt_string{} if len(encoding) > 0 { encoding_alias.data = (*C.char)(unsafe.Pointer(&encoding[0])) @@ -129,7 +129,7 @@ func (this *QTextDocumentFragment) ToHtml1(encoding []byte) string { encoding_alias.data = (*C.char)(unsafe.Pointer(nil)) } encoding_alias.len = C.size_t(len(encoding)) - var _ms C.struct_miqt_string = C.QTextDocumentFragment_toHtml1(this.h, encoding_alias) + var _ms C.struct_miqt_string = C.QTextDocumentFragment_toHtmlWithEncoding(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 3232cbe4..b89eda67 100644 --- a/qt/gen_qtextdocumentfragment.h +++ b/qt/gen_qtextdocumentfragment.h @@ -35,7 +35,7 @@ struct miqt_string QTextDocumentFragment_toHtml(const QTextDocumentFragment* sel 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); +struct miqt_string QTextDocumentFragment_toHtmlWithEncoding(const QTextDocumentFragment* self, struct miqt_string encoding); void QTextDocumentFragment_delete(QTextDocumentFragment* self); #ifdef __cplusplus diff --git a/qt/gen_qtextedit.cpp b/qt/gen_qtextedit.cpp index 63735259..54fb4c40 100644 --- a/qt/gen_qtextedit.cpp +++ b/qt/gen_qtextedit.cpp @@ -1837,20 +1837,20 @@ struct miqt_string QTextEdit_trUtf83(const char* s, const char* c, int n) { return _ms; } -bool QTextEdit_find22(QTextEdit* self, struct miqt_string exp, int options) { +bool QTextEdit_find3(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)); } -bool QTextEdit_find23(QTextEdit* self, QRegExp* exp, int options) { +bool QTextEdit_find4(QTextEdit* self, QRegExp* exp, int options) { return self->find(*exp, static_cast(options)); } -bool QTextEdit_find24(QTextEdit* self, QRegularExpression* exp, int options) { +bool QTextEdit_find5(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_toMarkdownWithFeatures(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(); @@ -1865,11 +1865,11 @@ void QTextEdit_moveCursor2(QTextEdit* self, int operation, int mode) { self->moveCursor(static_cast(operation), static_cast(mode)); } -void QTextEdit_zoomIn1(QTextEdit* self, int range) { +void QTextEdit_zoomInWithRange(QTextEdit* self, int range) { self->zoomIn(static_cast(range)); } -void QTextEdit_zoomOut1(QTextEdit* self, int range) { +void QTextEdit_zoomOutWithRange(QTextEdit* self, int range) { self->zoomOut(static_cast(range)); } diff --git a/qt/gen_qtextedit.go b/qt/gen_qtextedit.go index 70c9873c..f040931f 100644 --- a/qt/gen_qtextedit.go +++ b/qt/gen_qtextedit.go @@ -778,24 +778,24 @@ func QTextEdit_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QTextEdit) Find22(exp string, options QTextDocument__FindFlag) bool { +func (this *QTextEdit) Find3(exp string, options QTextDocument__FindFlag) bool { 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))) + return (bool)(C.QTextEdit_find3(this.h, exp_ms, (C.int)(options))) } -func (this *QTextEdit) Find23(exp *QRegExp, options QTextDocument__FindFlag) bool { - return (bool)(C.QTextEdit_find23(this.h, exp.cPointer(), (C.int)(options))) +func (this *QTextEdit) Find4(exp *QRegExp, options QTextDocument__FindFlag) bool { + return (bool)(C.QTextEdit_find4(this.h, exp.cPointer(), (C.int)(options))) } -func (this *QTextEdit) Find24(exp *QRegularExpression, options QTextDocument__FindFlag) bool { - return (bool)(C.QTextEdit_find24(this.h, exp.cPointer(), (C.int)(options))) +func (this *QTextEdit) Find5(exp *QRegularExpression, options QTextDocument__FindFlag) bool { + return (bool)(C.QTextEdit_find5(this.h, exp.cPointer(), (C.int)(options))) } -func (this *QTextEdit) ToMarkdown1(features QTextDocument__MarkdownFeature) string { - var _ms C.struct_miqt_string = C.QTextEdit_toMarkdown1(this.h, (C.int)(features)) +func (this *QTextEdit) ToMarkdownWithFeatures(features QTextDocument__MarkdownFeature) string { + var _ms C.struct_miqt_string = C.QTextEdit_toMarkdownWithFeatures(this.h, (C.int)(features)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -805,12 +805,12 @@ func (this *QTextEdit) MoveCursor2(operation QTextCursor__MoveOperation, mode QT C.QTextEdit_moveCursor2(this.h, (C.int)(operation), (C.int)(mode)) } -func (this *QTextEdit) ZoomIn1(rangeVal int) { - C.QTextEdit_zoomIn1(this.h, (C.int)(rangeVal)) +func (this *QTextEdit) ZoomInWithRange(rangeVal int) { + C.QTextEdit_zoomInWithRange(this.h, (C.int)(rangeVal)) } -func (this *QTextEdit) ZoomOut1(rangeVal int) { - C.QTextEdit_zoomOut1(this.h, (C.int)(rangeVal)) +func (this *QTextEdit) ZoomOutWithRange(rangeVal int) { + C.QTextEdit_zoomOutWithRange(this.h, (C.int)(rangeVal)) } // ZoomInF can only be called from a QTextEdit that was directly constructed. diff --git a/qt/gen_qtextedit.h b/qt/gen_qtextedit.h index 5cef1ff7..b8875d75 100644 --- a/qt/gen_qtextedit.h +++ b/qt/gen_qtextedit.h @@ -267,13 +267,13 @@ 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); +bool QTextEdit_find3(QTextEdit* self, struct miqt_string exp, int options); +bool QTextEdit_find4(QTextEdit* self, QRegExp* exp, int options); +bool QTextEdit_find5(QTextEdit* self, QRegularExpression* exp, int options); +struct miqt_string QTextEdit_toMarkdownWithFeatures(const QTextEdit* self, int features); void QTextEdit_moveCursor2(QTextEdit* self, int operation, int mode); -void QTextEdit_zoomIn1(QTextEdit* self, int range); -void QTextEdit_zoomOut1(QTextEdit* self, int range); +void QTextEdit_zoomInWithRange(QTextEdit* self, int range); +void QTextEdit_zoomOutWithRange(QTextEdit* self, int range); bool QTextEdit_override_virtual_loadResource(void* self, intptr_t slot); QVariant* QTextEdit_virtualbase_loadResource(void* self, int type, QUrl* name); bool QTextEdit_override_virtual_inputMethodQuery(void* self, intptr_t slot); diff --git a/qt/gen_qtextformat.cpp b/qt/gen_qtextformat.cpp index d978fdfe..2b379e1e 100644 --- a/qt/gen_qtextformat.cpp +++ b/qt/gen_qtextformat.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include "gen_qtextformat.h" @@ -959,7 +960,7 @@ int QTextImageFormat_quality(const QTextImageFormat* self) { return self->quality(); } -void QTextImageFormat_setQuality1(QTextImageFormat* self, int quality) { +void QTextImageFormat_setQualityWithQuality(QTextImageFormat* self, int quality) { self->setQuality(static_cast(quality)); } diff --git a/qt/gen_qtextformat.go b/qt/gen_qtextformat.go index 40792e2b..9e3d5cc8 100644 --- a/qt/gen_qtextformat.go +++ b/qt/gen_qtextformat.go @@ -1449,8 +1449,8 @@ func (this *QTextImageFormat) Quality() int { return (int)(C.QTextImageFormat_quality(this.h)) } -func (this *QTextImageFormat) SetQuality1(quality int) { - C.QTextImageFormat_setQuality1(this.h, (C.int)(quality)) +func (this *QTextImageFormat) SetQualityWithQuality(quality int) { + C.QTextImageFormat_setQualityWithQuality(this.h, (C.int)(quality)) } // Delete this object from C++ memory. diff --git a/qt/gen_qtextformat.h b/qt/gen_qtextformat.h index dcd8094a..9ab69fdc 100644 --- a/qt/gen_qtextformat.h +++ b/qt/gen_qtextformat.h @@ -248,7 +248,7 @@ void QTextImageFormat_setHeight(QTextImageFormat* self, double height); double QTextImageFormat_height(const QTextImageFormat* self); void QTextImageFormat_setQuality(QTextImageFormat* self); int QTextImageFormat_quality(const QTextImageFormat* self); -void QTextImageFormat_setQuality1(QTextImageFormat* self, int quality); +void QTextImageFormat_setQualityWithQuality(QTextImageFormat* self, int quality); void QTextImageFormat_delete(QTextImageFormat* self); QTextFrameFormat* QTextFrameFormat_new(); diff --git a/qt/gen_qtextlayout.cpp b/qt/gen_qtextlayout.cpp index deb3c4bd..8ee167f7 100644 --- a/qt/gen_qtextlayout.cpp +++ b/qt/gen_qtextlayout.cpp @@ -16,6 +16,7 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QTextLayout__FormatRange #include #include +#include #include #include "gen_qtextlayout.h" @@ -351,7 +352,7 @@ int QTextLayout_previousCursorPosition2(const QTextLayout* self, int oldPos, int return self->previousCursorPosition(static_cast(oldPos), static_cast(mode)); } -void QTextLayout_draw3(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections) { +void QTextLayout_draw2(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections) { QVector selections_QList; selections_QList.reserve(selections.len); QTextLayout__FormatRange** selections_arr = static_cast(selections.data); @@ -361,7 +362,7 @@ void QTextLayout_draw3(const QTextLayout* self, QPainter* p, QPointF* pos, struc self->draw(p, *pos, selections_QList); } -void QTextLayout_draw4(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections, QRectF* clip) { +void QTextLayout_draw3(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections, QRectF* clip) { QVector selections_QList; selections_QList.reserve(selections.len); QTextLayout__FormatRange** selections_arr = static_cast(selections.data); @@ -371,7 +372,7 @@ void QTextLayout_draw4(const QTextLayout* self, QPainter* p, QPointF* pos, struc self->draw(p, *pos, selections_QList, *clip); } -struct miqt_array /* of QGlyphRun* */ QTextLayout_glyphRuns1(const QTextLayout* self, int from) { +struct miqt_array /* of QGlyphRun* */ QTextLayout_glyphRunsWithFrom(const QTextLayout* self, int from) { QList _ret = self->glyphRuns(static_cast(from)); // Convert QList<> from C++ memory to manually-managed C memory QGlyphRun** _arr = static_cast(malloc(sizeof(QGlyphRun*) * _ret.length())); @@ -538,7 +539,7 @@ double QTextLine_cursorToX2(const QTextLine* self, int* cursorPos, int edge) { return static_cast(_ret); } -double QTextLine_cursorToX22(const QTextLine* self, int cursorPos, int edge) { +double QTextLine_cursorToX3(const QTextLine* self, int cursorPos, int edge) { qreal _ret = self->cursorToX(static_cast(cursorPos), static_cast(edge)); return static_cast(_ret); } @@ -547,11 +548,11 @@ int QTextLine_xToCursor2(const QTextLine* self, double x, int param2) { return self->xToCursor(static_cast(x), static_cast(param2)); } -void QTextLine_draw3(const QTextLine* self, QPainter* p, QPointF* point, QTextLayout__FormatRange* selection) { +void QTextLine_draw2(const QTextLine* self, QPainter* p, QPointF* point, QTextLayout__FormatRange* selection) { self->draw(p, *point, selection); } -struct miqt_array /* of QGlyphRun* */ QTextLine_glyphRuns1(const QTextLine* self, int from) { +struct miqt_array /* of QGlyphRun* */ QTextLine_glyphRunsWithFrom(const QTextLine* self, int from) { QList _ret = self->glyphRuns(static_cast(from)); // Convert QList<> from C++ memory to manually-managed C memory QGlyphRun** _arr = static_cast(malloc(sizeof(QGlyphRun*) * _ret.length())); diff --git a/qt/gen_qtextlayout.go b/qt/gen_qtextlayout.go index 2cd094a3..2c84e0c2 100644 --- a/qt/gen_qtextlayout.go +++ b/qt/gen_qtextlayout.go @@ -454,28 +454,28 @@ func (this *QTextLayout) PreviousCursorPosition2(oldPos int, mode QTextLayout__C return (int)(C.QTextLayout_previousCursorPosition2(this.h, (C.int)(oldPos), (C.int)(mode))) } -func (this *QTextLayout) Draw3(p *QPainter, pos *QPointF, selections []QTextLayout__FormatRange) { +func (this *QTextLayout) Draw2(p *QPainter, pos *QPointF, selections []QTextLayout__FormatRange) { selections_CArray := (*[0xffff]*C.QTextLayout__FormatRange)(C.malloc(C.size_t(8 * len(selections)))) defer C.free(unsafe.Pointer(selections_CArray)) for i := range selections { selections_CArray[i] = selections[i].cPointer() } selections_ma := C.struct_miqt_array{len: C.size_t(len(selections)), data: unsafe.Pointer(selections_CArray)} - C.QTextLayout_draw3(this.h, p.cPointer(), pos.cPointer(), selections_ma) + C.QTextLayout_draw2(this.h, p.cPointer(), pos.cPointer(), selections_ma) } -func (this *QTextLayout) Draw4(p *QPainter, pos *QPointF, selections []QTextLayout__FormatRange, clip *QRectF) { +func (this *QTextLayout) Draw3(p *QPainter, pos *QPointF, selections []QTextLayout__FormatRange, clip *QRectF) { selections_CArray := (*[0xffff]*C.QTextLayout__FormatRange)(C.malloc(C.size_t(8 * len(selections)))) defer C.free(unsafe.Pointer(selections_CArray)) for i := range selections { selections_CArray[i] = selections[i].cPointer() } selections_ma := C.struct_miqt_array{len: C.size_t(len(selections)), data: unsafe.Pointer(selections_CArray)} - C.QTextLayout_draw4(this.h, p.cPointer(), pos.cPointer(), selections_ma, clip.cPointer()) + C.QTextLayout_draw3(this.h, p.cPointer(), pos.cPointer(), selections_ma, clip.cPointer()) } -func (this *QTextLayout) GlyphRuns1(from int) []QGlyphRun { - var _ma C.struct_miqt_array = C.QTextLayout_glyphRuns1(this.h, (C.int)(from)) +func (this *QTextLayout) GlyphRunsWithFrom(from int) []QGlyphRun { + var _ma C.struct_miqt_array = C.QTextLayout_glyphRunsWithFrom(this.h, (C.int)(from)) _ret := make([]QGlyphRun, int(_ma.len)) _outCast := (*[0xffff]*C.QGlyphRun)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -676,20 +676,20 @@ func (this *QTextLine) CursorToX2(cursorPos *int, edge QTextLine__Edge) float64 return (float64)(C.QTextLine_cursorToX2(this.h, (*C.int)(unsafe.Pointer(cursorPos)), (C.int)(edge))) } -func (this *QTextLine) CursorToX22(cursorPos int, edge QTextLine__Edge) float64 { - return (float64)(C.QTextLine_cursorToX22(this.h, (C.int)(cursorPos), (C.int)(edge))) +func (this *QTextLine) CursorToX3(cursorPos int, edge QTextLine__Edge) float64 { + return (float64)(C.QTextLine_cursorToX3(this.h, (C.int)(cursorPos), (C.int)(edge))) } func (this *QTextLine) XToCursor2(x float64, param2 QTextLine__CursorPosition) int { return (int)(C.QTextLine_xToCursor2(this.h, (C.double)(x), (C.int)(param2))) } -func (this *QTextLine) Draw3(p *QPainter, point *QPointF, selection *QTextLayout__FormatRange) { - C.QTextLine_draw3(this.h, p.cPointer(), point.cPointer(), selection.cPointer()) +func (this *QTextLine) Draw2(p *QPainter, point *QPointF, selection *QTextLayout__FormatRange) { + C.QTextLine_draw2(this.h, p.cPointer(), point.cPointer(), selection.cPointer()) } -func (this *QTextLine) GlyphRuns1(from int) []QGlyphRun { - var _ma C.struct_miqt_array = C.QTextLine_glyphRuns1(this.h, (C.int)(from)) +func (this *QTextLine) GlyphRunsWithFrom(from int) []QGlyphRun { + var _ma C.struct_miqt_array = C.QTextLine_glyphRunsWithFrom(this.h, (C.int)(from)) _ret := make([]QGlyphRun, int(_ma.len)) _outCast := (*[0xffff]*C.QGlyphRun)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qtextlayout.h b/qt/gen_qtextlayout.h index 999a6abd..5dea2b12 100644 --- a/qt/gen_qtextlayout.h +++ b/qt/gen_qtextlayout.h @@ -115,9 +115,9 @@ struct miqt_array /* of QGlyphRun* */ QTextLayout_glyphRuns(const QTextLayout* void QTextLayout_setFlags(QTextLayout* self, int flags); int QTextLayout_nextCursorPosition2(const QTextLayout* self, int oldPos, int mode); int QTextLayout_previousCursorPosition2(const QTextLayout* self, int oldPos, int mode); -void QTextLayout_draw3(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections); -void QTextLayout_draw4(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections, QRectF* clip); -struct miqt_array /* of QGlyphRun* */ QTextLayout_glyphRuns1(const QTextLayout* self, int from); +void QTextLayout_draw2(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections); +void QTextLayout_draw3(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections, QRectF* clip); +struct miqt_array /* of QGlyphRun* */ QTextLayout_glyphRunsWithFrom(const QTextLayout* self, int from); struct miqt_array /* of QGlyphRun* */ QTextLayout_glyphRuns2(const QTextLayout* self, int from, int length); void QTextLayout_delete(QTextLayout* self); @@ -150,10 +150,10 @@ int QTextLine_lineNumber(const QTextLine* self); void QTextLine_draw(const QTextLine* self, QPainter* p, QPointF* point); struct miqt_array /* of QGlyphRun* */ QTextLine_glyphRuns(const QTextLine* self); double QTextLine_cursorToX2(const QTextLine* self, int* cursorPos, int edge); -double QTextLine_cursorToX22(const QTextLine* self, int cursorPos, int edge); +double QTextLine_cursorToX3(const QTextLine* self, int cursorPos, int edge); int QTextLine_xToCursor2(const QTextLine* self, double x, int param2); -void QTextLine_draw3(const QTextLine* self, QPainter* p, QPointF* point, QTextLayout__FormatRange* selection); -struct miqt_array /* of QGlyphRun* */ QTextLine_glyphRuns1(const QTextLine* self, int from); +void QTextLine_draw2(const QTextLine* self, QPainter* p, QPointF* point, QTextLayout__FormatRange* selection); +struct miqt_array /* of QGlyphRun* */ QTextLine_glyphRunsWithFrom(const QTextLine* self, int from); struct miqt_array /* of QGlyphRun* */ QTextLine_glyphRuns2(const QTextLine* self, int from, int length); void QTextLine_delete(QTextLine* self); diff --git a/qt/gen_qtextobject.cpp b/qt/gen_qtextobject.cpp index c7725fc1..5b23036b 100644 --- a/qt/gen_qtextobject.cpp +++ b/qt/gen_qtextobject.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include "gen_qtextobject.h" @@ -949,7 +950,7 @@ struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRuns(const QTextFragme return _out; } -struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRuns1(const QTextFragment* self, int from) { +struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRunsWithFrom(const QTextFragment* self, int from) { QList _ret = self->glyphRuns(static_cast(from)); // Convert QList<> from C++ memory to manually-managed C memory QGlyphRun** _arr = static_cast(malloc(sizeof(QGlyphRun*) * _ret.length())); diff --git a/qt/gen_qtextobject.go b/qt/gen_qtextobject.go index c8b45ad5..798adae1 100644 --- a/qt/gen_qtextobject.go +++ b/qt/gen_qtextobject.go @@ -1128,8 +1128,8 @@ func (this *QTextFragment) GlyphRuns() []QGlyphRun { return _ret } -func (this *QTextFragment) GlyphRuns1(from int) []QGlyphRun { - var _ma C.struct_miqt_array = C.QTextFragment_glyphRuns1(this.h, (C.int)(from)) +func (this *QTextFragment) GlyphRunsWithFrom(from int) []QGlyphRun { + var _ma C.struct_miqt_array = C.QTextFragment_glyphRunsWithFrom(this.h, (C.int)(from)) _ret := make([]QGlyphRun, int(_ma.len)) _outCast := (*[0xffff]*C.QGlyphRun)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qtextobject.h b/qt/gen_qtextobject.h index c834871e..f9ca0389 100644 --- a/qt/gen_qtextobject.h +++ b/qt/gen_qtextobject.h @@ -210,7 +210,7 @@ QTextCharFormat* QTextFragment_charFormat(const QTextFragment* self); int QTextFragment_charFormatIndex(const QTextFragment* self); struct miqt_string QTextFragment_text(const QTextFragment* self); struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRuns(const QTextFragment* self); -struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRuns1(const QTextFragment* self, int from); +struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRunsWithFrom(const QTextFragment* self, int from); struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRuns2(const QTextFragment* self, int from, int length); void QTextFragment_delete(QTextFragment* self); diff --git a/qt/gen_qtextstream.cpp b/qt/gen_qtextstream.cpp index 51919a04..926a1963 100644 --- a/qt/gen_qtextstream.cpp +++ b/qt/gen_qtextstream.cpp @@ -233,13 +233,13 @@ QTextStream* QTextStream_operatorShiftRightWithCh(QTextStream* self, char* ch) { return &_ret; } -QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, int16_t* i) { +QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, short* i) { QTextStream& _ret = self->operator>>(static_cast(*i)); // Cast returned reference into pointer return &_ret; } -QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, uint16_t* i) { +QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, unsigned short* i) { QTextStream& _ret = self->operator>>(static_cast(*i)); // Cast returned reference into pointer return &_ret; @@ -325,13 +325,13 @@ QTextStream* QTextStream_operatorShiftLeftWithCh(QTextStream* self, char ch) { return &_ret; } -QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, int16_t i) { +QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, short i) { QTextStream& _ret = self->operator<<(static_cast(i)); // Cast returned reference into pointer return &_ret; } -QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, uint16_t i) { +QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, unsigned short i) { QTextStream& _ret = self->operator<<(static_cast(i)); // Cast returned reference into pointer return &_ret; @@ -411,7 +411,7 @@ QTextStream* QTextStream_operatorShiftLeftWithPtr(QTextStream* self, const void* return &_ret; } -struct miqt_string QTextStream_readLine1(QTextStream* self, long long maxlen) { +struct miqt_string QTextStream_readLineWithMaxlen(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(); diff --git a/qt/gen_qtextstream.go b/qt/gen_qtextstream.go index 57ff233f..0461a40d 100644 --- a/qt/gen_qtextstream.go +++ b/qt/gen_qtextstream.go @@ -298,11 +298,11 @@ func (this *QTextStream) OperatorShiftRightWithCh(ch *int8) *QTextStream { } func (this *QTextStream) OperatorShiftRightWithShort(i *int16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftRightWithShort(this.h, (*C.int16_t)(unsafe.Pointer(i)))) + return newQTextStream(C.QTextStream_operatorShiftRightWithShort(this.h, (*C.short)(unsafe.Pointer(i)))) } func (this *QTextStream) OperatorShiftRightWithUnsignedshort(i *uint16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftRightWithUnsignedshort(this.h, (*C.uint16_t)(unsafe.Pointer(i)))) + return newQTextStream(C.QTextStream_operatorShiftRightWithUnsignedshort(this.h, (*C.ushort)(unsafe.Pointer(i)))) } func (this *QTextStream) OperatorShiftRightWithInt(i *int) *QTextStream { @@ -371,11 +371,11 @@ func (this *QTextStream) OperatorShiftLeftWithCh(ch int8) *QTextStream { } func (this *QTextStream) OperatorShiftLeftWithShort(i int16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftLeftWithShort(this.h, (C.int16_t)(i))) + return newQTextStream(C.QTextStream_operatorShiftLeftWithShort(this.h, (C.short)(i))) } func (this *QTextStream) OperatorShiftLeftWithUnsignedshort(i uint16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftLeftWithUnsignedshort(this.h, (C.uint16_t)(i))) + return newQTextStream(C.QTextStream_operatorShiftLeftWithUnsignedshort(this.h, (C.ushort)(i))) } func (this *QTextStream) OperatorShiftLeftWithInt(i int) *QTextStream { @@ -439,8 +439,8 @@ func (this *QTextStream) OperatorShiftLeftWithPtr(ptr unsafe.Pointer) *QTextStre return newQTextStream(C.QTextStream_operatorShiftLeftWithPtr(this.h, ptr)) } -func (this *QTextStream) ReadLine1(maxlen int64) string { - var _ms C.struct_miqt_string = C.QTextStream_readLine1(this.h, (C.longlong)(maxlen)) +func (this *QTextStream) ReadLineWithMaxlen(maxlen int64) string { + var _ms C.struct_miqt_string = C.QTextStream_readLineWithMaxlen(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 a5fd5aff..cf10e1e4 100644 --- a/qt/gen_qtextstream.h +++ b/qt/gen_qtextstream.h @@ -72,8 +72,8 @@ void QTextStream_setRealNumberPrecision(QTextStream* self, int precision); int QTextStream_realNumberPrecision(const QTextStream* self); QTextStream* QTextStream_operatorShiftRight(QTextStream* self, QChar* ch); QTextStream* QTextStream_operatorShiftRightWithCh(QTextStream* self, char* ch); -QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, int16_t* i); -QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, uint16_t* i); +QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, short* i); +QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, unsigned short* i); QTextStream* QTextStream_operatorShiftRightWithInt(QTextStream* self, int* i); QTextStream* QTextStream_operatorShiftRightWithUnsignedint(QTextStream* self, unsigned int* i); QTextStream* QTextStream_operatorShiftRightWithLong(QTextStream* self, long* i); @@ -87,8 +87,8 @@ QTextStream* QTextStream_operatorShiftRightWithArray(QTextStream* self, struct m QTextStream* QTextStream_operatorShiftRightWithChar(QTextStream* self, char* c); QTextStream* QTextStream_operatorShiftLeft(QTextStream* self, QChar* ch); QTextStream* QTextStream_operatorShiftLeftWithCh(QTextStream* self, char ch); -QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, int16_t i); -QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, uint16_t i); +QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, short i); +QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, unsigned short i); QTextStream* QTextStream_operatorShiftLeftWithInt(QTextStream* self, int i); QTextStream* QTextStream_operatorShiftLeftWithUnsignedint(QTextStream* self, unsigned int i); QTextStream* QTextStream_operatorShiftLeftWithLong(QTextStream* self, long i); @@ -101,7 +101,7 @@ QTextStream* QTextStream_operatorShiftLeftWithQString(QTextStream* self, struct 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_readLineWithMaxlen(QTextStream* self, long long maxlen); void QTextStream_delete(QTextStream* self); #ifdef __cplusplus diff --git a/qt/gen_qthread.cpp b/qt/gen_qthread.cpp index ebcd2f4e..1a3d3b4e 100644 --- a/qt/gen_qthread.cpp +++ b/qt/gen_qthread.cpp @@ -388,15 +388,15 @@ struct miqt_string QThread_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QThread_exit1(QThread* self, int retcode) { +void QThread_exitWithRetcode(QThread* self, int retcode) { self->exit(static_cast(retcode)); } -void QThread_start1(QThread* self, int param1) { +void QThread_startWithQThreadPriority(QThread* self, int param1) { self->start(static_cast(param1)); } -bool QThread_wait1(QThread* self, QDeadlineTimer* deadline) { +bool QThread_waitWithDeadline(QThread* self, QDeadlineTimer* deadline) { return self->wait(*deadline); } diff --git a/qt/gen_qthread.go b/qt/gen_qthread.go index 96356e88..f73b49af 100644 --- a/qt/gen_qthread.go +++ b/qt/gen_qthread.go @@ -247,16 +247,16 @@ func QThread_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QThread) Exit1(retcode int) { - C.QThread_exit1(this.h, (C.int)(retcode)) +func (this *QThread) ExitWithRetcode(retcode int) { + C.QThread_exitWithRetcode(this.h, (C.int)(retcode)) } -func (this *QThread) Start1(param1 QThread__Priority) { - C.QThread_start1(this.h, (C.int)(param1)) +func (this *QThread) StartWithQThreadPriority(param1 QThread__Priority) { + C.QThread_startWithQThreadPriority(this.h, (C.int)(param1)) } -func (this *QThread) Wait1(deadline QDeadlineTimer) bool { - return (bool)(C.QThread_wait1(this.h, deadline.cPointer())) +func (this *QThread) WaitWithDeadline(deadline QDeadlineTimer) bool { + return (bool)(C.QThread_waitWithDeadline(this.h, deadline.cPointer())) } // Exec can only be called from a QThread that was directly constructed. diff --git a/qt/gen_qthread.h b/qt/gen_qthread.h index a5c7ebdf..7b932a88 100644 --- a/qt/gen_qthread.h +++ b/qt/gen_qthread.h @@ -73,9 +73,9 @@ 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); +void QThread_exitWithRetcode(QThread* self, int retcode); +void QThread_startWithQThreadPriority(QThread* self, int param1); +bool QThread_waitWithDeadline(QThread* self, QDeadlineTimer* deadline); bool QThread_override_virtual_event(void* self, intptr_t slot); bool QThread_virtualbase_event(void* self, QEvent* event); bool QThread_override_virtual_run(void* self, intptr_t slot); diff --git a/qt/gen_qthreadpool.cpp b/qt/gen_qthreadpool.cpp index 620ab6ee..4a73f051 100644 --- a/qt/gen_qthreadpool.cpp +++ b/qt/gen_qthreadpool.cpp @@ -338,7 +338,7 @@ void QThreadPool_start2(QThreadPool* self, QRunnable* runnable, int priority) { self->start(runnable, static_cast(priority)); } -bool QThreadPool_waitForDone1(QThreadPool* self, int msecs) { +bool QThreadPool_waitForDoneWithMsecs(QThreadPool* self, int msecs) { return self->waitForDone(static_cast(msecs)); } diff --git a/qt/gen_qthreadpool.go b/qt/gen_qthreadpool.go index d4c08402..cabe0135 100644 --- a/qt/gen_qthreadpool.go +++ b/qt/gen_qthreadpool.go @@ -206,8 +206,8 @@ func (this *QThreadPool) Start2(runnable *QRunnable, priority int) { C.QThreadPool_start2(this.h, runnable.cPointer(), (C.int)(priority)) } -func (this *QThreadPool) WaitForDone1(msecs int) bool { - return (bool)(C.QThreadPool_waitForDone1(this.h, (C.int)(msecs))) +func (this *QThreadPool) WaitForDoneWithMsecs(msecs int) bool { + return (bool)(C.QThreadPool_waitForDoneWithMsecs(this.h, (C.int)(msecs))) } // Sender can only be called from a QThreadPool that was directly constructed. diff --git a/qt/gen_qthreadpool.h b/qt/gen_qthreadpool.h index e34955d0..ddb8c5a4 100644 --- a/qt/gen_qthreadpool.h +++ b/qt/gen_qthreadpool.h @@ -65,7 +65,7 @@ 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); +bool QThreadPool_waitForDoneWithMsecs(QThreadPool* self, int msecs); bool QThreadPool_override_virtual_event(void* self, intptr_t slot); bool QThreadPool_virtualbase_event(void* self, QEvent* event); bool QThreadPool_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt/gen_qtimezone.cpp b/qt/gen_qtimezone.cpp index f517b99d..744f1819 100644 --- a/qt/gen_qtimezone.cpp +++ b/qt/gen_qtimezone.cpp @@ -7,6 +7,7 @@ #include #include #define WORKAROUND_INNER_CLASS_DEFINITION_QTimeZone__OffsetData +#include #include #include "gen_qtimezone.h" @@ -342,7 +343,7 @@ struct miqt_string QTimeZone_displayName3(const QTimeZone* self, QDateTime* atDa return _ms; } -struct miqt_string QTimeZone_displayName22(const QTimeZone* self, int timeType, int nameType) { +struct miqt_string QTimeZone_displayName4(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(); @@ -353,7 +354,7 @@ struct miqt_string QTimeZone_displayName22(const QTimeZone* self, int timeType, return _ms; } -struct miqt_string QTimeZone_displayName32(const QTimeZone* self, int timeType, int nameType, QLocale* locale) { +struct miqt_string QTimeZone_displayName5(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(); diff --git a/qt/gen_qtimezone.go b/qt/gen_qtimezone.go index 6ae77fcf..b83fb53a 100644 --- a/qt/gen_qtimezone.go +++ b/qt/gen_qtimezone.go @@ -437,15 +437,15 @@ func (this *QTimeZone) DisplayName3(atDateTime *QDateTime, nameType QTimeZone__N 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)) +func (this *QTimeZone) DisplayName4(timeType QTimeZone__TimeType, nameType QTimeZone__NameType) string { + var _ms C.struct_miqt_string = C.QTimeZone_displayName4(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()) +func (this *QTimeZone) DisplayName5(timeType QTimeZone__TimeType, nameType QTimeZone__NameType, locale *QLocale) string { + var _ms C.struct_miqt_string = C.QTimeZone_displayName5(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 dc0db437..64a0c4de 100644 --- a/qt/gen_qtimezone.h +++ b/qt/gen_qtimezone.h @@ -70,8 +70,8 @@ struct miqt_array /* of struct miqt_string */ QTimeZone_windowsIdToIanaIds(stru struct miqt_array /* of struct miqt_string */ 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); +struct miqt_string QTimeZone_displayName4(const QTimeZone* self, int timeType, int nameType); +struct miqt_string QTimeZone_displayName5(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_qtooltip.cpp b/qt/gen_qtooltip.cpp index de7fb4d7..d3fc8c8c 100644 --- a/qt/gen_qtooltip.cpp +++ b/qt/gen_qtooltip.cpp @@ -68,7 +68,7 @@ void QToolTip_setFont(QFont* font) { QToolTip::setFont(*font); } -void QToolTip_showText32(QPoint* pos, struct miqt_string text, QWidget* w) { +void QToolTip_showText4(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 1e298b22..3188ec37 100644 --- a/qt/gen_qtooltip.go +++ b/qt/gen_qtooltip.go @@ -104,12 +104,12 @@ func QToolTip_SetFont(font *QFont) { C.QToolTip_setFont(font.cPointer()) } -func QToolTip_ShowText32(pos *QPoint, text string, w *QWidget) { +func QToolTip_ShowText4(pos *QPoint, text string, w *QWidget) { text_ms := C.struct_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()) + C.QToolTip_showText4(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 10474d16..7a05158c 100644 --- a/qt/gen_qtooltip.h +++ b/qt/gen_qtooltip.h @@ -40,7 +40,7 @@ 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_showText4(QPoint* pos, struct miqt_string text, QWidget* w); void QToolTip_delete(QToolTip* self); #ifdef __cplusplus diff --git a/qt/gen_qtransform.cpp b/qt/gen_qtransform.cpp index 926c33c5..64e5fdfc 100644 --- a/qt/gen_qtransform.cpp +++ b/qt/gen_qtransform.cpp @@ -296,7 +296,7 @@ QTransform* QTransform_fromScale(double dx, double dy) { return new QTransform(QTransform::fromScale(static_cast(dx), static_cast(dy))); } -QTransform* QTransform_inverted1(const QTransform* self, bool* invertible) { +QTransform* QTransform_invertedWithInvertible(const QTransform* self, bool* invertible) { return new QTransform(self->inverted(invertible)); } diff --git a/qt/gen_qtransform.go b/qt/gen_qtransform.go index c976f465..d0002f82 100644 --- a/qt/gen_qtransform.go +++ b/qt/gen_qtransform.go @@ -340,8 +340,8 @@ func QTransform_FromScale(dx float64, dy float64) *QTransform { return _goptr } -func (this *QTransform) Inverted1(invertible *bool) *QTransform { - _goptr := newQTransform(C.QTransform_inverted1(this.h, (*C.bool)(unsafe.Pointer(invertible)))) +func (this *QTransform) InvertedWithInvertible(invertible *bool) *QTransform { + _goptr := newQTransform(C.QTransform_invertedWithInvertible(this.h, (*C.bool)(unsafe.Pointer(invertible)))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qtransform.h b/qt/gen_qtransform.h index 24f556a9..c0dddf24 100644 --- a/qt/gen_qtransform.h +++ b/qt/gen_qtransform.h @@ -100,7 +100,7 @@ QTransform* QTransform_operatorPlusAssign(QTransform* self, double div); QTransform* QTransform_operatorMinusAssign(QTransform* self, double div); QTransform* QTransform_fromTranslate(double dx, double dy); QTransform* QTransform_fromScale(double dx, double dy); -QTransform* QTransform_inverted1(const QTransform* self, bool* invertible); +QTransform* QTransform_invertedWithInvertible(const QTransform* self, bool* invertible); QTransform* QTransform_rotate2(QTransform* self, double a, int axis); QTransform* QTransform_rotateRadians2(QTransform* self, double a, int axis); void QTransform_delete(QTransform* self); diff --git a/qt/gen_qtranslator.cpp b/qt/gen_qtranslator.cpp index e61463eb..203aec66 100644 --- a/qt/gen_qtranslator.cpp +++ b/qt/gen_qtranslator.cpp @@ -356,20 +356,20 @@ struct miqt_string QTranslator_trUtf83(const char* s, const char* c, int n) { return _ms; } -bool QTranslator_load22(QTranslator* self, struct miqt_string filename, struct miqt_string directory) { +bool QTranslator_load4(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) { +bool QTranslator_load5(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) { +bool QTranslator_load6(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); @@ -377,20 +377,20 @@ bool QTranslator_load4(QTranslator* self, struct miqt_string filename, struct mi 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) { +bool QTranslator_load7(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) { +bool QTranslator_load8(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) { +bool QTranslator_load9(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); @@ -398,7 +398,7 @@ bool QTranslator_load5(QTranslator* self, QLocale* locale, struct miqt_string fi return self->load(*locale, filename_QString, prefix_QString, directory_QString, suffix_QString); } -bool QTranslator_load34(QTranslator* self, const unsigned char* data, int len, struct miqt_string directory) { +bool QTranslator_load10(QTranslator* self, const unsigned char* data, int len, struct miqt_string directory) { QString directory_QString = QString::fromUtf8(directory.data, directory.len); return self->load(static_cast(data), static_cast(len), directory_QString); } diff --git a/qt/gen_qtranslator.go b/qt/gen_qtranslator.go index 0b6314e7..5ff2318d 100644 --- a/qt/gen_qtranslator.go +++ b/qt/gen_qtranslator.go @@ -185,7 +185,7 @@ func QTranslator_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QTranslator) Load22(filename string, directory string) bool { +func (this *QTranslator) Load4(filename string, directory string) bool { filename_ms := C.struct_miqt_string{} filename_ms.data = C.CString(filename) filename_ms.len = C.size_t(len(filename)) @@ -194,10 +194,10 @@ func (this *QTranslator) Load22(filename string, directory string) bool { 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)) + return (bool)(C.QTranslator_load4(this.h, filename_ms, directory_ms)) } -func (this *QTranslator) Load32(filename string, directory string, search_delimiters string) bool { +func (this *QTranslator) Load5(filename string, directory string, search_delimiters string) bool { filename_ms := C.struct_miqt_string{} filename_ms.data = C.CString(filename) filename_ms.len = C.size_t(len(filename)) @@ -210,10 +210,10 @@ func (this *QTranslator) Load32(filename string, directory string, search_delimi 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)) + return (bool)(C.QTranslator_load5(this.h, filename_ms, directory_ms, search_delimiters_ms)) } -func (this *QTranslator) Load4(filename string, directory string, search_delimiters string, suffix string) bool { +func (this *QTranslator) Load6(filename string, directory string, search_delimiters string, suffix string) bool { filename_ms := C.struct_miqt_string{} filename_ms.data = C.CString(filename) filename_ms.len = C.size_t(len(filename)) @@ -230,10 +230,10 @@ func (this *QTranslator) Load4(filename string, directory string, search_delimit 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)) + return (bool)(C.QTranslator_load6(this.h, filename_ms, directory_ms, search_delimiters_ms, suffix_ms)) } -func (this *QTranslator) Load33(locale *QLocale, filename string, prefix string) bool { +func (this *QTranslator) Load7(locale *QLocale, filename string, prefix string) bool { filename_ms := C.struct_miqt_string{} filename_ms.data = C.CString(filename) filename_ms.len = C.size_t(len(filename)) @@ -242,10 +242,10 @@ func (this *QTranslator) Load33(locale *QLocale, filename string, prefix 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)) + return (bool)(C.QTranslator_load7(this.h, locale.cPointer(), filename_ms, prefix_ms)) } -func (this *QTranslator) Load42(locale *QLocale, filename string, prefix string, directory string) bool { +func (this *QTranslator) Load8(locale *QLocale, filename string, prefix string, directory string) bool { filename_ms := C.struct_miqt_string{} filename_ms.data = C.CString(filename) filename_ms.len = C.size_t(len(filename)) @@ -258,10 +258,10 @@ func (this *QTranslator) Load42(locale *QLocale, filename string, prefix 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)) + return (bool)(C.QTranslator_load8(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 { +func (this *QTranslator) Load9(locale *QLocale, filename string, prefix string, directory string, suffix string) bool { filename_ms := C.struct_miqt_string{} filename_ms.data = C.CString(filename) filename_ms.len = C.size_t(len(filename)) @@ -278,15 +278,15 @@ func (this *QTranslator) Load5(locale *QLocale, filename string, prefix 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)) + return (bool)(C.QTranslator_load9(this.h, locale.cPointer(), filename_ms, prefix_ms, directory_ms, suffix_ms)) } -func (this *QTranslator) Load34(data *byte, lenVal int, directory string) bool { +func (this *QTranslator) Load10(data *byte, lenVal int, directory string) bool { 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)) + return (bool)(C.QTranslator_load10(this.h, (*C.uchar)(unsafe.Pointer(data)), (C.int)(lenVal), directory_ms)) } // Sender can only be called from a QTranslator that was directly constructed. diff --git a/qt/gen_qtranslator.h b/qt/gen_qtranslator.h index 119c4012..0540c09e 100644 --- a/qt/gen_qtranslator.h +++ b/qt/gen_qtranslator.h @@ -52,13 +52,13 @@ 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); -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 len, struct miqt_string directory); +bool QTranslator_load4(QTranslator* self, struct miqt_string filename, struct miqt_string directory); +bool QTranslator_load5(QTranslator* self, struct miqt_string filename, struct miqt_string directory, struct miqt_string search_delimiters); +bool QTranslator_load6(QTranslator* self, struct miqt_string filename, struct miqt_string directory, struct miqt_string search_delimiters, struct miqt_string suffix); +bool QTranslator_load7(QTranslator* self, QLocale* locale, struct miqt_string filename, struct miqt_string prefix); +bool QTranslator_load8(QTranslator* self, QLocale* locale, struct miqt_string filename, struct miqt_string prefix, struct miqt_string directory); +bool QTranslator_load9(QTranslator* self, QLocale* locale, struct miqt_string filename, struct miqt_string prefix, struct miqt_string directory, struct miqt_string suffix); +bool QTranslator_load10(QTranslator* self, const unsigned char* data, int len, struct miqt_string directory); bool QTranslator_override_virtual_translate(void* self, intptr_t slot); struct miqt_string QTranslator_virtualbase_translate(const void* self, const char* context, const char* sourceText, const char* disambiguation, int n); bool QTranslator_override_virtual_isEmpty(void* self, intptr_t slot); diff --git a/qt/gen_qtransposeproxymodel.cpp b/qt/gen_qtransposeproxymodel.cpp index 5687ecd7..3ea92e1b 100644 --- a/qt/gen_qtransposeproxymodel.cpp +++ b/qt/gen_qtransposeproxymodel.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qtreeview.cpp b/qt/gen_qtreeview.cpp index 5c9beaad..6b2a37ad 100644 --- a/qt/gen_qtreeview.cpp +++ b/qt/gen_qtreeview.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qtreewidget.cpp b/qt/gen_qtreewidget.cpp index ec6b0968..c071b3f1 100644 --- a/qt/gen_qtreewidget.cpp +++ b/qt/gen_qtreewidget.cpp @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -2723,7 +2724,7 @@ public: friend QModelIndex* QTreeWidget_protectedbase_indexFromItemWithItem(bool* _dynamic_cast_ok, const void* self, QTreeWidgetItem* item); friend QTreeWidgetItem* QTreeWidget_protectedbase_itemFromIndex(bool* _dynamic_cast_ok, const void* self, QModelIndex* index); friend QModelIndex* QTreeWidget_protectedbase_indexFromItem2(bool* _dynamic_cast_ok, const void* self, QTreeWidgetItem* item, int column); - friend QModelIndex* QTreeWidget_protectedbase_indexFromItem22(bool* _dynamic_cast_ok, const void* self, QTreeWidgetItem* item, int column); + friend QModelIndex* QTreeWidget_protectedbase_indexFromItem3(bool* _dynamic_cast_ok, const void* self, QTreeWidgetItem* item, int column); friend void QTreeWidget_protectedbase_columnResized(bool* _dynamic_cast_ok, void* self, int column, int oldSize, int newSize); friend void QTreeWidget_protectedbase_columnCountChanged(bool* _dynamic_cast_ok, void* self, int oldCount, int newCount); friend void QTreeWidget_protectedbase_columnMoved(bool* _dynamic_cast_ok, void* self); @@ -3215,7 +3216,7 @@ bool QTreeWidget_isPersistentEditorOpen2(const QTreeWidget* self, QTreeWidgetIte return self->isPersistentEditorOpen(item, static_cast(column)); } -struct miqt_array /* of QTreeWidgetItem* */ QTreeWidget_findItems3(const QTreeWidget* self, struct miqt_string text, int flags, int column) { +struct miqt_array /* of QTreeWidgetItem* */ QTreeWidget_findItems2(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 @@ -4852,7 +4853,7 @@ QModelIndex* QTreeWidget_protectedbase_indexFromItem2(bool* _dynamic_cast_ok, co } -QModelIndex* QTreeWidget_protectedbase_indexFromItem22(bool* _dynamic_cast_ok, const void* self, QTreeWidgetItem* item, int column) { +QModelIndex* QTreeWidget_protectedbase_indexFromItem3(bool* _dynamic_cast_ok, const void* self, QTreeWidgetItem* item, int column) { MiqtVirtualQTreeWidget* self_cast = dynamic_cast( (QTreeWidget*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt/gen_qtreewidget.go b/qt/gen_qtreewidget.go index 0d04278c..af90053e 100644 --- a/qt/gen_qtreewidget.go +++ b/qt/gen_qtreewidget.go @@ -1313,12 +1313,12 @@ func (this *QTreeWidget) IsPersistentEditorOpen2(item *QTreeWidgetItem, column i return (bool)(C.QTreeWidget_isPersistentEditorOpen2(this.h, item.cPointer(), (C.int)(column))) } -func (this *QTreeWidget) FindItems3(text string, flags MatchFlag, column int) []*QTreeWidgetItem { +func (this *QTreeWidget) FindItems2(text string, flags MatchFlag, column int) []*QTreeWidgetItem { text_ms := C.struct_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)) + var _ma C.struct_miqt_array = C.QTreeWidget_findItems2(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++ { @@ -1413,11 +1413,11 @@ func (this *QTreeWidget) IndexFromItem2(item *QTreeWidgetItem, column int) QMode } -// IndexFromItem22 can only be called from a QTreeWidget that was directly constructed. -func (this *QTreeWidget) IndexFromItem22(item *QTreeWidgetItem, column int) QModelIndex { +// IndexFromItem3 can only be called from a QTreeWidget that was directly constructed. +func (this *QTreeWidget) IndexFromItem3(item *QTreeWidgetItem, column int) QModelIndex { var _dynamic_cast_ok C.bool = false - _goptr := newQModelIndex(C.QTreeWidget_protectedbase_indexFromItem22(&_dynamic_cast_ok, unsafe.Pointer(this.h), item.cPointer(), (C.int)(column))) + _goptr := newQModelIndex(C.QTreeWidget_protectedbase_indexFromItem3(&_dynamic_cast_ok, unsafe.Pointer(this.h), item.cPointer(), (C.int)(column))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer _method_ret := *_goptr diff --git a/qt/gen_qtreewidget.h b/qt/gen_qtreewidget.h index 6876ab45..3b75ae6f 100644 --- a/qt/gen_qtreewidget.h +++ b/qt/gen_qtreewidget.h @@ -304,7 +304,7 @@ 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 /* of QTreeWidgetItem* */ QTreeWidget_findItems3(const QTreeWidget* self, struct miqt_string text, int flags, int column); +struct miqt_array /* of QTreeWidgetItem* */ QTreeWidget_findItems2(const QTreeWidget* self, struct miqt_string text, int flags, int column); void QTreeWidget_scrollToItem2(QTreeWidget* self, QTreeWidgetItem* item, int hint); bool QTreeWidget_override_virtual_setSelectionModel(void* self, intptr_t slot); void QTreeWidget_virtualbase_setSelectionModel(void* self, QItemSelectionModel* selectionModel); @@ -499,7 +499,7 @@ QModelIndex* QTreeWidget_protectedbase_indexFromItem(bool* _dynamic_cast_ok, con QModelIndex* QTreeWidget_protectedbase_indexFromItemWithItem(bool* _dynamic_cast_ok, const void* self, QTreeWidgetItem* item); QTreeWidgetItem* QTreeWidget_protectedbase_itemFromIndex(bool* _dynamic_cast_ok, const void* self, QModelIndex* index); QModelIndex* QTreeWidget_protectedbase_indexFromItem2(bool* _dynamic_cast_ok, const void* self, QTreeWidgetItem* item, int column); -QModelIndex* QTreeWidget_protectedbase_indexFromItem22(bool* _dynamic_cast_ok, const void* self, QTreeWidgetItem* item, int column); +QModelIndex* QTreeWidget_protectedbase_indexFromItem3(bool* _dynamic_cast_ok, const void* self, QTreeWidgetItem* item, int column); void QTreeWidget_protectedbase_columnResized(bool* _dynamic_cast_ok, void* self, int column, int oldSize, int newSize); void QTreeWidget_protectedbase_columnCountChanged(bool* _dynamic_cast_ok, void* self, int oldCount, int newCount); void QTreeWidget_protectedbase_columnMoved(bool* _dynamic_cast_ok, void* self); diff --git a/qt/gen_qundostack.cpp b/qt/gen_qundostack.cpp index a479be35..3b9aa86c 100644 --- a/qt/gen_qundostack.cpp +++ b/qt/gen_qundostack.cpp @@ -717,7 +717,7 @@ QAction* QUndoStack_createRedoAction2(const QUndoStack* self, QObject* parent, s return self->createRedoAction(parent, prefix_QString); } -void QUndoStack_setActive1(QUndoStack* self, bool active) { +void QUndoStack_setActiveWithActive(QUndoStack* self, bool active) { self->setActive(active); } diff --git a/qt/gen_qundostack.go b/qt/gen_qundostack.go index 10548d4e..d2bb3e14 100644 --- a/qt/gen_qundostack.go +++ b/qt/gen_qundostack.go @@ -628,8 +628,8 @@ func (this *QUndoStack) CreateRedoAction2(parent *QObject, prefix string) *QActi return newQAction(C.QUndoStack_createRedoAction2(this.h, parent.cPointer(), prefix_ms)) } -func (this *QUndoStack) SetActive1(active bool) { - C.QUndoStack_setActive1(this.h, (C.bool)(active)) +func (this *QUndoStack) SetActiveWithActive(active bool) { + C.QUndoStack_setActiveWithActive(this.h, (C.bool)(active)) } // Sender can only be called from a QUndoStack that was directly constructed. diff --git a/qt/gen_qundostack.h b/qt/gen_qundostack.h index bf29f3b3..ff82612b 100644 --- a/qt/gen_qundostack.h +++ b/qt/gen_qundostack.h @@ -111,7 +111,7 @@ 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_setActiveWithActive(QUndoStack* self, bool active); bool QUndoStack_override_virtual_event(void* self, intptr_t slot); bool QUndoStack_virtualbase_event(void* self, QEvent* event); bool QUndoStack_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt/gen_qundoview.cpp b/qt/gen_qundoview.cpp index e4a5a07b..0d41fd06 100644 --- a/qt/gen_qundoview.cpp +++ b/qt/gen_qundoview.cpp @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include diff --git a/qt/gen_qurl.cpp b/qt/gen_qurl.cpp index 3c6f022f..037f337b 100644 --- a/qt/gen_qurl.cpp +++ b/qt/gen_qurl.cpp @@ -513,7 +513,7 @@ void QUrl_setAuthority2(QUrl* self, struct miqt_string authority, int mode) { self->setAuthority(authority_QString, static_cast(mode)); } -struct miqt_string QUrl_authority1(const QUrl* self, int options) { +struct miqt_string QUrl_authorityWithOptions(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(); @@ -529,7 +529,7 @@ void QUrl_setUserInfo2(QUrl* self, struct miqt_string userInfo, int mode) { self->setUserInfo(userInfo_QString, static_cast(mode)); } -struct miqt_string QUrl_userInfo1(const QUrl* self, int options) { +struct miqt_string QUrl_userInfoWithOptions(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(); @@ -545,7 +545,7 @@ void QUrl_setUserName2(QUrl* self, struct miqt_string userName, int mode) { self->setUserName(userName_QString, static_cast(mode)); } -struct miqt_string QUrl_userName1(const QUrl* self, int options) { +struct miqt_string QUrl_userNameWithOptions(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(); @@ -561,7 +561,7 @@ void QUrl_setPassword2(QUrl* self, struct miqt_string password, int mode) { self->setPassword(password_QString, static_cast(mode)); } -struct miqt_string QUrl_password1(const QUrl* self, int param1) { +struct miqt_string QUrl_passwordWithQUrlComponentFormattingOptions(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(); @@ -577,7 +577,7 @@ void QUrl_setHost2(QUrl* self, struct miqt_string host, int mode) { self->setHost(host_QString, static_cast(mode)); } -struct miqt_string QUrl_host1(const QUrl* self, int param1) { +struct miqt_string QUrl_hostWithQUrlComponentFormattingOptions(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(); @@ -588,7 +588,7 @@ struct miqt_string QUrl_host1(const QUrl* self, int param1) { return _ms; } -struct miqt_string QUrl_topLevelDomain1(const QUrl* self, int options) { +struct miqt_string QUrl_topLevelDomainWithOptions(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(); @@ -599,7 +599,7 @@ struct miqt_string QUrl_topLevelDomain1(const QUrl* self, int options) { return _ms; } -int QUrl_port1(const QUrl* self, int defaultPort) { +int QUrl_portWithDefaultPort(const QUrl* self, int defaultPort) { return self->port(static_cast(defaultPort)); } @@ -608,7 +608,7 @@ void QUrl_setPath2(QUrl* self, struct miqt_string path, int mode) { self->setPath(path_QString, static_cast(mode)); } -struct miqt_string QUrl_path1(const QUrl* self, int options) { +struct miqt_string QUrl_pathWithOptions(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(); @@ -619,7 +619,7 @@ struct miqt_string QUrl_path1(const QUrl* self, int options) { return _ms; } -struct miqt_string QUrl_fileName1(const QUrl* self, int options) { +struct miqt_string QUrl_fileNameWithOptions(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(); @@ -635,7 +635,7 @@ void QUrl_setQuery2(QUrl* self, struct miqt_string query, int mode) { self->setQuery(query_QString, static_cast(mode)); } -struct miqt_string QUrl_query1(const QUrl* self, int param1) { +struct miqt_string QUrl_queryWithQUrlComponentFormattingOptions(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(); @@ -646,7 +646,7 @@ struct miqt_string QUrl_query1(const QUrl* self, int param1) { return _ms; } -struct miqt_string QUrl_fragment1(const QUrl* self, int options) { +struct miqt_string QUrl_fragmentWithOptions(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(); diff --git a/qt/gen_qurl.go b/qt/gen_qurl.go index a92c997b..a0602b0e 100644 --- a/qt/gen_qurl.go +++ b/qt/gen_qurl.go @@ -616,8 +616,8 @@ func (this *QUrl) SetAuthority2(authority string, mode QUrl__ParsingMode) { 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)) +func (this *QUrl) AuthorityWithOptions(options QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_authorityWithOptions(this.h, (C.int)(options)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -631,8 +631,8 @@ func (this *QUrl) SetUserInfo2(userInfo string, mode QUrl__ParsingMode) { 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)) +func (this *QUrl) UserInfoWithOptions(options QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_userInfoWithOptions(this.h, (C.int)(options)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -646,8 +646,8 @@ func (this *QUrl) SetUserName2(userName string, mode QUrl__ParsingMode) { 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)) +func (this *QUrl) UserNameWithOptions(options QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_userNameWithOptions(this.h, (C.int)(options)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -661,8 +661,8 @@ func (this *QUrl) SetPassword2(password string, mode QUrl__ParsingMode) { 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)) +func (this *QUrl) PasswordWithQUrlComponentFormattingOptions(param1 QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_passwordWithQUrlComponentFormattingOptions(this.h, (C.int)(param1)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -676,22 +676,22 @@ func (this *QUrl) SetHost2(host string, mode QUrl__ParsingMode) { 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)) +func (this *QUrl) HostWithQUrlComponentFormattingOptions(param1 QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_hostWithQUrlComponentFormattingOptions(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)) +func (this *QUrl) TopLevelDomainWithOptions(options QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_topLevelDomainWithOptions(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) Port1(defaultPort int) int { - return (int)(C.QUrl_port1(this.h, (C.int)(defaultPort))) +func (this *QUrl) PortWithDefaultPort(defaultPort int) int { + return (int)(C.QUrl_portWithDefaultPort(this.h, (C.int)(defaultPort))) } func (this *QUrl) SetPath2(path string, mode QUrl__ParsingMode) { @@ -702,15 +702,15 @@ func (this *QUrl) SetPath2(path string, mode QUrl__ParsingMode) { 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)) +func (this *QUrl) PathWithOptions(options QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_pathWithOptions(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)) +func (this *QUrl) FileNameWithOptions(options QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_fileNameWithOptions(this.h, (C.int)(options)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -724,15 +724,15 @@ func (this *QUrl) SetQuery2(query string, mode QUrl__ParsingMode) { 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)) +func (this *QUrl) QueryWithQUrlComponentFormattingOptions(param1 QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_queryWithQUrlComponentFormattingOptions(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)) +func (this *QUrl) FragmentWithOptions(options QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_fragmentWithOptions(this.h, (C.int)(options)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret diff --git a/qt/gen_qurl.h b/qt/gen_qurl.h index 3f65f043..a4428cfe 100644 --- a/qt/gen_qurl.h +++ b/qt/gen_qurl.h @@ -89,23 +89,23 @@ 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); +struct miqt_string QUrl_authorityWithOptions(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); +struct miqt_string QUrl_userInfoWithOptions(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); +struct miqt_string QUrl_userNameWithOptions(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); +struct miqt_string QUrl_passwordWithQUrlComponentFormattingOptions(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); +struct miqt_string QUrl_hostWithQUrlComponentFormattingOptions(const QUrl* self, int param1); +struct miqt_string QUrl_topLevelDomainWithOptions(const QUrl* self, int options); +int QUrl_portWithDefaultPort(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); +struct miqt_string QUrl_pathWithOptions(const QUrl* self, int options); +struct miqt_string QUrl_fileNameWithOptions(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); +struct miqt_string QUrl_queryWithQUrlComponentFormattingOptions(const QUrl* self, int param1); +struct miqt_string QUrl_fragmentWithOptions(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); diff --git a/qt/gen_qurlquery.cpp b/qt/gen_qurlquery.cpp index 902541d4..4d9c7d2f 100644 --- a/qt/gen_qurlquery.cpp +++ b/qt/gen_qurlquery.cpp @@ -217,7 +217,7 @@ QChar* QUrlQuery_defaultQueryPairDelimiter() { return new QChar(QUrlQuery::defaultQueryPairDelimiter()); } -struct miqt_string QUrlQuery_query1(const QUrlQuery* self, int encoding) { +struct miqt_string QUrlQuery_queryWithEncoding(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(); @@ -228,7 +228,7 @@ struct miqt_string QUrlQuery_query1(const QUrlQuery* self, int encoding) { return _ms; } -struct miqt_string QUrlQuery_toString1(const QUrlQuery* self, int encoding) { +struct miqt_string QUrlQuery_toStringWithEncoding(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(); @@ -239,7 +239,7 @@ struct miqt_string QUrlQuery_toString1(const QUrlQuery* self, int encoding) { return _ms; } -struct miqt_array /* of struct miqt_map tuple of struct miqt_string and struct miqt_string */ QUrlQuery_queryItems1(const QUrlQuery* self, int encoding) { +struct miqt_array /* of struct miqt_map tuple of struct miqt_string and struct miqt_string */ QUrlQuery_queryItemsWithEncoding(const QUrlQuery* self, int encoding) { QList> _ret = self->queryItems(static_cast(encoding)); // Convert QList<> from C++ memory to manually-managed C memory struct miqt_map /* tuple of struct miqt_string and struct miqt_string */ * _arr = static_cast(malloc(sizeof(struct miqt_map /* tuple of struct miqt_string and struct miqt_string */ ) * _ret.length())); diff --git a/qt/gen_qurlquery.go b/qt/gen_qurlquery.go index 69e22fa1..55ba590d 100644 --- a/qt/gen_qurlquery.go +++ b/qt/gen_qurlquery.go @@ -277,25 +277,25 @@ func QUrlQuery_DefaultQueryPairDelimiter() *QChar { return _goptr } -func (this *QUrlQuery) Query1(encoding QUrl__ComponentFormattingOption) string { - var _ms C.struct_miqt_string = C.QUrlQuery_query1(this.h, (C.int)(encoding)) +func (this *QUrlQuery) QueryWithEncoding(encoding QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrlQuery_queryWithEncoding(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)) +func (this *QUrlQuery) ToStringWithEncoding(encoding QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrlQuery_toStringWithEncoding(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) QueryItems1(encoding QUrl__ComponentFormattingOption) []struct { +func (this *QUrlQuery) QueryItemsWithEncoding(encoding QUrl__ComponentFormattingOption) []struct { First string Second string } { - var _ma C.struct_miqt_array = C.QUrlQuery_queryItems1(this.h, (C.int)(encoding)) + var _ma C.struct_miqt_array = C.QUrlQuery_queryItemsWithEncoding(this.h, (C.int)(encoding)) _ret := make([]struct { First string Second string diff --git a/qt/gen_qurlquery.h b/qt/gen_qurlquery.h index d02ac3af..f2453900 100644 --- a/qt/gen_qurlquery.h +++ b/qt/gen_qurlquery.h @@ -51,9 +51,9 @@ struct miqt_array /* of struct miqt_string */ QUrlQuery_allQueryItemValues(cons 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_array /* of struct miqt_map tuple of struct miqt_string and struct miqt_string */ QUrlQuery_queryItems1(const QUrlQuery* self, int encoding); +struct miqt_string QUrlQuery_queryWithEncoding(const QUrlQuery* self, int encoding); +struct miqt_string QUrlQuery_toStringWithEncoding(const QUrlQuery* self, int encoding); +struct miqt_array /* of struct miqt_map tuple of struct miqt_string and struct miqt_string */ QUrlQuery_queryItemsWithEncoding(const QUrlQuery* self, int encoding); struct miqt_string QUrlQuery_queryItemValue2(const QUrlQuery* self, struct miqt_string key, int encoding); struct miqt_array /* of struct miqt_string */ QUrlQuery_allQueryItemValues2(const QUrlQuery* self, struct miqt_string key, int encoding); void QUrlQuery_delete(QUrlQuery* self); diff --git a/qt/gen_quuid.cpp b/qt/gen_quuid.cpp index d81c5e63..2d108980 100644 --- a/qt/gen_quuid.cpp +++ b/qt/gen_quuid.cpp @@ -18,7 +18,7 @@ QUuid* QUuid_new() { return new QUuid(); } -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_new2(unsigned int l, unsigned short w1, unsigned short 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) { 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)); } diff --git a/qt/gen_quuid.go b/qt/gen_quuid.go index 2bfbe4f5..3fac4f60 100644 --- a/qt/gen_quuid.go +++ b/qt/gen_quuid.go @@ -84,7 +84,7 @@ func NewQUuid() *QUuid { // NewQUuid2 constructs a new QUuid object. func NewQUuid2(l uint, w1 uint16, w2 uint16, b1 byte, b2 byte, b3 byte, b4 byte, b5 byte, b6 byte, b7 byte, b8 byte) *QUuid { - return newQUuid(C.QUuid_new2((C.uint)(l), (C.uint16_t)(w1), (C.uint16_t)(w2), (C.uchar)(b1), (C.uchar)(b2), (C.uchar)(b3), (C.uchar)(b4), (C.uchar)(b5), (C.uchar)(b6), (C.uchar)(b7), (C.uchar)(b8))) + return newQUuid(C.QUuid_new2((C.uint)(l), (C.ushort)(w1), (C.ushort)(w2), (C.uchar)(b1), (C.uchar)(b2), (C.uchar)(b3), (C.uchar)(b4), (C.uchar)(b5), (C.uchar)(b6), (C.uchar)(b7), (C.uchar)(b8))) } // NewQUuid3 constructs a new QUuid object. diff --git a/qt/gen_quuid.h b/qt/gen_quuid.h index c2c4562d..04ec9413 100644 --- a/qt/gen_quuid.h +++ b/qt/gen_quuid.h @@ -21,7 +21,7 @@ typedef struct QUuid QUuid; #endif 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_new2(unsigned int l, unsigned short w1, unsigned short 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_new4(const char* param1); QUuid* QUuid_new5(struct miqt_string param1); diff --git a/qt/gen_qvariant.cpp b/qt/gen_qvariant.cpp index 639d633f..3e1c6ebd 100644 --- a/qt/gen_qvariant.cpp +++ b/qt/gen_qvariant.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -246,6 +247,16 @@ QVariant* QVariant_new44(QPersistentModelIndex* modelIndex) { return new QVariant(*modelIndex); } +QVariant* QVariant_new45(struct miqt_array /* of QVariant* */ list) { + QList list_QList; + list_QList.reserve(list.len); + QVariant** list_arr = static_cast(list.data); + for(size_t i = 0; i < list.len; ++i) { + list_QList.push_back(*(list_arr[i])); + } + return new QVariant(list_QList); +} + void QVariant_operatorAssign(QVariant* self, QVariant* other) { self->operator=(*other); } @@ -391,6 +402,19 @@ QDateTime* QVariant_toDateTime(const QVariant* self) { return new QDateTime(self->toDateTime()); } +struct miqt_array /* of QVariant* */ QVariant_toList(const QVariant* self) { + QList _ret = self->toList(); + // Convert QList<> from C++ memory to manually-managed C memory + QVariant** _arr = static_cast(malloc(sizeof(QVariant*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = new QVariant(_ret[i]); + } + struct miqt_array _out; + _out.len = _ret.length(); + _out.data = static_cast(_arr); + return _out; +} + struct miqt_map /* of struct miqt_string to QVariant* */ QVariant_toMap(const QVariant* self) { QMap _ret = self->toMap(); // Convert QMap<> from C++ memory to manually-managed C memory @@ -574,34 +598,34 @@ bool QVariant_operatorGreaterOrEqual(const QVariant* self, QVariant* v) { return (*self >= *v); } -int QVariant_toInt1(const QVariant* self, bool* ok) { +int QVariant_toIntWithOk(const QVariant* self, bool* ok) { return self->toInt(ok); } -unsigned int QVariant_toUInt1(const QVariant* self, bool* ok) { +unsigned int QVariant_toUIntWithOk(const QVariant* self, bool* ok) { uint _ret = self->toUInt(ok); return static_cast(_ret); } -long long QVariant_toLongLong1(const QVariant* self, bool* ok) { +long long QVariant_toLongLongWithOk(const QVariant* self, bool* ok) { qlonglong _ret = self->toLongLong(ok); return static_cast(_ret); } -unsigned long long QVariant_toULongLong1(const QVariant* self, bool* ok) { +unsigned long long QVariant_toULongLongWithOk(const QVariant* self, bool* ok) { qulonglong _ret = self->toULongLong(ok); return static_cast(_ret); } -double QVariant_toDouble1(const QVariant* self, bool* ok) { +double QVariant_toDoubleWithOk(const QVariant* self, bool* ok) { return self->toDouble(ok); } -float QVariant_toFloat1(const QVariant* self, bool* ok) { +float QVariant_toFloatWithOk(const QVariant* self, bool* ok) { return self->toFloat(ok); } -double QVariant_toReal1(const QVariant* self, bool* ok) { +double QVariant_toRealWithOk(const QVariant* self, bool* ok) { qreal _ret = self->toReal(ok); return static_cast(_ret); } diff --git a/qt/gen_qvariant.go b/qt/gen_qvariant.go index 7feea82f..3e830fb5 100644 --- a/qt/gen_qvariant.go +++ b/qt/gen_qvariant.go @@ -436,6 +436,18 @@ func NewQVariant44(modelIndex *QPersistentModelIndex) *QVariant { return newQVariant(C.QVariant_new44(modelIndex.cPointer())) } +// NewQVariant45 constructs a new QVariant object. +func NewQVariant45(list []QVariant) *QVariant { + list_CArray := (*[0xffff]*C.QVariant)(C.malloc(C.size_t(8 * len(list)))) + defer C.free(unsafe.Pointer(list_CArray)) + for i := range list { + list_CArray[i] = list[i].cPointer() + } + list_ma := C.struct_miqt_array{len: C.size_t(len(list)), data: unsafe.Pointer(list_CArray)} + + return newQVariant(C.QVariant_new45(list_ma)) +} + func (this *QVariant) OperatorAssign(other *QVariant) { C.QVariant_operatorAssign(this.h, other.cPointer()) } @@ -574,6 +586,18 @@ func (this *QVariant) ToDateTime() *QDateTime { return _goptr } +func (this *QVariant) ToList() []QVariant { + var _ma C.struct_miqt_array = C.QVariant_toList(this.h) + _ret := make([]QVariant, int(_ma.len)) + _outCast := (*[0xffff]*C.QVariant)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _lv_goptr := newQVariant(_outCast[i]) + _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + _ret[i] = *_lv_goptr + } + return _ret +} + func (this *QVariant) ToMap() map[string]QVariant { var _mm C.struct_miqt_map = C.QVariant_toMap(this.h) _ret := make(map[string]QVariant, int(_mm.len)) @@ -787,32 +811,32 @@ func (this *QVariant) OperatorGreaterOrEqual(v *QVariant) bool { return (bool)(C.QVariant_operatorGreaterOrEqual(this.h, v.cPointer())) } -func (this *QVariant) ToInt1(ok *bool) int { - return (int)(C.QVariant_toInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToIntWithOk(ok *bool) int { + return (int)(C.QVariant_toIntWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QVariant) ToUInt1(ok *bool) uint { - return (uint)(C.QVariant_toUInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToUIntWithOk(ok *bool) uint { + return (uint)(C.QVariant_toUIntWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QVariant) ToLongLong1(ok *bool) int64 { - return (int64)(C.QVariant_toLongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToLongLongWithOk(ok *bool) int64 { + return (int64)(C.QVariant_toLongLongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QVariant) ToULongLong1(ok *bool) uint64 { - return (uint64)(C.QVariant_toULongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToULongLongWithOk(ok *bool) uint64 { + return (uint64)(C.QVariant_toULongLongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QVariant) ToDouble1(ok *bool) float64 { - return (float64)(C.QVariant_toDouble1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToDoubleWithOk(ok *bool) float64 { + return (float64)(C.QVariant_toDoubleWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QVariant) ToFloat1(ok *bool) float32 { - return (float32)(C.QVariant_toFloat1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToFloatWithOk(ok *bool) float32 { + return (float32)(C.QVariant_toFloatWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QVariant) ToReal1(ok *bool) float64 { - return (float64)(C.QVariant_toReal1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToRealWithOk(ok *bool) float64 { + return (float64)(C.QVariant_toRealWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } // Delete this object from C++ memory. diff --git a/qt/gen_qvariant.h b/qt/gen_qvariant.h index bc6f5978..9fee04d6 100644 --- a/qt/gen_qvariant.h +++ b/qt/gen_qvariant.h @@ -136,6 +136,7 @@ QVariant* QVariant_new41(QJsonArray* jsonArray); QVariant* QVariant_new42(QJsonDocument* jsonDocument); QVariant* QVariant_new43(QModelIndex* modelIndex); QVariant* QVariant_new44(QPersistentModelIndex* modelIndex); +QVariant* QVariant_new45(struct miqt_array /* of QVariant* */ list); void QVariant_operatorAssign(QVariant* self, QVariant* other); void QVariant_swap(QVariant* self, QVariant* other); int QVariant_type(const QVariant* self); @@ -164,6 +165,7 @@ QChar* QVariant_toChar(const QVariant* self); QDate* QVariant_toDate(const QVariant* self); QTime* QVariant_toTime(const QVariant* self); QDateTime* QVariant_toDateTime(const QVariant* self); +struct miqt_array /* of QVariant* */ QVariant_toList(const QVariant* self); struct miqt_map /* of struct miqt_string to QVariant* */ QVariant_toMap(const QVariant* self); struct miqt_map /* of struct miqt_string to QVariant* */ QVariant_toHash(const QVariant* self); QPoint* QVariant_toPoint(const QVariant* self); @@ -199,13 +201,13 @@ bool QVariant_operatorLesser(const QVariant* self, QVariant* v); bool QVariant_operatorLesserOrEqual(const QVariant* self, QVariant* v); bool QVariant_operatorGreater(const QVariant* self, QVariant* v); bool QVariant_operatorGreaterOrEqual(const QVariant* self, QVariant* v); -int QVariant_toInt1(const QVariant* self, bool* ok); -unsigned int QVariant_toUInt1(const QVariant* self, bool* ok); -long long QVariant_toLongLong1(const QVariant* self, bool* ok); -unsigned long long QVariant_toULongLong1(const QVariant* self, bool* ok); -double QVariant_toDouble1(const QVariant* self, bool* ok); -float QVariant_toFloat1(const QVariant* self, bool* ok); -double QVariant_toReal1(const QVariant* self, bool* ok); +int QVariant_toIntWithOk(const QVariant* self, bool* ok); +unsigned int QVariant_toUIntWithOk(const QVariant* self, bool* ok); +long long QVariant_toLongLongWithOk(const QVariant* self, bool* ok); +unsigned long long QVariant_toULongLongWithOk(const QVariant* self, bool* ok); +double QVariant_toDoubleWithOk(const QVariant* self, bool* ok); +float QVariant_toFloatWithOk(const QVariant* self, bool* ok); +double QVariant_toRealWithOk(const QVariant* self, bool* ok); void QVariant_delete(QVariant* self); QVariantComparisonHelper* QVariantComparisonHelper_new(QVariant* var); diff --git a/qt/gen_qvariantanimation.cpp b/qt/gen_qvariantanimation.cpp index c8c2ac8c..0441c091 100644 --- a/qt/gen_qvariantanimation.cpp +++ b/qt/gen_qvariantanimation.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include @@ -13,6 +12,7 @@ #include #include #include +#include #include #include "gen_qvariantanimation.h" diff --git a/qt/gen_qversionnumber.cpp b/qt/gen_qversionnumber.cpp index 6365efd5..f33fd9ca 100644 --- a/qt/gen_qversionnumber.cpp +++ b/qt/gen_qversionnumber.cpp @@ -1,7 +1,7 @@ -#include #include #include #include +#include #include #include #include "gen_qversionnumber.h" @@ -113,7 +113,7 @@ QVersionNumber* QVersionNumber_fromString(struct miqt_string string) { return new QVersionNumber(QVersionNumber::fromString(string_QString)); } -QVersionNumber* QVersionNumber_fromString22(struct miqt_string string, int* suffixIndex) { +QVersionNumber* QVersionNumber_fromString3(struct miqt_string string, int* suffixIndex) { QString string_QString = QString::fromUtf8(string.data, string.len); return new QVersionNumber(QVersionNumber::fromString(string_QString, static_cast(suffixIndex))); } diff --git a/qt/gen_qversionnumber.go b/qt/gen_qversionnumber.go index 031bb802..349aa356 100644 --- a/qt/gen_qversionnumber.go +++ b/qt/gen_qversionnumber.go @@ -156,12 +156,12 @@ func QVersionNumber_FromString(stringVal string) *QVersionNumber { return _goptr } -func QVersionNumber_FromString22(stringVal string, suffixIndex *int) *QVersionNumber { +func QVersionNumber_FromString3(stringVal string, suffixIndex *int) *QVersionNumber { 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)) - _goptr := newQVersionNumber(C.QVersionNumber_fromString22(stringVal_ms, (*C.int)(unsafe.Pointer(suffixIndex)))) + _goptr := newQVersionNumber(C.QVersionNumber_fromString3(stringVal_ms, (*C.int)(unsafe.Pointer(suffixIndex)))) _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 92ca2067..9c0be858 100644 --- a/qt/gen_qversionnumber.h +++ b/qt/gen_qversionnumber.h @@ -39,7 +39,7 @@ 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 string); -QVersionNumber* QVersionNumber_fromString22(struct miqt_string string, int* suffixIndex); +QVersionNumber* QVersionNumber_fromString3(struct miqt_string string, int* suffixIndex); void QVersionNumber_delete(QVersionNumber* self); #ifdef __cplusplus diff --git a/qt/gen_qwaitcondition.cpp b/qt/gen_qwaitcondition.cpp index 5030bd83..69da00a0 100644 --- a/qt/gen_qwaitcondition.cpp +++ b/qt/gen_qwaitcondition.cpp @@ -49,11 +49,11 @@ void QWaitCondition_notifyAll(QWaitCondition* self) { self->notify_all(); } -bool QWaitCondition_wait22(QWaitCondition* self, QMutex* lockedMutex, QDeadlineTimer* deadline) { +bool QWaitCondition_wait4(QWaitCondition* self, QMutex* lockedMutex, QDeadlineTimer* deadline) { return self->wait(lockedMutex, *deadline); } -bool QWaitCondition_wait23(QWaitCondition* self, QReadWriteLock* lockedReadWriteLock, QDeadlineTimer* deadline) { +bool QWaitCondition_wait5(QWaitCondition* self, QReadWriteLock* lockedReadWriteLock, QDeadlineTimer* deadline) { return self->wait(lockedReadWriteLock, *deadline); } diff --git a/qt/gen_qwaitcondition.go b/qt/gen_qwaitcondition.go index 2a330521..0e873816 100644 --- a/qt/gen_qwaitcondition.go +++ b/qt/gen_qwaitcondition.go @@ -83,12 +83,12 @@ func (this *QWaitCondition) NotifyAll() { C.QWaitCondition_notifyAll(this.h) } -func (this *QWaitCondition) Wait22(lockedMutex *QMutex, deadline QDeadlineTimer) bool { - return (bool)(C.QWaitCondition_wait22(this.h, lockedMutex.cPointer(), deadline.cPointer())) +func (this *QWaitCondition) Wait4(lockedMutex *QMutex, deadline QDeadlineTimer) bool { + return (bool)(C.QWaitCondition_wait4(this.h, lockedMutex.cPointer(), deadline.cPointer())) } -func (this *QWaitCondition) Wait23(lockedReadWriteLock *QReadWriteLock, deadline QDeadlineTimer) bool { - return (bool)(C.QWaitCondition_wait23(this.h, lockedReadWriteLock.cPointer(), deadline.cPointer())) +func (this *QWaitCondition) Wait5(lockedReadWriteLock *QReadWriteLock, deadline QDeadlineTimer) bool { + return (bool)(C.QWaitCondition_wait5(this.h, lockedReadWriteLock.cPointer(), deadline.cPointer())) } // Delete this object from C++ memory. diff --git a/qt/gen_qwaitcondition.h b/qt/gen_qwaitcondition.h index fe16a2b6..26f620f0 100644 --- a/qt/gen_qwaitcondition.h +++ b/qt/gen_qwaitcondition.h @@ -35,8 +35,8 @@ void QWaitCondition_wakeOne(QWaitCondition* self); void QWaitCondition_wakeAll(QWaitCondition* self); void QWaitCondition_notifyOne(QWaitCondition* self); void QWaitCondition_notifyAll(QWaitCondition* self); -bool QWaitCondition_wait22(QWaitCondition* self, QMutex* lockedMutex, QDeadlineTimer* deadline); -bool QWaitCondition_wait23(QWaitCondition* self, QReadWriteLock* lockedReadWriteLock, QDeadlineTimer* deadline); +bool QWaitCondition_wait4(QWaitCondition* self, QMutex* lockedMutex, QDeadlineTimer* deadline); +bool QWaitCondition_wait5(QWaitCondition* self, QReadWriteLock* lockedReadWriteLock, QDeadlineTimer* deadline); void QWaitCondition_delete(QWaitCondition* self); #ifdef __cplusplus diff --git a/qt/gen_qwhatsthis.cpp b/qt/gen_qwhatsthis.cpp index 74ec8b9c..7678805a 100644 --- a/qt/gen_qwhatsthis.cpp +++ b/qt/gen_qwhatsthis.cpp @@ -42,12 +42,12 @@ QAction* QWhatsThis_createAction() { return QWhatsThis::createAction(); } -void QWhatsThis_showText3(QPoint* pos, struct miqt_string text, QWidget* w) { +void QWhatsThis_showText2(QPoint* pos, struct miqt_string text, QWidget* w) { QString text_QString = QString::fromUtf8(text.data, text.len); QWhatsThis::showText(*pos, text_QString, w); } -QAction* QWhatsThis_createAction1(QObject* parent) { +QAction* QWhatsThis_createActionWithParent(QObject* parent) { return QWhatsThis::createAction(parent); } diff --git a/qt/gen_qwhatsthis.go b/qt/gen_qwhatsthis.go index 93ccc28a..2a645249 100644 --- a/qt/gen_qwhatsthis.go +++ b/qt/gen_qwhatsthis.go @@ -73,16 +73,16 @@ func QWhatsThis_CreateAction() *QAction { return newQAction(C.QWhatsThis_createAction()) } -func QWhatsThis_ShowText3(pos *QPoint, text string, w *QWidget) { +func QWhatsThis_ShowText2(pos *QPoint, text string, w *QWidget) { text_ms := C.struct_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()) + C.QWhatsThis_showText2(pos.cPointer(), text_ms, w.cPointer()) } -func QWhatsThis_CreateAction1(parent *QObject) *QAction { - return newQAction(C.QWhatsThis_createAction1(parent.cPointer())) +func QWhatsThis_CreateActionWithParent(parent *QObject) *QAction { + return newQAction(C.QWhatsThis_createActionWithParent(parent.cPointer())) } // Delete this object from C++ memory. diff --git a/qt/gen_qwhatsthis.h b/qt/gen_qwhatsthis.h index 9e8a1664..278880cc 100644 --- a/qt/gen_qwhatsthis.h +++ b/qt/gen_qwhatsthis.h @@ -34,8 +34,8 @@ void QWhatsThis_leaveWhatsThisMode(); 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); -QAction* QWhatsThis_createAction1(QObject* parent); +void QWhatsThis_showText2(QPoint* pos, struct miqt_string text, QWidget* w); +QAction* QWhatsThis_createActionWithParent(QObject* parent); void QWhatsThis_delete(QWhatsThis* self); #ifdef __cplusplus diff --git a/qt/gen_qwidget.cpp b/qt/gen_qwidget.cpp index 87d5bf42..1a9c1048 100644 --- a/qt/gen_qwidget.cpp +++ b/qt/gen_qwidget.cpp @@ -1033,10 +1033,10 @@ public: friend void QWidget_protectedbase_destroy(bool* _dynamic_cast_ok, void* self); friend bool QWidget_protectedbase_focusNextChild(bool* _dynamic_cast_ok, void* self); friend bool QWidget_protectedbase_focusPreviousChild(bool* _dynamic_cast_ok, void* self); - friend void QWidget_protectedbase_create1(bool* _dynamic_cast_ok, void* self, uintptr_t param1); + friend void QWidget_protectedbase_createWithWId(bool* _dynamic_cast_ok, void* self, uintptr_t param1); friend void QWidget_protectedbase_create2(bool* _dynamic_cast_ok, void* self, uintptr_t param1, bool initializeWindow); friend void QWidget_protectedbase_create3(bool* _dynamic_cast_ok, void* self, uintptr_t param1, bool initializeWindow, bool destroyOldWindow); - friend void QWidget_protectedbase_destroy1(bool* _dynamic_cast_ok, void* self, bool destroyWindow); + friend void QWidget_protectedbase_destroyWithDestroyWindow(bool* _dynamic_cast_ok, void* self, bool destroyWindow); friend void QWidget_protectedbase_destroy2(bool* _dynamic_cast_ok, void* self, bool destroyWindow, bool destroySubWindows); friend QObject* QWidget_protectedbase_sender(bool* _dynamic_cast_ok, const void* self); friend int QWidget_protectedbase_senderSignalIndex(bool* _dynamic_cast_ok, const void* self); @@ -2326,19 +2326,19 @@ void QWidget_render4(QWidget* self, QPaintDevice* target, QPoint* targetOffset, self->render(target, *targetOffset, *sourceRegion, static_cast(renderFlags)); } -void QWidget_render22(QWidget* self, QPainter* painter, QPoint* targetOffset) { +void QWidget_render5(QWidget* self, QPainter* painter, QPoint* targetOffset) { self->render(painter, *targetOffset); } -void QWidget_render32(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion) { +void QWidget_render6(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion) { self->render(painter, *targetOffset, *sourceRegion); } -void QWidget_render42(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion, int renderFlags) { +void QWidget_render7(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion, int renderFlags) { self->render(painter, *targetOffset, *sourceRegion, static_cast(renderFlags)); } -QPixmap* QWidget_grab1(QWidget* self, QRect* rectangle) { +QPixmap* QWidget_grabWithRectangle(QWidget* self, QRect* rectangle) { return new QPixmap(self->grab(*rectangle)); } @@ -3192,7 +3192,7 @@ bool QWidget_protectedbase_focusPreviousChild(bool* _dynamic_cast_ok, void* self } -void QWidget_protectedbase_create1(bool* _dynamic_cast_ok, void* self, uintptr_t param1) { +void QWidget_protectedbase_createWithWId(bool* _dynamic_cast_ok, void* self, uintptr_t param1) { MiqtVirtualQWidget* self_cast = dynamic_cast( (QWidget*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -3231,7 +3231,7 @@ void QWidget_protectedbase_create3(bool* _dynamic_cast_ok, void* self, uintptr_t } -void QWidget_protectedbase_destroy1(bool* _dynamic_cast_ok, void* self, bool destroyWindow) { +void QWidget_protectedbase_destroyWithDestroyWindow(bool* _dynamic_cast_ok, void* self, bool destroyWindow) { MiqtVirtualQWidget* self_cast = dynamic_cast( (QWidget*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt/gen_qwidget.go b/qt/gen_qwidget.go index e8ba6a71..c437edb0 100644 --- a/qt/gen_qwidget.go +++ b/qt/gen_qwidget.go @@ -1463,20 +1463,20 @@ func (this *QWidget) Render4(target *QPaintDevice, targetOffset *QPoint, sourceR C.QWidget_render4(this.h, target.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer(), (C.int)(renderFlags)) } -func (this *QWidget) Render22(painter *QPainter, targetOffset *QPoint) { - C.QWidget_render22(this.h, painter.cPointer(), targetOffset.cPointer()) +func (this *QWidget) Render5(painter *QPainter, targetOffset *QPoint) { + C.QWidget_render5(this.h, painter.cPointer(), targetOffset.cPointer()) } -func (this *QWidget) Render32(painter *QPainter, targetOffset *QPoint, sourceRegion *QRegion) { - C.QWidget_render32(this.h, painter.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer()) +func (this *QWidget) Render6(painter *QPainter, targetOffset *QPoint, sourceRegion *QRegion) { + C.QWidget_render6(this.h, painter.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer()) } -func (this *QWidget) Render42(painter *QPainter, targetOffset *QPoint, sourceRegion *QRegion, renderFlags QWidget__RenderFlag) { - C.QWidget_render42(this.h, painter.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer(), (C.int)(renderFlags)) +func (this *QWidget) Render7(painter *QPainter, targetOffset *QPoint, sourceRegion *QRegion, renderFlags QWidget__RenderFlag) { + C.QWidget_render7(this.h, painter.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer(), (C.int)(renderFlags)) } -func (this *QWidget) Grab1(rectangle *QRect) *QPixmap { - _goptr := newQPixmap(C.QWidget_grab1(this.h, rectangle.cPointer())) +func (this *QWidget) GrabWithRectangle(rectangle *QRect) *QPixmap { + _goptr := newQPixmap(C.QWidget_grabWithRectangle(this.h, rectangle.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1577,11 +1577,11 @@ func (this *QWidget) FocusPreviousChild() bool { } -// Create1 can only be called from a QWidget that was directly constructed. -func (this *QWidget) Create1(param1 uintptr) { +// CreateWithWId can only be called from a QWidget that was directly constructed. +func (this *QWidget) CreateWithWId(param1 uintptr) { var _dynamic_cast_ok C.bool = false - C.QWidget_protectedbase_create1(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uintptr_t)(param1)) + C.QWidget_protectedbase_createWithWId(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uintptr_t)(param1)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -1613,11 +1613,11 @@ func (this *QWidget) Create3(param1 uintptr, initializeWindow bool, destroyOldWi } -// Destroy1 can only be called from a QWidget that was directly constructed. -func (this *QWidget) Destroy1(destroyWindow bool) { +// DestroyWithDestroyWindow can only be called from a QWidget that was directly constructed. +func (this *QWidget) DestroyWithDestroyWindow(destroyWindow bool) { var _dynamic_cast_ok C.bool = false - C.QWidget_protectedbase_destroy1(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.bool)(destroyWindow)) + C.QWidget_protectedbase_destroyWithDestroyWindow(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.bool)(destroyWindow)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") diff --git a/qt/gen_qwidget.h b/qt/gen_qwidget.h index 4e6f109b..b997051b 100644 --- a/qt/gen_qwidget.h +++ b/qt/gen_qwidget.h @@ -433,10 +433,10 @@ 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); -void QWidget_render22(QWidget* self, QPainter* painter, QPoint* targetOffset); -void QWidget_render32(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion); -void QWidget_render42(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion, int renderFlags); -QPixmap* QWidget_grab1(QWidget* self, QRect* rectangle); +void QWidget_render5(QWidget* self, QPainter* painter, QPoint* targetOffset); +void QWidget_render6(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion); +void QWidget_render7(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion, int renderFlags); +QPixmap* QWidget_grabWithRectangle(QWidget* self, QRect* rectangle); void QWidget_grabGesture2(QWidget* self, int type, int flags); int QWidget_grabShortcut2(QWidget* self, QKeySequence* key, int context); void QWidget_setShortcutEnabled2(QWidget* self, int id, bool enable); @@ -544,10 +544,10 @@ void QWidget_protectedbase_create(bool* _dynamic_cast_ok, void* self); void QWidget_protectedbase_destroy(bool* _dynamic_cast_ok, void* self); bool QWidget_protectedbase_focusNextChild(bool* _dynamic_cast_ok, void* self); bool QWidget_protectedbase_focusPreviousChild(bool* _dynamic_cast_ok, void* self); -void QWidget_protectedbase_create1(bool* _dynamic_cast_ok, void* self, uintptr_t param1); +void QWidget_protectedbase_createWithWId(bool* _dynamic_cast_ok, void* self, uintptr_t param1); void QWidget_protectedbase_create2(bool* _dynamic_cast_ok, void* self, uintptr_t param1, bool initializeWindow); void QWidget_protectedbase_create3(bool* _dynamic_cast_ok, void* self, uintptr_t param1, bool initializeWindow, bool destroyOldWindow); -void QWidget_protectedbase_destroy1(bool* _dynamic_cast_ok, void* self, bool destroyWindow); +void QWidget_protectedbase_destroyWithDestroyWindow(bool* _dynamic_cast_ok, void* self, bool destroyWindow); void QWidget_protectedbase_destroy2(bool* _dynamic_cast_ok, void* self, bool destroyWindow, bool destroySubWindows); QObject* QWidget_protectedbase_sender(bool* _dynamic_cast_ok, const void* self); int QWidget_protectedbase_senderSignalIndex(bool* _dynamic_cast_ok, const void* self); diff --git a/qt/gen_qwizard.cpp b/qt/gen_qwizard.cpp index 192980f4..afaab908 100644 --- a/qt/gen_qwizard.cpp +++ b/qt/gen_qwizard.cpp @@ -3612,8 +3612,8 @@ public: friend QVariant* QWizardPage_protectedbase_field(bool* _dynamic_cast_ok, const void* self, struct miqt_string name); friend void QWizardPage_protectedbase_registerField(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget); friend QWizard* QWizardPage_protectedbase_wizard(bool* _dynamic_cast_ok, const void* self); - friend void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property); - friend void QWizardPage_protectedbase_registerField4(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property, const char* changedSignal); + friend void QWizardPage_protectedbase_registerField2(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property); + friend void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property, const char* changedSignal); friend void QWizardPage_protectedbase_updateMicroFocus(bool* _dynamic_cast_ok, void* self); friend void QWizardPage_protectedbase_create(bool* _dynamic_cast_ok, void* self); friend void QWizardPage_protectedbase_destroy(bool* _dynamic_cast_ok, void* self); @@ -4701,7 +4701,7 @@ QWizard* QWizardPage_protectedbase_wizard(bool* _dynamic_cast_ok, const void* se } -void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property) { +void QWizardPage_protectedbase_registerField2(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property) { MiqtVirtualQWizardPage* self_cast = dynamic_cast( (QWizardPage*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -4715,7 +4715,7 @@ void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self } -void QWizardPage_protectedbase_registerField4(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property, const char* changedSignal) { +void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property, const char* changedSignal) { MiqtVirtualQWizardPage* self_cast = dynamic_cast( (QWizardPage*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt/gen_qwizard.go b/qt/gen_qwizard.go index d8aa6ae5..e2ea77b3 100644 --- a/qt/gen_qwizard.go +++ b/qt/gen_qwizard.go @@ -2433,8 +2433,8 @@ func (this *QWizardPage) Wizard() *QWizard { } -// RegisterField3 can only be called from a QWizardPage that was directly constructed. -func (this *QWizardPage) RegisterField3(name string, widget *QWidget, property string) { +// RegisterField2 can only be called from a QWizardPage that was directly constructed. +func (this *QWizardPage) RegisterField2(name string, widget *QWidget, property string) { name_ms := C.struct_miqt_string{} name_ms.data = C.CString(name) name_ms.len = C.size_t(len(name)) @@ -2443,7 +2443,7 @@ func (this *QWizardPage) RegisterField3(name string, widget *QWidget, property s defer C.free(unsafe.Pointer(property_Cstring)) var _dynamic_cast_ok C.bool = false - C.QWizardPage_protectedbase_registerField3(&_dynamic_cast_ok, unsafe.Pointer(this.h), name_ms, widget.cPointer(), property_Cstring) + C.QWizardPage_protectedbase_registerField2(&_dynamic_cast_ok, unsafe.Pointer(this.h), name_ms, widget.cPointer(), property_Cstring) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -2451,8 +2451,8 @@ func (this *QWizardPage) RegisterField3(name string, widget *QWidget, property s } -// RegisterField4 can only be called from a QWizardPage that was directly constructed. -func (this *QWizardPage) RegisterField4(name string, widget *QWidget, property string, changedSignal string) { +// RegisterField3 can only be called from a QWizardPage that was directly constructed. +func (this *QWizardPage) RegisterField3(name string, widget *QWidget, property string, changedSignal string) { name_ms := C.struct_miqt_string{} name_ms.data = C.CString(name) name_ms.len = C.size_t(len(name)) @@ -2463,7 +2463,7 @@ func (this *QWizardPage) RegisterField4(name string, widget *QWidget, property s defer C.free(unsafe.Pointer(changedSignal_Cstring)) var _dynamic_cast_ok C.bool = false - C.QWizardPage_protectedbase_registerField4(&_dynamic_cast_ok, unsafe.Pointer(this.h), name_ms, widget.cPointer(), property_Cstring, changedSignal_Cstring) + C.QWizardPage_protectedbase_registerField3(&_dynamic_cast_ok, unsafe.Pointer(this.h), name_ms, widget.cPointer(), property_Cstring, changedSignal_Cstring) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") diff --git a/qt/gen_qwizard.h b/qt/gen_qwizard.h index 2b9fe7ab..0117304a 100644 --- a/qt/gen_qwizard.h +++ b/qt/gen_qwizard.h @@ -422,8 +422,8 @@ void QWizardPage_protectedbase_setField(bool* _dynamic_cast_ok, void* self, stru QVariant* QWizardPage_protectedbase_field(bool* _dynamic_cast_ok, const void* self, struct miqt_string name); void QWizardPage_protectedbase_registerField(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget); QWizard* QWizardPage_protectedbase_wizard(bool* _dynamic_cast_ok, const void* self); -void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property); -void QWizardPage_protectedbase_registerField4(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property, const char* changedSignal); +void QWizardPage_protectedbase_registerField2(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property); +void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property, const char* changedSignal); void QWizardPage_protectedbase_updateMicroFocus(bool* _dynamic_cast_ok, void* self); void QWizardPage_protectedbase_create(bool* _dynamic_cast_ok, void* self); void QWizardPage_protectedbase_destroy(bool* _dynamic_cast_ok, void* self); diff --git a/qt/gen_qxmlstream.cpp b/qt/gen_qxmlstream.cpp index 1f7f40ad..637ff16b 100644 --- a/qt/gen_qxmlstream.cpp +++ b/qt/gen_qxmlstream.cpp @@ -1,10 +1,10 @@ #include #include -#include #include #include #include #include +#include #include #include #include @@ -476,7 +476,7 @@ QXmlStreamEntityResolver* QXmlStreamReader_entityResolver(const QXmlStreamReader return self->entityResolver(); } -struct miqt_string QXmlStreamReader_readElementText1(QXmlStreamReader* self, int behaviour) { +struct miqt_string QXmlStreamReader_readElementTextWithBehaviour(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(); @@ -487,7 +487,7 @@ struct miqt_string QXmlStreamReader_readElementText1(QXmlStreamReader* self, int return _ms; } -void QXmlStreamReader_raiseError1(QXmlStreamReader* self, struct miqt_string message) { +void QXmlStreamReader_raiseErrorWithMessage(QXmlStreamReader* self, struct miqt_string message) { QString message_QString = QString::fromUtf8(message.data, message.len); self->raiseError(message_QString); } diff --git a/qt/gen_qxmlstream.go b/qt/gen_qxmlstream.go index d37b06c0..35f2e7f6 100644 --- a/qt/gen_qxmlstream.go +++ b/qt/gen_qxmlstream.go @@ -843,19 +843,19 @@ func (this *QXmlStreamReader) EntityResolver() *QXmlStreamEntityResolver { return newQXmlStreamEntityResolver(C.QXmlStreamReader_entityResolver(this.h)) } -func (this *QXmlStreamReader) ReadElementText1(behaviour QXmlStreamReader__ReadElementTextBehaviour) string { - var _ms C.struct_miqt_string = C.QXmlStreamReader_readElementText1(this.h, (C.int)(behaviour)) +func (this *QXmlStreamReader) ReadElementTextWithBehaviour(behaviour QXmlStreamReader__ReadElementTextBehaviour) string { + var _ms C.struct_miqt_string = C.QXmlStreamReader_readElementTextWithBehaviour(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) { +func (this *QXmlStreamReader) RaiseErrorWithMessage(message string) { 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) + C.QXmlStreamReader_raiseErrorWithMessage(this.h, message_ms) } // Delete this object from C++ memory. diff --git a/qt/gen_qxmlstream.h b/qt/gen_qxmlstream.h index 49a27b41..0af51a86 100644 --- a/qt/gen_qxmlstream.h +++ b/qt/gen_qxmlstream.h @@ -133,8 +133,8 @@ 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_readElementTextWithBehaviour(QXmlStreamReader* self, int behaviour); +void QXmlStreamReader_raiseErrorWithMessage(QXmlStreamReader* self, struct miqt_string message); void QXmlStreamReader_delete(QXmlStreamReader* self); QXmlStreamWriter* QXmlStreamWriter_new(); diff --git a/qt/multimedia/gen_qcamera.cpp b/qt/multimedia/gen_qcamera.cpp index 0706f136..4aa17f5c 100644 --- a/qt/multimedia/gen_qcamera.cpp +++ b/qt/multimedia/gen_qcamera.cpp @@ -734,7 +734,7 @@ struct miqt_string QCamera_trUtf83(const char* s, const char* c, int n) { return _ms; } -struct miqt_array /* of QCameraViewfinderSettings* */ QCamera_supportedViewfinderSettings1(const QCamera* self, QCameraViewfinderSettings* settings) { +struct miqt_array /* of QCameraViewfinderSettings* */ QCamera_supportedViewfinderSettingsWithSettings(const QCamera* self, QCameraViewfinderSettings* settings) { QList _ret = self->supportedViewfinderSettings(*settings); // Convert QList<> from C++ memory to manually-managed C memory QCameraViewfinderSettings** _arr = static_cast(malloc(sizeof(QCameraViewfinderSettings*) * _ret.length())); @@ -747,7 +747,7 @@ struct miqt_array /* of QCameraViewfinderSettings* */ QCamera_supportedViewfind return _out; } -struct miqt_array /* of QSize* */ QCamera_supportedViewfinderResolutions1(const QCamera* self, QCameraViewfinderSettings* settings) { +struct miqt_array /* of QSize* */ QCamera_supportedViewfinderResolutionsWithSettings(const QCamera* self, QCameraViewfinderSettings* settings) { QList _ret = self->supportedViewfinderResolutions(*settings); // Convert QList<> from C++ memory to manually-managed C memory QSize** _arr = static_cast(malloc(sizeof(QSize*) * _ret.length())); @@ -760,7 +760,7 @@ struct miqt_array /* of QSize* */ QCamera_supportedViewfinderResolutions1(const return _out; } -struct miqt_array /* of QCamera__FrameRateRange* */ QCamera_supportedViewfinderFrameRateRanges1(const QCamera* self, QCameraViewfinderSettings* settings) { +struct miqt_array /* of QCamera__FrameRateRange* */ QCamera_supportedViewfinderFrameRateRangesWithSettings(const QCamera* self, QCameraViewfinderSettings* settings) { QList _ret = self->supportedViewfinderFrameRateRanges(*settings); // Convert QList<> from C++ memory to manually-managed C memory QCamera__FrameRateRange** _arr = static_cast(malloc(sizeof(QCamera__FrameRateRange*) * _ret.length())); @@ -773,7 +773,7 @@ struct miqt_array /* of QCamera__FrameRateRange* */ QCamera_supportedViewfinder return _out; } -struct miqt_array /* of int */ QCamera_supportedViewfinderPixelFormats1(const QCamera* self, QCameraViewfinderSettings* settings) { +struct miqt_array /* of int */ QCamera_supportedViewfinderPixelFormatsWithSettings(const QCamera* self, QCameraViewfinderSettings* settings) { QList _ret = self->supportedViewfinderPixelFormats(*settings); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); diff --git a/qt/multimedia/gen_qcamera.go b/qt/multimedia/gen_qcamera.go index 5d91c8fc..300908e4 100644 --- a/qt/multimedia/gen_qcamera.go +++ b/qt/multimedia/gen_qcamera.go @@ -630,8 +630,8 @@ func QCamera_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QCamera) SupportedViewfinderSettings1(settings *QCameraViewfinderSettings) []QCameraViewfinderSettings { - var _ma C.struct_miqt_array = C.QCamera_supportedViewfinderSettings1(this.h, settings.cPointer()) +func (this *QCamera) SupportedViewfinderSettingsWithSettings(settings *QCameraViewfinderSettings) []QCameraViewfinderSettings { + var _ma C.struct_miqt_array = C.QCamera_supportedViewfinderSettingsWithSettings(this.h, settings.cPointer()) _ret := make([]QCameraViewfinderSettings, int(_ma.len)) _outCast := (*[0xffff]*C.QCameraViewfinderSettings)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -642,8 +642,8 @@ func (this *QCamera) SupportedViewfinderSettings1(settings *QCameraViewfinderSet return _ret } -func (this *QCamera) SupportedViewfinderResolutions1(settings *QCameraViewfinderSettings) []qt.QSize { - var _ma C.struct_miqt_array = C.QCamera_supportedViewfinderResolutions1(this.h, settings.cPointer()) +func (this *QCamera) SupportedViewfinderResolutionsWithSettings(settings *QCameraViewfinderSettings) []qt.QSize { + var _ma C.struct_miqt_array = C.QCamera_supportedViewfinderResolutionsWithSettings(this.h, settings.cPointer()) _ret := make([]qt.QSize, int(_ma.len)) _outCast := (*[0xffff]*C.QSize)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -654,8 +654,8 @@ func (this *QCamera) SupportedViewfinderResolutions1(settings *QCameraViewfinder return _ret } -func (this *QCamera) SupportedViewfinderFrameRateRanges1(settings *QCameraViewfinderSettings) []QCamera__FrameRateRange { - var _ma C.struct_miqt_array = C.QCamera_supportedViewfinderFrameRateRanges1(this.h, settings.cPointer()) +func (this *QCamera) SupportedViewfinderFrameRateRangesWithSettings(settings *QCameraViewfinderSettings) []QCamera__FrameRateRange { + var _ma C.struct_miqt_array = C.QCamera_supportedViewfinderFrameRateRangesWithSettings(this.h, settings.cPointer()) _ret := make([]QCamera__FrameRateRange, int(_ma.len)) _outCast := (*[0xffff]*C.QCamera__FrameRateRange)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -666,8 +666,8 @@ func (this *QCamera) SupportedViewfinderFrameRateRanges1(settings *QCameraViewfi return _ret } -func (this *QCamera) SupportedViewfinderPixelFormats1(settings *QCameraViewfinderSettings) []QVideoFrame__PixelFormat { - var _ma C.struct_miqt_array = C.QCamera_supportedViewfinderPixelFormats1(this.h, settings.cPointer()) +func (this *QCamera) SupportedViewfinderPixelFormatsWithSettings(settings *QCameraViewfinderSettings) []QVideoFrame__PixelFormat { + var _ma C.struct_miqt_array = C.QCamera_supportedViewfinderPixelFormatsWithSettings(this.h, settings.cPointer()) _ret := make([]QVideoFrame__PixelFormat, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/multimedia/gen_qcamera.h b/qt/multimedia/gen_qcamera.h index 7c534043..5e8e4320 100644 --- a/qt/multimedia/gen_qcamera.h +++ b/qt/multimedia/gen_qcamera.h @@ -129,10 +129,10 @@ struct miqt_string QCamera_tr2(const char* s, const char* c); struct miqt_string QCamera_tr3(const char* s, const char* c, int n); struct miqt_string QCamera_trUtf82(const char* s, const char* c); struct miqt_string QCamera_trUtf83(const char* s, const char* c, int n); -struct miqt_array /* of QCameraViewfinderSettings* */ QCamera_supportedViewfinderSettings1(const QCamera* self, QCameraViewfinderSettings* settings); -struct miqt_array /* of QSize* */ QCamera_supportedViewfinderResolutions1(const QCamera* self, QCameraViewfinderSettings* settings); -struct miqt_array /* of QCamera__FrameRateRange* */ QCamera_supportedViewfinderFrameRateRanges1(const QCamera* self, QCameraViewfinderSettings* settings); -struct miqt_array /* of int */ QCamera_supportedViewfinderPixelFormats1(const QCamera* self, QCameraViewfinderSettings* settings); +struct miqt_array /* of QCameraViewfinderSettings* */ QCamera_supportedViewfinderSettingsWithSettings(const QCamera* self, QCameraViewfinderSettings* settings); +struct miqt_array /* of QSize* */ QCamera_supportedViewfinderResolutionsWithSettings(const QCamera* self, QCameraViewfinderSettings* settings); +struct miqt_array /* of QCamera__FrameRateRange* */ QCamera_supportedViewfinderFrameRateRangesWithSettings(const QCamera* self, QCameraViewfinderSettings* settings); +struct miqt_array /* of int */ QCamera_supportedViewfinderPixelFormatsWithSettings(const QCamera* self, QCameraViewfinderSettings* settings); bool QCamera_override_virtual_availability(void* self, intptr_t slot); int QCamera_virtualbase_availability(const void* self); bool QCamera_override_virtual_isAvailable(void* self, intptr_t slot); diff --git a/qt/multimedia/gen_qcameraexposure.cpp b/qt/multimedia/gen_qcameraexposure.cpp index 8224b975..5d3bbbe7 100644 --- a/qt/multimedia/gen_qcameraexposure.cpp +++ b/qt/multimedia/gen_qcameraexposure.cpp @@ -336,7 +336,7 @@ struct miqt_string QCameraExposure_trUtf83(const char* s, const char* c, int n) return _ms; } -struct miqt_array /* of int */ QCameraExposure_supportedIsoSensitivities1(const QCameraExposure* self, bool* continuous) { +struct miqt_array /* of int */ QCameraExposure_supportedIsoSensitivitiesWithContinuous(const QCameraExposure* self, bool* continuous) { QList _ret = self->supportedIsoSensitivities(continuous); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); @@ -349,7 +349,7 @@ struct miqt_array /* of int */ QCameraExposure_supportedIsoSensitivities1(const return _out; } -struct miqt_array /* of double */ QCameraExposure_supportedApertures1(const QCameraExposure* self, bool* continuous) { +struct miqt_array /* of double */ QCameraExposure_supportedAperturesWithContinuous(const QCameraExposure* self, bool* continuous) { QList _ret = self->supportedApertures(continuous); // Convert QList<> from C++ memory to manually-managed C memory double* _arr = static_cast(malloc(sizeof(double) * _ret.length())); @@ -362,7 +362,7 @@ struct miqt_array /* of double */ QCameraExposure_supportedApertures1(const QCa return _out; } -struct miqt_array /* of double */ QCameraExposure_supportedShutterSpeeds1(const QCameraExposure* self, bool* continuous) { +struct miqt_array /* of double */ QCameraExposure_supportedShutterSpeedsWithContinuous(const QCameraExposure* self, bool* continuous) { QList _ret = self->supportedShutterSpeeds(continuous); // Convert QList<> from C++ memory to manually-managed C memory double* _arr = static_cast(malloc(sizeof(double) * _ret.length())); diff --git a/qt/multimedia/gen_qcameraexposure.go b/qt/multimedia/gen_qcameraexposure.go index 336d49ad..8d5d7839 100644 --- a/qt/multimedia/gen_qcameraexposure.go +++ b/qt/multimedia/gen_qcameraexposure.go @@ -446,8 +446,8 @@ func QCameraExposure_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QCameraExposure) SupportedIsoSensitivities1(continuous *bool) []int { - var _ma C.struct_miqt_array = C.QCameraExposure_supportedIsoSensitivities1(this.h, (*C.bool)(unsafe.Pointer(continuous))) +func (this *QCameraExposure) SupportedIsoSensitivitiesWithContinuous(continuous *bool) []int { + var _ma C.struct_miqt_array = C.QCameraExposure_supportedIsoSensitivitiesWithContinuous(this.h, (*C.bool)(unsafe.Pointer(continuous))) _ret := make([]int, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -456,8 +456,8 @@ func (this *QCameraExposure) SupportedIsoSensitivities1(continuous *bool) []int return _ret } -func (this *QCameraExposure) SupportedApertures1(continuous *bool) []float64 { - var _ma C.struct_miqt_array = C.QCameraExposure_supportedApertures1(this.h, (*C.bool)(unsafe.Pointer(continuous))) +func (this *QCameraExposure) SupportedAperturesWithContinuous(continuous *bool) []float64 { + var _ma C.struct_miqt_array = C.QCameraExposure_supportedAperturesWithContinuous(this.h, (*C.bool)(unsafe.Pointer(continuous))) _ret := make([]float64, int(_ma.len)) _outCast := (*[0xffff]C.double)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -466,8 +466,8 @@ func (this *QCameraExposure) SupportedApertures1(continuous *bool) []float64 { return _ret } -func (this *QCameraExposure) SupportedShutterSpeeds1(continuous *bool) []float64 { - var _ma C.struct_miqt_array = C.QCameraExposure_supportedShutterSpeeds1(this.h, (*C.bool)(unsafe.Pointer(continuous))) +func (this *QCameraExposure) SupportedShutterSpeedsWithContinuous(continuous *bool) []float64 { + var _ma C.struct_miqt_array = C.QCameraExposure_supportedShutterSpeedsWithContinuous(this.h, (*C.bool)(unsafe.Pointer(continuous))) _ret := make([]float64, int(_ma.len)) _outCast := (*[0xffff]C.double)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/multimedia/gen_qcameraexposure.h b/qt/multimedia/gen_qcameraexposure.h index 8df91d80..59a13803 100644 --- a/qt/multimedia/gen_qcameraexposure.h +++ b/qt/multimedia/gen_qcameraexposure.h @@ -81,9 +81,9 @@ struct miqt_string QCameraExposure_tr2(const char* s, const char* c); struct miqt_string QCameraExposure_tr3(const char* s, const char* c, int n); struct miqt_string QCameraExposure_trUtf82(const char* s, const char* c); struct miqt_string QCameraExposure_trUtf83(const char* s, const char* c, int n); -struct miqt_array /* of int */ QCameraExposure_supportedIsoSensitivities1(const QCameraExposure* self, bool* continuous); -struct miqt_array /* of double */ QCameraExposure_supportedApertures1(const QCameraExposure* self, bool* continuous); -struct miqt_array /* of double */ QCameraExposure_supportedShutterSpeeds1(const QCameraExposure* self, bool* continuous); +struct miqt_array /* of int */ QCameraExposure_supportedIsoSensitivitiesWithContinuous(const QCameraExposure* self, bool* continuous); +struct miqt_array /* of double */ QCameraExposure_supportedAperturesWithContinuous(const QCameraExposure* self, bool* continuous); +struct miqt_array /* of double */ QCameraExposure_supportedShutterSpeedsWithContinuous(const QCameraExposure* self, bool* continuous); #ifdef __cplusplus } /* extern C */ diff --git a/qt/multimedia/gen_qcameraexposurecontrol.cpp b/qt/multimedia/gen_qcameraexposurecontrol.cpp index 5560818c..2cd4ae68 100644 --- a/qt/multimedia/gen_qcameraexposurecontrol.cpp +++ b/qt/multimedia/gen_qcameraexposurecontrol.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -59,6 +60,19 @@ bool QCameraExposureControl_isParameterSupported(const QCameraExposureControl* s return self->isParameterSupported(static_cast(parameter)); } +struct miqt_array /* of QVariant* */ QCameraExposureControl_supportedParameterRange(const QCameraExposureControl* self, int parameter, bool* continuous) { + QVariantList _ret = self->supportedParameterRange(static_cast(parameter), continuous); + // Convert QList<> from C++ memory to manually-managed C memory + QVariant** _arr = static_cast(malloc(sizeof(QVariant*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = new QVariant(_ret[i]); + } + struct miqt_array _out; + _out.len = _ret.length(); + _out.data = static_cast(_arr); + return _out; +} + QVariant* QCameraExposureControl_requestedValue(const QCameraExposureControl* self, int parameter) { return new QVariant(self->requestedValue(static_cast(parameter))); } diff --git a/qt/multimedia/gen_qcameraexposurecontrol.go b/qt/multimedia/gen_qcameraexposurecontrol.go index 43f5e73b..040323f4 100644 --- a/qt/multimedia/gen_qcameraexposurecontrol.go +++ b/qt/multimedia/gen_qcameraexposurecontrol.go @@ -99,6 +99,18 @@ func (this *QCameraExposureControl) IsParameterSupported(parameter QCameraExposu return (bool)(C.QCameraExposureControl_isParameterSupported(this.h, (C.int)(parameter))) } +func (this *QCameraExposureControl) SupportedParameterRange(parameter QCameraExposureControl__ExposureParameter, continuous *bool) []qt.QVariant { + var _ma C.struct_miqt_array = C.QCameraExposureControl_supportedParameterRange(this.h, (C.int)(parameter), (*C.bool)(unsafe.Pointer(continuous))) + _ret := make([]qt.QVariant, int(_ma.len)) + _outCast := (*[0xffff]*C.QVariant)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _lv_goptr := qt.UnsafeNewQVariant(unsafe.Pointer(_outCast[i])) + _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + _ret[i] = *_lv_goptr + } + return _ret +} + func (this *QCameraExposureControl) RequestedValue(parameter QCameraExposureControl__ExposureParameter) *qt.QVariant { _goptr := qt.UnsafeNewQVariant(unsafe.Pointer(C.QCameraExposureControl_requestedValue(this.h, (C.int)(parameter)))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer diff --git a/qt/multimedia/gen_qcameraexposurecontrol.h b/qt/multimedia/gen_qcameraexposurecontrol.h index 44117b56..f71c2e18 100644 --- a/qt/multimedia/gen_qcameraexposurecontrol.h +++ b/qt/multimedia/gen_qcameraexposurecontrol.h @@ -36,6 +36,7 @@ void* QCameraExposureControl_metacast(QCameraExposureControl* self, const char* struct miqt_string QCameraExposureControl_tr(const char* s); struct miqt_string QCameraExposureControl_trUtf8(const char* s); bool QCameraExposureControl_isParameterSupported(const QCameraExposureControl* self, int parameter); +struct miqt_array /* of QVariant* */ QCameraExposureControl_supportedParameterRange(const QCameraExposureControl* self, int parameter, bool* continuous); QVariant* QCameraExposureControl_requestedValue(const QCameraExposureControl* self, int parameter); QVariant* QCameraExposureControl_actualValue(const QCameraExposureControl* self, int parameter); bool QCameraExposureControl_setValue(QCameraExposureControl* self, int parameter, QVariant* value); diff --git a/qt/multimedia/gen_qcameraimagecapture.cpp b/qt/multimedia/gen_qcameraimagecapture.cpp index 33ad2041..de72950e 100644 --- a/qt/multimedia/gen_qcameraimagecapture.cpp +++ b/qt/multimedia/gen_qcameraimagecapture.cpp @@ -587,7 +587,7 @@ struct miqt_string QCameraImageCapture_trUtf83(const char* s, const char* c, int return _ms; } -struct miqt_array /* of QSize* */ QCameraImageCapture_supportedResolutions1(const QCameraImageCapture* self, QImageEncoderSettings* settings) { +struct miqt_array /* of QSize* */ QCameraImageCapture_supportedResolutionsWithSettings(const QCameraImageCapture* self, QImageEncoderSettings* settings) { QList _ret = self->supportedResolutions(*settings); // Convert QList<> from C++ memory to manually-managed C memory QSize** _arr = static_cast(malloc(sizeof(QSize*) * _ret.length())); @@ -613,7 +613,7 @@ struct miqt_array /* of QSize* */ QCameraImageCapture_supportedResolutions2(con return _out; } -int QCameraImageCapture_capture1(QCameraImageCapture* self, struct miqt_string location) { +int QCameraImageCapture_captureWithLocation(QCameraImageCapture* self, struct miqt_string location) { QString location_QString = QString::fromUtf8(location.data, location.len); return self->capture(location_QString); } diff --git a/qt/multimedia/gen_qcameraimagecapture.go b/qt/multimedia/gen_qcameraimagecapture.go index b964802d..2396c850 100644 --- a/qt/multimedia/gen_qcameraimagecapture.go +++ b/qt/multimedia/gen_qcameraimagecapture.go @@ -487,8 +487,8 @@ func QCameraImageCapture_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QCameraImageCapture) SupportedResolutions1(settings *QImageEncoderSettings) []qt.QSize { - var _ma C.struct_miqt_array = C.QCameraImageCapture_supportedResolutions1(this.h, settings.cPointer()) +func (this *QCameraImageCapture) SupportedResolutionsWithSettings(settings *QImageEncoderSettings) []qt.QSize { + var _ma C.struct_miqt_array = C.QCameraImageCapture_supportedResolutionsWithSettings(this.h, settings.cPointer()) _ret := make([]qt.QSize, int(_ma.len)) _outCast := (*[0xffff]*C.QSize)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -511,12 +511,12 @@ func (this *QCameraImageCapture) SupportedResolutions2(settings *QImageEncoderSe return _ret } -func (this *QCameraImageCapture) Capture1(location string) int { +func (this *QCameraImageCapture) CaptureWithLocation(location string) int { location_ms := C.struct_miqt_string{} location_ms.data = C.CString(location) location_ms.len = C.size_t(len(location)) defer C.free(unsafe.Pointer(location_ms.data)) - return (int)(C.QCameraImageCapture_capture1(this.h, location_ms)) + return (int)(C.QCameraImageCapture_captureWithLocation(this.h, location_ms)) } // Sender can only be called from a QCameraImageCapture that was directly constructed. diff --git a/qt/multimedia/gen_qcameraimagecapture.h b/qt/multimedia/gen_qcameraimagecapture.h index 6c2ad133..b4014a7e 100644 --- a/qt/multimedia/gen_qcameraimagecapture.h +++ b/qt/multimedia/gen_qcameraimagecapture.h @@ -95,9 +95,9 @@ struct miqt_string QCameraImageCapture_tr2(const char* s, const char* c); struct miqt_string QCameraImageCapture_tr3(const char* s, const char* c, int n); struct miqt_string QCameraImageCapture_trUtf82(const char* s, const char* c); struct miqt_string QCameraImageCapture_trUtf83(const char* s, const char* c, int n); -struct miqt_array /* of QSize* */ QCameraImageCapture_supportedResolutions1(const QCameraImageCapture* self, QImageEncoderSettings* settings); +struct miqt_array /* of QSize* */ QCameraImageCapture_supportedResolutionsWithSettings(const QCameraImageCapture* self, QImageEncoderSettings* settings); struct miqt_array /* of QSize* */ QCameraImageCapture_supportedResolutions2(const QCameraImageCapture* self, QImageEncoderSettings* settings, bool* continuous); -int QCameraImageCapture_capture1(QCameraImageCapture* self, struct miqt_string location); +int QCameraImageCapture_captureWithLocation(QCameraImageCapture* self, struct miqt_string location); bool QCameraImageCapture_override_virtual_mediaObject(void* self, intptr_t slot); QMediaObject* QCameraImageCapture_virtualbase_mediaObject(const void* self); bool QCameraImageCapture_override_virtual_setMediaObject(void* self, intptr_t slot); diff --git a/qt/multimedia/gen_qcamerainfo.cpp b/qt/multimedia/gen_qcamerainfo.cpp index 1fab491a..da06ff32 100644 --- a/qt/multimedia/gen_qcamerainfo.cpp +++ b/qt/multimedia/gen_qcamerainfo.cpp @@ -97,7 +97,7 @@ struct miqt_array /* of QCameraInfo* */ QCameraInfo_availableCameras() { return _out; } -struct miqt_array /* of QCameraInfo* */ QCameraInfo_availableCameras1(int position) { +struct miqt_array /* of QCameraInfo* */ QCameraInfo_availableCamerasWithPosition(int position) { QList _ret = QCameraInfo::availableCameras(static_cast(position)); // Convert QList<> from C++ memory to manually-managed C memory QCameraInfo** _arr = static_cast(malloc(sizeof(QCameraInfo*) * _ret.length())); diff --git a/qt/multimedia/gen_qcamerainfo.go b/qt/multimedia/gen_qcamerainfo.go index b650b801..cd054b61 100644 --- a/qt/multimedia/gen_qcamerainfo.go +++ b/qt/multimedia/gen_qcamerainfo.go @@ -132,8 +132,8 @@ func QCameraInfo_AvailableCameras() []QCameraInfo { return _ret } -func QCameraInfo_AvailableCameras1(position QCamera__Position) []QCameraInfo { - var _ma C.struct_miqt_array = C.QCameraInfo_availableCameras1((C.int)(position)) +func QCameraInfo_AvailableCamerasWithPosition(position QCamera__Position) []QCameraInfo { + var _ma C.struct_miqt_array = C.QCameraInfo_availableCamerasWithPosition((C.int)(position)) _ret := make([]QCameraInfo, int(_ma.len)) _outCast := (*[0xffff]*C.QCameraInfo)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/multimedia/gen_qcamerainfo.h b/qt/multimedia/gen_qcamerainfo.h index 38306be4..f9e1a02b 100644 --- a/qt/multimedia/gen_qcamerainfo.h +++ b/qt/multimedia/gen_qcamerainfo.h @@ -36,7 +36,7 @@ int QCameraInfo_position(const QCameraInfo* self); int QCameraInfo_orientation(const QCameraInfo* self); QCameraInfo* QCameraInfo_defaultCamera(); struct miqt_array /* of QCameraInfo* */ QCameraInfo_availableCameras(); -struct miqt_array /* of QCameraInfo* */ QCameraInfo_availableCameras1(int position); +struct miqt_array /* of QCameraInfo* */ QCameraInfo_availableCamerasWithPosition(int position); void QCameraInfo_delete(QCameraInfo* self); #ifdef __cplusplus diff --git a/qt/multimedia/gen_qmediaplayer.cpp b/qt/multimedia/gen_qmediaplayer.cpp index e73951d1..8ad6b9c8 100644 --- a/qt/multimedia/gen_qmediaplayer.cpp +++ b/qt/multimedia/gen_qmediaplayer.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include "gen_qmediaplayer.h" @@ -876,7 +877,7 @@ int QMediaPlayer_hasSupport3(struct miqt_string mimeType, struct miqt_array /* o return static_cast(_ret); } -struct miqt_array /* of struct miqt_string */ QMediaPlayer_supportedMimeTypes1(int flags) { +struct miqt_array /* of struct miqt_string */ QMediaPlayer_supportedMimeTypesWithFlags(int flags) { QStringList _ret = QMediaPlayer::supportedMimeTypes(static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); diff --git a/qt/multimedia/gen_qmediaplayer.go b/qt/multimedia/gen_qmediaplayer.go index cc0913d5..de201934 100644 --- a/qt/multimedia/gen_qmediaplayer.go +++ b/qt/multimedia/gen_qmediaplayer.go @@ -795,8 +795,8 @@ func QMediaPlayer_HasSupport3(mimeType string, codecs []string, flags QMediaPlay return (QMultimedia__SupportEstimate)(C.QMediaPlayer_hasSupport3(mimeType_ms, codecs_ma, (C.int)(flags))) } -func QMediaPlayer_SupportedMimeTypes1(flags QMediaPlayer__Flag) []string { - var _ma C.struct_miqt_array = C.QMediaPlayer_supportedMimeTypes1((C.int)(flags)) +func QMediaPlayer_SupportedMimeTypesWithFlags(flags QMediaPlayer__Flag) []string { + var _ma C.struct_miqt_array = C.QMediaPlayer_supportedMimeTypesWithFlags((C.int)(flags)) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/multimedia/gen_qmediaplayer.h b/qt/multimedia/gen_qmediaplayer.h index 24425189..ac6813a8 100644 --- a/qt/multimedia/gen_qmediaplayer.h +++ b/qt/multimedia/gen_qmediaplayer.h @@ -141,7 +141,7 @@ struct miqt_string QMediaPlayer_trUtf82(const char* s, const char* c); struct miqt_string QMediaPlayer_trUtf83(const char* s, const char* c, int n); int QMediaPlayer_hasSupport2(struct miqt_string mimeType, struct miqt_array /* of struct miqt_string */ codecs); int QMediaPlayer_hasSupport3(struct miqt_string mimeType, struct miqt_array /* of struct miqt_string */ codecs, int flags); -struct miqt_array /* of struct miqt_string */ QMediaPlayer_supportedMimeTypes1(int flags); +struct miqt_array /* of struct miqt_string */ QMediaPlayer_supportedMimeTypesWithFlags(int flags); void QMediaPlayer_setMedia2(QMediaPlayer* self, QMediaContent* media, QIODevice* stream); bool QMediaPlayer_override_virtual_availability(void* self, intptr_t slot); int QMediaPlayer_virtualbase_availability(const void* self); diff --git a/qt/multimedia/gen_qmediaplaylist.cpp b/qt/multimedia/gen_qmediaplaylist.cpp index b8075a2e..1230f086 100644 --- a/qt/multimedia/gen_qmediaplaylist.cpp +++ b/qt/multimedia/gen_qmediaplaylist.cpp @@ -575,11 +575,11 @@ struct miqt_string QMediaPlaylist_trUtf83(const char* s, const char* c, int n) { return _ms; } -int QMediaPlaylist_nextIndex1(const QMediaPlaylist* self, int steps) { +int QMediaPlaylist_nextIndexWithSteps(const QMediaPlaylist* self, int steps) { return self->nextIndex(static_cast(steps)); } -int QMediaPlaylist_previousIndex1(const QMediaPlaylist* self, int steps) { +int QMediaPlaylist_previousIndexWithSteps(const QMediaPlaylist* self, int steps) { return self->previousIndex(static_cast(steps)); } @@ -587,15 +587,15 @@ void QMediaPlaylist_load2(QMediaPlaylist* self, QNetworkRequest* request, const self->load(*request, format); } -void QMediaPlaylist_load22(QMediaPlaylist* self, QUrl* location, const char* format) { +void QMediaPlaylist_load3(QMediaPlaylist* self, QUrl* location, const char* format) { self->load(*location, format); } -void QMediaPlaylist_load23(QMediaPlaylist* self, QIODevice* device, const char* format) { +void QMediaPlaylist_load4(QMediaPlaylist* self, QIODevice* device, const char* format) { self->load(device, format); } -bool QMediaPlaylist_save22(QMediaPlaylist* self, QUrl* location, const char* format) { +bool QMediaPlaylist_save3(QMediaPlaylist* self, QUrl* location, const char* format) { return self->save(*location, format); } diff --git a/qt/multimedia/gen_qmediaplaylist.go b/qt/multimedia/gen_qmediaplaylist.go index 01a4e8a9..2179990b 100644 --- a/qt/multimedia/gen_qmediaplaylist.go +++ b/qt/multimedia/gen_qmediaplaylist.go @@ -504,12 +504,12 @@ func QMediaPlaylist_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QMediaPlaylist) NextIndex1(steps int) int { - return (int)(C.QMediaPlaylist_nextIndex1(this.h, (C.int)(steps))) +func (this *QMediaPlaylist) NextIndexWithSteps(steps int) int { + return (int)(C.QMediaPlaylist_nextIndexWithSteps(this.h, (C.int)(steps))) } -func (this *QMediaPlaylist) PreviousIndex1(steps int) int { - return (int)(C.QMediaPlaylist_previousIndex1(this.h, (C.int)(steps))) +func (this *QMediaPlaylist) PreviousIndexWithSteps(steps int) int { + return (int)(C.QMediaPlaylist_previousIndexWithSteps(this.h, (C.int)(steps))) } func (this *QMediaPlaylist) Load2(request *network.QNetworkRequest, format string) { @@ -518,22 +518,22 @@ func (this *QMediaPlaylist) Load2(request *network.QNetworkRequest, format strin C.QMediaPlaylist_load2(this.h, (*C.QNetworkRequest)(request.UnsafePointer()), format_Cstring) } -func (this *QMediaPlaylist) Load22(location *qt.QUrl, format string) { +func (this *QMediaPlaylist) Load3(location *qt.QUrl, format string) { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - C.QMediaPlaylist_load22(this.h, (*C.QUrl)(location.UnsafePointer()), format_Cstring) + C.QMediaPlaylist_load3(this.h, (*C.QUrl)(location.UnsafePointer()), format_Cstring) } -func (this *QMediaPlaylist) Load23(device *qt.QIODevice, format string) { +func (this *QMediaPlaylist) Load4(device *qt.QIODevice, format string) { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - C.QMediaPlaylist_load23(this.h, (*C.QIODevice)(device.UnsafePointer()), format_Cstring) + C.QMediaPlaylist_load4(this.h, (*C.QIODevice)(device.UnsafePointer()), format_Cstring) } -func (this *QMediaPlaylist) Save22(location *qt.QUrl, format string) bool { +func (this *QMediaPlaylist) Save3(location *qt.QUrl, format string) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QMediaPlaylist_save22(this.h, (*C.QUrl)(location.UnsafePointer()), format_Cstring)) + return (bool)(C.QMediaPlaylist_save3(this.h, (*C.QUrl)(location.UnsafePointer()), format_Cstring)) } // Sender can only be called from a QMediaPlaylist that was directly constructed. diff --git a/qt/multimedia/gen_qmediaplaylist.h b/qt/multimedia/gen_qmediaplaylist.h index fd50cbca..363be39e 100644 --- a/qt/multimedia/gen_qmediaplaylist.h +++ b/qt/multimedia/gen_qmediaplaylist.h @@ -106,12 +106,12 @@ struct miqt_string QMediaPlaylist_tr2(const char* s, const char* c); struct miqt_string QMediaPlaylist_tr3(const char* s, const char* c, int n); struct miqt_string QMediaPlaylist_trUtf82(const char* s, const char* c); struct miqt_string QMediaPlaylist_trUtf83(const char* s, const char* c, int n); -int QMediaPlaylist_nextIndex1(const QMediaPlaylist* self, int steps); -int QMediaPlaylist_previousIndex1(const QMediaPlaylist* self, int steps); +int QMediaPlaylist_nextIndexWithSteps(const QMediaPlaylist* self, int steps); +int QMediaPlaylist_previousIndexWithSteps(const QMediaPlaylist* self, int steps); void QMediaPlaylist_load2(QMediaPlaylist* self, QNetworkRequest* request, const char* format); -void QMediaPlaylist_load22(QMediaPlaylist* self, QUrl* location, const char* format); -void QMediaPlaylist_load23(QMediaPlaylist* self, QIODevice* device, const char* format); -bool QMediaPlaylist_save22(QMediaPlaylist* self, QUrl* location, const char* format); +void QMediaPlaylist_load3(QMediaPlaylist* self, QUrl* location, const char* format); +void QMediaPlaylist_load4(QMediaPlaylist* self, QIODevice* device, const char* format); +bool QMediaPlaylist_save3(QMediaPlaylist* self, QUrl* location, const char* format); bool QMediaPlaylist_override_virtual_mediaObject(void* self, intptr_t slot); QMediaObject* QMediaPlaylist_virtualbase_mediaObject(const void* self); bool QMediaPlaylist_override_virtual_setMediaObject(void* self, intptr_t slot); diff --git a/qt/multimedia/gen_qmediarecorder.cpp b/qt/multimedia/gen_qmediarecorder.cpp index d02ebf09..93f0362b 100644 --- a/qt/multimedia/gen_qmediarecorder.cpp +++ b/qt/multimedia/gen_qmediarecorder.cpp @@ -777,7 +777,7 @@ struct miqt_string QMediaRecorder_trUtf83(const char* s, const char* c, int n) { return _ms; } -struct miqt_array /* of int */ QMediaRecorder_supportedAudioSampleRates1(const QMediaRecorder* self, QAudioEncoderSettings* settings) { +struct miqt_array /* of int */ QMediaRecorder_supportedAudioSampleRatesWithSettings(const QMediaRecorder* self, QAudioEncoderSettings* settings) { QList _ret = self->supportedAudioSampleRates(*settings); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); @@ -803,7 +803,7 @@ struct miqt_array /* of int */ QMediaRecorder_supportedAudioSampleRates2(const return _out; } -struct miqt_array /* of QSize* */ QMediaRecorder_supportedResolutions1(const QMediaRecorder* self, QVideoEncoderSettings* settings) { +struct miqt_array /* of QSize* */ QMediaRecorder_supportedResolutionsWithSettings(const QMediaRecorder* self, QVideoEncoderSettings* settings) { QList _ret = self->supportedResolutions(*settings); // Convert QList<> from C++ memory to manually-managed C memory QSize** _arr = static_cast(malloc(sizeof(QSize*) * _ret.length())); @@ -829,7 +829,7 @@ struct miqt_array /* of QSize* */ QMediaRecorder_supportedResolutions2(const QM return _out; } -struct miqt_array /* of double */ QMediaRecorder_supportedFrameRates1(const QMediaRecorder* self, QVideoEncoderSettings* settings) { +struct miqt_array /* of double */ QMediaRecorder_supportedFrameRatesWithSettings(const QMediaRecorder* self, QVideoEncoderSettings* settings) { QList _ret = self->supportedFrameRates(*settings); // Convert QList<> from C++ memory to manually-managed C memory double* _arr = static_cast(malloc(sizeof(double) * _ret.length())); diff --git a/qt/multimedia/gen_qmediarecorder.go b/qt/multimedia/gen_qmediarecorder.go index c7a98619..65d78272 100644 --- a/qt/multimedia/gen_qmediarecorder.go +++ b/qt/multimedia/gen_qmediarecorder.go @@ -694,8 +694,8 @@ func QMediaRecorder_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QMediaRecorder) SupportedAudioSampleRates1(settings *QAudioEncoderSettings) []int { - var _ma C.struct_miqt_array = C.QMediaRecorder_supportedAudioSampleRates1(this.h, settings.cPointer()) +func (this *QMediaRecorder) SupportedAudioSampleRatesWithSettings(settings *QAudioEncoderSettings) []int { + var _ma C.struct_miqt_array = C.QMediaRecorder_supportedAudioSampleRatesWithSettings(this.h, settings.cPointer()) _ret := make([]int, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -714,8 +714,8 @@ func (this *QMediaRecorder) SupportedAudioSampleRates2(settings *QAudioEncoderSe return _ret } -func (this *QMediaRecorder) SupportedResolutions1(settings *QVideoEncoderSettings) []qt.QSize { - var _ma C.struct_miqt_array = C.QMediaRecorder_supportedResolutions1(this.h, settings.cPointer()) +func (this *QMediaRecorder) SupportedResolutionsWithSettings(settings *QVideoEncoderSettings) []qt.QSize { + var _ma C.struct_miqt_array = C.QMediaRecorder_supportedResolutionsWithSettings(this.h, settings.cPointer()) _ret := make([]qt.QSize, int(_ma.len)) _outCast := (*[0xffff]*C.QSize)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -738,8 +738,8 @@ func (this *QMediaRecorder) SupportedResolutions2(settings *QVideoEncoderSetting return _ret } -func (this *QMediaRecorder) SupportedFrameRates1(settings *QVideoEncoderSettings) []float64 { - var _ma C.struct_miqt_array = C.QMediaRecorder_supportedFrameRates1(this.h, settings.cPointer()) +func (this *QMediaRecorder) SupportedFrameRatesWithSettings(settings *QVideoEncoderSettings) []float64 { + var _ma C.struct_miqt_array = C.QMediaRecorder_supportedFrameRatesWithSettings(this.h, settings.cPointer()) _ret := make([]float64, int(_ma.len)) _outCast := (*[0xffff]C.double)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/multimedia/gen_qmediarecorder.h b/qt/multimedia/gen_qmediarecorder.h index 92e5ced4..669c42f5 100644 --- a/qt/multimedia/gen_qmediarecorder.h +++ b/qt/multimedia/gen_qmediarecorder.h @@ -123,11 +123,11 @@ struct miqt_string QMediaRecorder_tr2(const char* s, const char* c); struct miqt_string QMediaRecorder_tr3(const char* s, const char* c, int n); struct miqt_string QMediaRecorder_trUtf82(const char* s, const char* c); struct miqt_string QMediaRecorder_trUtf83(const char* s, const char* c, int n); -struct miqt_array /* of int */ QMediaRecorder_supportedAudioSampleRates1(const QMediaRecorder* self, QAudioEncoderSettings* settings); +struct miqt_array /* of int */ QMediaRecorder_supportedAudioSampleRatesWithSettings(const QMediaRecorder* self, QAudioEncoderSettings* settings); struct miqt_array /* of int */ QMediaRecorder_supportedAudioSampleRates2(const QMediaRecorder* self, QAudioEncoderSettings* settings, bool* continuous); -struct miqt_array /* of QSize* */ QMediaRecorder_supportedResolutions1(const QMediaRecorder* self, QVideoEncoderSettings* settings); +struct miqt_array /* of QSize* */ QMediaRecorder_supportedResolutionsWithSettings(const QMediaRecorder* self, QVideoEncoderSettings* settings); struct miqt_array /* of QSize* */ QMediaRecorder_supportedResolutions2(const QMediaRecorder* self, QVideoEncoderSettings* settings, bool* continuous); -struct miqt_array /* of double */ QMediaRecorder_supportedFrameRates1(const QMediaRecorder* self, QVideoEncoderSettings* settings); +struct miqt_array /* of double */ QMediaRecorder_supportedFrameRatesWithSettings(const QMediaRecorder* self, QVideoEncoderSettings* settings); struct miqt_array /* of double */ QMediaRecorder_supportedFrameRates2(const QMediaRecorder* self, QVideoEncoderSettings* settings, bool* continuous); void QMediaRecorder_setEncodingSettings2(QMediaRecorder* self, QAudioEncoderSettings* audioSettings, QVideoEncoderSettings* videoSettings); void QMediaRecorder_setEncodingSettings3(QMediaRecorder* self, QAudioEncoderSettings* audioSettings, QVideoEncoderSettings* videoSettings, struct miqt_string containerMimeType); diff --git a/qt/multimedia/gen_qradiotuner.cpp b/qt/multimedia/gen_qradiotuner.cpp index 7ae3b55f..81f1655d 100644 --- a/qt/multimedia/gen_qradiotuner.cpp +++ b/qt/multimedia/gen_qradiotuner.cpp @@ -641,7 +641,7 @@ struct miqt_string QRadioTuner_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QRadioTuner_searchAllStations1(QRadioTuner* self, int searchMode) { +void QRadioTuner_searchAllStationsWithSearchMode(QRadioTuner* self, int searchMode) { self->searchAllStations(static_cast(searchMode)); } diff --git a/qt/multimedia/gen_qradiotuner.go b/qt/multimedia/gen_qradiotuner.go index 53891e26..776b7aea 100644 --- a/qt/multimedia/gen_qradiotuner.go +++ b/qt/multimedia/gen_qradiotuner.go @@ -533,8 +533,8 @@ func QRadioTuner_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QRadioTuner) SearchAllStations1(searchMode QRadioTuner__SearchMode) { - C.QRadioTuner_searchAllStations1(this.h, (C.int)(searchMode)) +func (this *QRadioTuner) SearchAllStationsWithSearchMode(searchMode QRadioTuner__SearchMode) { + C.QRadioTuner_searchAllStationsWithSearchMode(this.h, (C.int)(searchMode)) } // AddPropertyWatch can only be called from a QRadioTuner that was directly constructed. diff --git a/qt/multimedia/gen_qradiotuner.h b/qt/multimedia/gen_qradiotuner.h index 086d2e45..cb9378bb 100644 --- a/qt/multimedia/gen_qradiotuner.h +++ b/qt/multimedia/gen_qradiotuner.h @@ -99,7 +99,7 @@ struct miqt_string QRadioTuner_tr2(const char* s, const char* c); struct miqt_string QRadioTuner_tr3(const char* s, const char* c, int n); struct miqt_string QRadioTuner_trUtf82(const char* s, const char* c); struct miqt_string QRadioTuner_trUtf83(const char* s, const char* c, int n); -void QRadioTuner_searchAllStations1(QRadioTuner* self, int searchMode); +void QRadioTuner_searchAllStationsWithSearchMode(QRadioTuner* self, int searchMode); bool QRadioTuner_override_virtual_availability(void* self, intptr_t slot); int QRadioTuner_virtualbase_availability(const void* self); bool QRadioTuner_override_virtual_isAvailable(void* self, intptr_t slot); diff --git a/qt/network/gen_qabstractnetworkcache.cpp b/qt/network/gen_qabstractnetworkcache.cpp index 8b21ded7..02a09ff8 100644 --- a/qt/network/gen_qabstractnetworkcache.cpp +++ b/qt/network/gen_qabstractnetworkcache.cpp @@ -1,9 +1,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/qt/network/gen_qabstractsocket.cpp b/qt/network/gen_qabstractsocket.cpp index b8e3fbfe..b5577295 100644 --- a/qt/network/gen_qabstractsocket.cpp +++ b/qt/network/gen_qabstractsocket.cpp @@ -28,8 +28,8 @@ void miqt_exec_callback_QAbstractSocket_errorWithQAbstractSocketSocketError(intp void miqt_exec_callback_QAbstractSocket_errorOccurred(intptr_t, int); void miqt_exec_callback_QAbstractSocket_proxyAuthenticationRequired(intptr_t, QNetworkProxy*, QAuthenticator*); void miqt_exec_callback_QAbstractSocket_resume(QAbstractSocket*, intptr_t); -void miqt_exec_callback_QAbstractSocket_connectToHost(QAbstractSocket*, intptr_t, struct miqt_string, uint16_t, int, int); -void miqt_exec_callback_QAbstractSocket_connectToHost2(QAbstractSocket*, intptr_t, QHostAddress*, uint16_t, int); +void miqt_exec_callback_QAbstractSocket_connectToHost(QAbstractSocket*, intptr_t, struct miqt_string, unsigned short, int, int); +void miqt_exec_callback_QAbstractSocket_connectToHost2(QAbstractSocket*, intptr_t, QHostAddress*, unsigned short, int); void miqt_exec_callback_QAbstractSocket_disconnectFromHost(QAbstractSocket*, intptr_t); long long miqt_exec_callback_QAbstractSocket_bytesAvailable(const QAbstractSocket*, intptr_t); long long miqt_exec_callback_QAbstractSocket_bytesToWrite(const QAbstractSocket*, intptr_t); @@ -109,7 +109,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODevice::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -120,7 +120,7 @@ public: } - friend void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__connectToHost2 = 0; @@ -136,7 +136,7 @@ public: // Cast returned reference into pointer QHostAddress* sigval1 = const_cast(&address_ret); quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODevice::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); @@ -145,7 +145,7 @@ public: } - friend void QAbstractSocket_virtualbase_connectToHost2(void* self, QHostAddress* address, uint16_t port, int mode); + friend void QAbstractSocket_virtualbase_connectToHost2(void* self, QHostAddress* address, unsigned short port, int mode); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -730,9 +730,9 @@ public: // Wrappers to allow calling protected methods: friend void QAbstractSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QAbstractSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QAbstractSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QAbstractSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QAbstractSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QAbstractSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -802,12 +802,12 @@ bool QAbstractSocket_bind2(QAbstractSocket* self) { return self->bind(); } -void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); } -void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode) { +void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode) { self->connectToHost(*address, static_cast(port), static_cast(mode)); } @@ -833,18 +833,18 @@ bool QAbstractSocket_canReadLine(const QAbstractSocket* self) { return self->canReadLine(); } -uint16_t QAbstractSocket_localPort(const QAbstractSocket* self) { +unsigned short QAbstractSocket_localPort(const QAbstractSocket* self) { quint16 _ret = self->localPort(); - return static_cast(_ret); + return static_cast(_ret); } QHostAddress* QAbstractSocket_localAddress(const QAbstractSocket* self) { return new QHostAddress(self->localAddress()); } -uint16_t QAbstractSocket_peerPort(const QAbstractSocket* self) { +unsigned short QAbstractSocket_peerPort(const QAbstractSocket* self) { quint16 _ret = self->peerPort(); - return static_cast(_ret); + return static_cast(_ret); } QHostAddress* QAbstractSocket_peerAddress(const QAbstractSocket* self) { @@ -1087,19 +1087,19 @@ struct miqt_string QAbstractSocket_trUtf83(const char* s, const char* c, int n) return _ms; } -bool QAbstractSocket_bind22(QAbstractSocket* self, QHostAddress* address, uint16_t port) { +bool QAbstractSocket_bind3(QAbstractSocket* self, QHostAddress* address, unsigned short port) { return self->bind(*address, static_cast(port)); } -bool QAbstractSocket_bind3(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode) { +bool QAbstractSocket_bind4(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode) { return self->bind(*address, static_cast(port), static_cast(mode)); } -bool QAbstractSocket_bind1(QAbstractSocket* self, uint16_t port) { +bool QAbstractSocket_bindWithPort(QAbstractSocket* self, unsigned short port) { return self->bind(static_cast(port)); } -bool QAbstractSocket_bind23(QAbstractSocket* self, uint16_t port, int mode) { +bool QAbstractSocket_bind5(QAbstractSocket* self, unsigned short port, int mode) { return self->bind(static_cast(port), static_cast(mode)); } @@ -1129,7 +1129,7 @@ bool QAbstractSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQAbstractSocket*)(self) )->QAbstractSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1146,7 +1146,7 @@ bool QAbstractSocket_override_virtual_connectToHost2(void* self, intptr_t slot) return true; } -void QAbstractSocket_virtualbase_connectToHost2(void* self, QHostAddress* address, uint16_t port, int mode) { +void QAbstractSocket_virtualbase_connectToHost2(void* self, QHostAddress* address, unsigned short port, int mode) { ( (MiqtVirtualQAbstractSocket*)(self) )->QAbstractSocket::connectToHost(*address, static_cast(port), static_cast(mode)); @@ -1682,7 +1682,7 @@ void QAbstractSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* } -void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQAbstractSocket* self_cast = dynamic_cast( (QAbstractSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1708,7 +1708,7 @@ void QAbstractSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* } -void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQAbstractSocket* self_cast = dynamic_cast( (QAbstractSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt/network/gen_qabstractsocket.go b/qt/network/gen_qabstractsocket.go index fad495b6..9d4300fa 100644 --- a/qt/network/gen_qabstractsocket.go +++ b/qt/network/gen_qabstractsocket.go @@ -198,11 +198,11 @@ func (this *QAbstractSocket) ConnectToHost(hostName string, port uint16, mode qt hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QAbstractSocket_connectToHost(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QAbstractSocket_connectToHost(this.h, hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QAbstractSocket) ConnectToHost2(address *QHostAddress, port uint16, mode qt.QIODevice__OpenModeFlag) { - C.QAbstractSocket_connectToHost2(this.h, address.cPointer(), (C.uint16_t)(port), (C.int)(mode)) + C.QAbstractSocket_connectToHost2(this.h, address.cPointer(), (C.ushort)(port), (C.int)(mode)) } func (this *QAbstractSocket) DisconnectFromHost() { @@ -528,20 +528,20 @@ func QAbstractSocket_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QAbstractSocket) Bind22(address *QHostAddress, port uint16) bool { - return (bool)(C.QAbstractSocket_bind22(this.h, address.cPointer(), (C.uint16_t)(port))) +func (this *QAbstractSocket) Bind3(address *QHostAddress, port uint16) bool { + return (bool)(C.QAbstractSocket_bind3(this.h, address.cPointer(), (C.ushort)(port))) } -func (this *QAbstractSocket) Bind3(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QAbstractSocket_bind3(this.h, address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) +func (this *QAbstractSocket) Bind4(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { + return (bool)(C.QAbstractSocket_bind4(this.h, address.cPointer(), (C.ushort)(port), (C.int)(mode))) } -func (this *QAbstractSocket) Bind1(port uint16) bool { - return (bool)(C.QAbstractSocket_bind1(this.h, (C.uint16_t)(port))) +func (this *QAbstractSocket) BindWithPort(port uint16) bool { + return (bool)(C.QAbstractSocket_bindWithPort(this.h, (C.ushort)(port))) } -func (this *QAbstractSocket) Bind23(port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QAbstractSocket_bind23(this.h, (C.uint16_t)(port), (C.int)(mode))) +func (this *QAbstractSocket) Bind5(port uint16, mode QAbstractSocket__BindFlag) bool { + return (bool)(C.QAbstractSocket_bind5(this.h, (C.ushort)(port), (C.int)(mode))) } // SetSocketState can only be called from a QAbstractSocket that was directly constructed. @@ -572,7 +572,7 @@ func (this *QAbstractSocket) SetSocketError(socketError QAbstractSocket__SocketE func (this *QAbstractSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QAbstractSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QAbstractSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -596,7 +596,7 @@ func (this *QAbstractSocket) SetLocalAddress(address *QHostAddress) { func (this *QAbstractSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QAbstractSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QAbstractSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -747,7 +747,7 @@ func (this *QAbstractSocket) callVirtualBase_ConnectToHost(hostName string, port hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QAbstractSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QAbstractSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QAbstractSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -758,7 +758,7 @@ func (this *QAbstractSocket) OnConnectToHost(slot func(super func(hostName strin } //export miqt_exec_callback_QAbstractSocket_connectToHost -func miqt_exec_callback_QAbstractSocket_connectToHost(self *C.QAbstractSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QAbstractSocket_connectToHost(self *C.QAbstractSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -781,7 +781,7 @@ func miqt_exec_callback_QAbstractSocket_connectToHost(self *C.QAbstractSocket, c func (this *QAbstractSocket) callVirtualBase_ConnectToHost2(address *QHostAddress, port uint16, mode qt.QIODevice__OpenModeFlag) { - C.QAbstractSocket_virtualbase_connectToHost2(unsafe.Pointer(this.h), address.cPointer(), (C.uint16_t)(port), (C.int)(mode)) + C.QAbstractSocket_virtualbase_connectToHost2(unsafe.Pointer(this.h), address.cPointer(), (C.ushort)(port), (C.int)(mode)) } func (this *QAbstractSocket) OnConnectToHost2(slot func(super func(address *QHostAddress, port uint16, mode qt.QIODevice__OpenModeFlag), address *QHostAddress, port uint16, mode qt.QIODevice__OpenModeFlag)) { @@ -792,7 +792,7 @@ func (this *QAbstractSocket) OnConnectToHost2(slot func(super func(address *QHos } //export miqt_exec_callback_QAbstractSocket_connectToHost2 -func miqt_exec_callback_QAbstractSocket_connectToHost2(self *C.QAbstractSocket, cb C.intptr_t, address *C.QHostAddress, port C.uint16_t, mode C.int) { +func miqt_exec_callback_QAbstractSocket_connectToHost2(self *C.QAbstractSocket, cb C.intptr_t, address *C.QHostAddress, port C.ushort, mode C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(address *QHostAddress, port uint16, mode qt.QIODevice__OpenModeFlag), address *QHostAddress, port uint16, mode qt.QIODevice__OpenModeFlag)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/network/gen_qabstractsocket.h b/qt/network/gen_qabstractsocket.h index dbe6f964..dae0862e 100644 --- a/qt/network/gen_qabstractsocket.h +++ b/qt/network/gen_qabstractsocket.h @@ -53,16 +53,16 @@ int QAbstractSocket_pauseMode(const QAbstractSocket* self); void QAbstractSocket_setPauseMode(QAbstractSocket* self, int pauseMode); bool QAbstractSocket_bind(QAbstractSocket* self, QHostAddress* address); bool QAbstractSocket_bind2(QAbstractSocket* self); -void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); -void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode); +void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); +void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode); void QAbstractSocket_disconnectFromHost(QAbstractSocket* self); bool QAbstractSocket_isValid(const QAbstractSocket* self); long long QAbstractSocket_bytesAvailable(const QAbstractSocket* self); long long QAbstractSocket_bytesToWrite(const QAbstractSocket* self); bool QAbstractSocket_canReadLine(const QAbstractSocket* self); -uint16_t QAbstractSocket_localPort(const QAbstractSocket* self); +unsigned short QAbstractSocket_localPort(const QAbstractSocket* self); QHostAddress* QAbstractSocket_localAddress(const QAbstractSocket* self); -uint16_t QAbstractSocket_peerPort(const QAbstractSocket* self); +unsigned short QAbstractSocket_peerPort(const QAbstractSocket* self); QHostAddress* QAbstractSocket_peerAddress(const QAbstractSocket* self); struct miqt_string QAbstractSocket_peerName(const QAbstractSocket* self); long long QAbstractSocket_readBufferSize(const QAbstractSocket* self); @@ -108,16 +108,16 @@ struct miqt_string QAbstractSocket_tr2(const char* s, const char* c); struct miqt_string QAbstractSocket_tr3(const char* s, const char* c, int n); struct miqt_string QAbstractSocket_trUtf82(const char* s, const char* c); struct miqt_string QAbstractSocket_trUtf83(const char* s, const char* c, int n); -bool QAbstractSocket_bind22(QAbstractSocket* self, QHostAddress* address, uint16_t port); -bool QAbstractSocket_bind3(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode); -bool QAbstractSocket_bind1(QAbstractSocket* self, uint16_t port); -bool QAbstractSocket_bind23(QAbstractSocket* self, uint16_t port, int mode); +bool QAbstractSocket_bind3(QAbstractSocket* self, QHostAddress* address, unsigned short port); +bool QAbstractSocket_bind4(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode); +bool QAbstractSocket_bindWithPort(QAbstractSocket* self, unsigned short port); +bool QAbstractSocket_bind5(QAbstractSocket* self, unsigned short port, int mode); bool QAbstractSocket_override_virtual_resume(void* self, intptr_t slot); void QAbstractSocket_virtualbase_resume(void* self); bool QAbstractSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QAbstractSocket_override_virtual_connectToHost2(void* self, intptr_t slot); -void QAbstractSocket_virtualbase_connectToHost2(void* self, QHostAddress* address, uint16_t port, int mode); +void QAbstractSocket_virtualbase_connectToHost2(void* self, QHostAddress* address, unsigned short port, int mode); bool QAbstractSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QAbstractSocket_virtualbase_disconnectFromHost(void* self); bool QAbstractSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); @@ -182,9 +182,9 @@ bool QAbstractSocket_override_virtual_disconnectNotify(void* self, intptr_t slot void QAbstractSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QAbstractSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QAbstractSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QAbstractSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QAbstractSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QAbstractSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QAbstractSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt/network/gen_qauthenticator.cpp b/qt/network/gen_qauthenticator.cpp index 1afd37b2..180ae3fd 100644 --- a/qt/network/gen_qauthenticator.cpp +++ b/qt/network/gen_qauthenticator.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/qt/network/gen_qdnslookup.cpp b/qt/network/gen_qdnslookup.cpp index e5f3b335..a36f3c9d 100644 --- a/qt/network/gen_qdnslookup.cpp +++ b/qt/network/gen_qdnslookup.cpp @@ -163,9 +163,9 @@ struct miqt_string QDnsMailExchangeRecord_name(const QDnsMailExchangeRecord* sel return _ms; } -uint16_t QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self) { +unsigned short QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self) { quint16 _ret = self->preference(); - return static_cast(_ret); + return static_cast(_ret); } unsigned int QDnsMailExchangeRecord_timeToLive(const QDnsMailExchangeRecord* self) { @@ -204,14 +204,14 @@ struct miqt_string QDnsServiceRecord_name(const QDnsServiceRecord* self) { return _ms; } -uint16_t QDnsServiceRecord_port(const QDnsServiceRecord* self) { +unsigned short QDnsServiceRecord_port(const QDnsServiceRecord* self) { quint16 _ret = self->port(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QDnsServiceRecord_priority(const QDnsServiceRecord* self) { +unsigned short QDnsServiceRecord_priority(const QDnsServiceRecord* self) { quint16 _ret = self->priority(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string QDnsServiceRecord_target(const QDnsServiceRecord* self) { @@ -230,9 +230,9 @@ unsigned int QDnsServiceRecord_timeToLive(const QDnsServiceRecord* self) { return static_cast(_ret); } -uint16_t QDnsServiceRecord_weight(const QDnsServiceRecord* self) { +unsigned short QDnsServiceRecord_weight(const QDnsServiceRecord* self) { quint16 _ret = self->weight(); - return static_cast(_ret); + return static_cast(_ret); } void QDnsServiceRecord_delete(QDnsServiceRecord* self) { diff --git a/qt/network/gen_qdnslookup.h b/qt/network/gen_qdnslookup.h index a11e078c..dff44a13 100644 --- a/qt/network/gen_qdnslookup.h +++ b/qt/network/gen_qdnslookup.h @@ -68,7 +68,7 @@ void QDnsMailExchangeRecord_operatorAssign(QDnsMailExchangeRecord* self, QDnsMai void QDnsMailExchangeRecord_swap(QDnsMailExchangeRecord* self, QDnsMailExchangeRecord* other); struct miqt_string QDnsMailExchangeRecord_exchange(const QDnsMailExchangeRecord* self); struct miqt_string QDnsMailExchangeRecord_name(const QDnsMailExchangeRecord* self); -uint16_t QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self); +unsigned short QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self); unsigned int QDnsMailExchangeRecord_timeToLive(const QDnsMailExchangeRecord* self); void QDnsMailExchangeRecord_delete(QDnsMailExchangeRecord* self); @@ -77,11 +77,11 @@ QDnsServiceRecord* QDnsServiceRecord_new2(QDnsServiceRecord* other); void QDnsServiceRecord_operatorAssign(QDnsServiceRecord* self, QDnsServiceRecord* other); void QDnsServiceRecord_swap(QDnsServiceRecord* self, QDnsServiceRecord* other); struct miqt_string QDnsServiceRecord_name(const QDnsServiceRecord* self); -uint16_t QDnsServiceRecord_port(const QDnsServiceRecord* self); -uint16_t QDnsServiceRecord_priority(const QDnsServiceRecord* self); +unsigned short QDnsServiceRecord_port(const QDnsServiceRecord* self); +unsigned short QDnsServiceRecord_priority(const QDnsServiceRecord* self); struct miqt_string QDnsServiceRecord_target(const QDnsServiceRecord* self); unsigned int QDnsServiceRecord_timeToLive(const QDnsServiceRecord* self); -uint16_t QDnsServiceRecord_weight(const QDnsServiceRecord* self); +unsigned short QDnsServiceRecord_weight(const QDnsServiceRecord* self); void QDnsServiceRecord_delete(QDnsServiceRecord* self); QDnsTextRecord* QDnsTextRecord_new(); diff --git a/qt/network/gen_qdtls.cpp b/qt/network/gen_qdtls.cpp index fe1bd145..4b52888a 100644 --- a/qt/network/gen_qdtls.cpp +++ b/qt/network/gen_qdtls.cpp @@ -5,7 +5,6 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QDtlsClientVerifier__GeneratorParameters #include #include -#include #include #include #include @@ -18,6 +17,7 @@ #include #include #include +#include #include #include "gen_qdtls.h" @@ -246,7 +246,7 @@ QDtlsClientVerifier__GeneratorParameters* QDtlsClientVerifier_cookieGeneratorPar return new QDtlsClientVerifier::GeneratorParameters(self->cookieGeneratorParameters()); } -bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, uint16_t port) { +bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, unsigned short port) { QByteArray dgram_QByteArray(dgram.data, dgram.len); return self->verifyClient(socket, dgram_QByteArray, *address, static_cast(port)); } @@ -681,7 +681,7 @@ struct miqt_string QDtls_trUtf8(const char* s) { return _ms; } -bool QDtls_setPeer(QDtls* self, QHostAddress* address, uint16_t port) { +bool QDtls_setPeer(QDtls* self, QHostAddress* address, unsigned short port) { return self->setPeer(*address, static_cast(port)); } @@ -694,9 +694,9 @@ QHostAddress* QDtls_peerAddress(const QDtls* self) { return new QHostAddress(self->peerAddress()); } -uint16_t QDtls_peerPort(const QDtls* self) { +unsigned short QDtls_peerPort(const QDtls* self) { quint16 _ret = self->peerPort(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string QDtls_peerVerificationName(const QDtls* self) { @@ -715,13 +715,13 @@ int QDtls_sslMode(const QDtls* self) { return static_cast(_ret); } -void QDtls_setMtuHint(QDtls* self, uint16_t mtuHint) { +void QDtls_setMtuHint(QDtls* self, unsigned short mtuHint) { self->setMtuHint(static_cast(mtuHint)); } -uint16_t QDtls_mtuHint(const QDtls* self) { +unsigned short QDtls_mtuHint(const QDtls* self) { quint16 _ret = self->mtuHint(); - return static_cast(_ret); + return static_cast(_ret); } bool QDtls_setCookieGeneratorParameters(QDtls* self, QDtlsClientVerifier__GeneratorParameters* params) { @@ -898,7 +898,7 @@ struct miqt_string QDtls_trUtf83(const char* s, const char* c, int n) { return _ms; } -bool QDtls_setPeer3(QDtls* self, QHostAddress* address, uint16_t port, struct miqt_string verificationName) { +bool QDtls_setPeer2(QDtls* self, QHostAddress* address, unsigned short port, struct miqt_string verificationName) { QString verificationName_QString = QString::fromUtf8(verificationName.data, verificationName.len); return self->setPeer(*address, static_cast(port), verificationName_QString); } diff --git a/qt/network/gen_qdtls.go b/qt/network/gen_qdtls.go index dba1c8c5..6b93d5f6 100644 --- a/qt/network/gen_qdtls.go +++ b/qt/network/gen_qdtls.go @@ -132,7 +132,7 @@ func (this *QDtlsClientVerifier) VerifyClient(socket *QUdpSocket, dgram []byte, dgram_alias.data = (*C.char)(unsafe.Pointer(nil)) } dgram_alias.len = C.size_t(len(dgram)) - return (bool)(C.QDtlsClientVerifier_verifyClient(this.h, socket.cPointer(), dgram_alias, address.cPointer(), (C.uint16_t)(port))) + return (bool)(C.QDtlsClientVerifier_verifyClient(this.h, socket.cPointer(), dgram_alias, address.cPointer(), (C.ushort)(port))) } func (this *QDtlsClientVerifier) VerifiedHello() []byte { @@ -534,7 +534,7 @@ func QDtls_TrUtf8(s string) string { } func (this *QDtls) SetPeer(address *QHostAddress, port uint16) bool { - return (bool)(C.QDtls_setPeer(this.h, address.cPointer(), (C.uint16_t)(port))) + return (bool)(C.QDtls_setPeer(this.h, address.cPointer(), (C.ushort)(port))) } func (this *QDtls) SetPeerVerificationName(name string) bool { @@ -567,7 +567,7 @@ func (this *QDtls) SslMode() QSslSocket__SslMode { } func (this *QDtls) SetMtuHint(mtuHint uint16) { - C.QDtls_setMtuHint(this.h, (C.uint16_t)(mtuHint)) + C.QDtls_setMtuHint(this.h, (C.ushort)(mtuHint)) } func (this *QDtls) MtuHint() uint16 { @@ -771,12 +771,12 @@ func QDtls_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QDtls) SetPeer3(address *QHostAddress, port uint16, verificationName string) bool { +func (this *QDtls) SetPeer2(address *QHostAddress, port uint16, verificationName string) bool { verificationName_ms := C.struct_miqt_string{} verificationName_ms.data = C.CString(verificationName) verificationName_ms.len = C.size_t(len(verificationName)) defer C.free(unsafe.Pointer(verificationName_ms.data)) - return (bool)(C.QDtls_setPeer3(this.h, address.cPointer(), (C.uint16_t)(port), verificationName_ms)) + return (bool)(C.QDtls_setPeer2(this.h, address.cPointer(), (C.ushort)(port), verificationName_ms)) } func (this *QDtls) DoHandshake2(socket *QUdpSocket, dgram []byte) bool { diff --git a/qt/network/gen_qdtls.h b/qt/network/gen_qdtls.h index c1eae69c..09b43a99 100644 --- a/qt/network/gen_qdtls.h +++ b/qt/network/gen_qdtls.h @@ -61,7 +61,7 @@ struct miqt_string QDtlsClientVerifier_tr(const char* s); struct miqt_string QDtlsClientVerifier_trUtf8(const char* s); bool QDtlsClientVerifier_setCookieGeneratorParameters(QDtlsClientVerifier* self, QDtlsClientVerifier__GeneratorParameters* params); QDtlsClientVerifier__GeneratorParameters* QDtlsClientVerifier_cookieGeneratorParameters(const QDtlsClientVerifier* self); -bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, uint16_t port); +bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, unsigned short port); struct miqt_string QDtlsClientVerifier_verifiedHello(const QDtlsClientVerifier* self); unsigned char QDtlsClientVerifier_dtlsError(const QDtlsClientVerifier* self); struct miqt_string QDtlsClientVerifier_dtlsErrorString(const QDtlsClientVerifier* self); @@ -96,14 +96,14 @@ QMetaObject* QDtls_metaObject(const QDtls* self); void* QDtls_metacast(QDtls* self, const char* param1); struct miqt_string QDtls_tr(const char* s); struct miqt_string QDtls_trUtf8(const char* s); -bool QDtls_setPeer(QDtls* self, QHostAddress* address, uint16_t port); +bool QDtls_setPeer(QDtls* self, QHostAddress* address, unsigned short port); bool QDtls_setPeerVerificationName(QDtls* self, struct miqt_string name); QHostAddress* QDtls_peerAddress(const QDtls* self); -uint16_t QDtls_peerPort(const QDtls* self); +unsigned short QDtls_peerPort(const QDtls* self); struct miqt_string QDtls_peerVerificationName(const QDtls* self); int QDtls_sslMode(const QDtls* self); -void QDtls_setMtuHint(QDtls* self, uint16_t mtuHint); -uint16_t QDtls_mtuHint(const QDtls* self); +void QDtls_setMtuHint(QDtls* self, unsigned short mtuHint); +unsigned short QDtls_mtuHint(const QDtls* self); bool QDtls_setCookieGeneratorParameters(QDtls* self, QDtlsClientVerifier__GeneratorParameters* params); QDtlsClientVerifier__GeneratorParameters* QDtls_cookieGeneratorParameters(const QDtls* self); bool QDtls_setDtlsConfiguration(QDtls* self, QSslConfiguration* configuration); @@ -131,7 +131,7 @@ struct miqt_string QDtls_tr2(const char* s, const char* c); struct miqt_string QDtls_tr3(const char* s, const char* c, int n); struct miqt_string QDtls_trUtf82(const char* s, const char* c); struct miqt_string QDtls_trUtf83(const char* s, const char* c, int n); -bool QDtls_setPeer3(QDtls* self, QHostAddress* address, uint16_t port, struct miqt_string verificationName); +bool QDtls_setPeer2(QDtls* self, QHostAddress* address, unsigned short port, struct miqt_string verificationName); bool QDtls_doHandshake2(QDtls* self, QUdpSocket* socket, struct miqt_string dgram); bool QDtls_override_virtual_event(void* self, intptr_t slot); bool QDtls_virtualbase_event(void* self, QEvent* event); diff --git a/qt/network/gen_qhstspolicy.cpp b/qt/network/gen_qhstspolicy.cpp index aadc034b..1135186c 100644 --- a/qt/network/gen_qhstspolicy.cpp +++ b/qt/network/gen_qhstspolicy.cpp @@ -81,7 +81,7 @@ void QHstsPolicy_setHost2(QHstsPolicy* self, struct miqt_string host, int mode) self->setHost(host_QString, static_cast(mode)); } -struct miqt_string QHstsPolicy_host1(const QHstsPolicy* self, int options) { +struct miqt_string QHstsPolicy_hostWithOptions(const QHstsPolicy* self, int options) { QString _ret = self->host(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); diff --git a/qt/network/gen_qhstspolicy.go b/qt/network/gen_qhstspolicy.go index 526a543f..dcb6e7e5 100644 --- a/qt/network/gen_qhstspolicy.go +++ b/qt/network/gen_qhstspolicy.go @@ -137,8 +137,8 @@ func (this *QHstsPolicy) SetHost2(host string, mode qt.QUrl__ParsingMode) { C.QHstsPolicy_setHost2(this.h, host_ms, (C.int)(mode)) } -func (this *QHstsPolicy) Host1(options qt.QUrl__ComponentFormattingOption) string { - var _ms C.struct_miqt_string = C.QHstsPolicy_host1(this.h, (C.int)(options)) +func (this *QHstsPolicy) HostWithOptions(options qt.QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QHstsPolicy_hostWithOptions(this.h, (C.int)(options)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret diff --git a/qt/network/gen_qhstspolicy.h b/qt/network/gen_qhstspolicy.h index cc19b5cd..1cc0b4a5 100644 --- a/qt/network/gen_qhstspolicy.h +++ b/qt/network/gen_qhstspolicy.h @@ -36,7 +36,7 @@ void QHstsPolicy_setIncludesSubDomains(QHstsPolicy* self, bool include); bool QHstsPolicy_includesSubDomains(const QHstsPolicy* self); bool QHstsPolicy_isExpired(const QHstsPolicy* self); void QHstsPolicy_setHost2(QHstsPolicy* self, struct miqt_string host, int mode); -struct miqt_string QHstsPolicy_host1(const QHstsPolicy* self, int options); +struct miqt_string QHstsPolicy_hostWithOptions(const QHstsPolicy* self, int options); void QHstsPolicy_delete(QHstsPolicy* self); #ifdef __cplusplus diff --git a/qt/network/gen_qlocalserver.cpp b/qt/network/gen_qlocalserver.cpp index a0a8bd32..5a2abb27 100644 --- a/qt/network/gen_qlocalserver.cpp +++ b/qt/network/gen_qlocalserver.cpp @@ -426,7 +426,7 @@ struct miqt_string QLocalServer_trUtf83(const char* s, const char* c, int n) { return _ms; } -bool QLocalServer_waitForNewConnection1(QLocalServer* self, int msec) { +bool QLocalServer_waitForNewConnectionWithMsec(QLocalServer* self, int msec) { return self->waitForNewConnection(static_cast(msec)); } diff --git a/qt/network/gen_qlocalserver.go b/qt/network/gen_qlocalserver.go index 4f016139..7acd6756 100644 --- a/qt/network/gen_qlocalserver.go +++ b/qt/network/gen_qlocalserver.go @@ -247,8 +247,8 @@ func QLocalServer_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QLocalServer) WaitForNewConnection1(msec int) bool { - return (bool)(C.QLocalServer_waitForNewConnection1(this.h, (C.int)(msec))) +func (this *QLocalServer) WaitForNewConnectionWithMsec(msec int) bool { + return (bool)(C.QLocalServer_waitForNewConnectionWithMsec(this.h, (C.int)(msec))) } func (this *QLocalServer) WaitForNewConnection2(msec int, timedOut *bool) bool { diff --git a/qt/network/gen_qlocalserver.h b/qt/network/gen_qlocalserver.h index 9fa25ff2..f5798091 100644 --- a/qt/network/gen_qlocalserver.h +++ b/qt/network/gen_qlocalserver.h @@ -65,7 +65,7 @@ struct miqt_string QLocalServer_tr2(const char* s, const char* c); struct miqt_string QLocalServer_tr3(const char* s, const char* c, int n); struct miqt_string QLocalServer_trUtf82(const char* s, const char* c); struct miqt_string QLocalServer_trUtf83(const char* s, const char* c, int n); -bool QLocalServer_waitForNewConnection1(QLocalServer* self, int msec); +bool QLocalServer_waitForNewConnectionWithMsec(QLocalServer* self, int msec); bool QLocalServer_waitForNewConnection2(QLocalServer* self, int msec, bool* timedOut); bool QLocalServer_override_virtual_hasPendingConnections(void* self, intptr_t slot); bool QLocalServer_virtualbase_hasPendingConnections(const void* self); diff --git a/qt/network/gen_qlocalsocket.cpp b/qt/network/gen_qlocalsocket.cpp index 5bf07d43..a1ff146c 100644 --- a/qt/network/gen_qlocalsocket.cpp +++ b/qt/network/gen_qlocalsocket.cpp @@ -753,7 +753,7 @@ struct miqt_string QLocalSocket_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QLocalSocket_connectToServer1(QLocalSocket* self, int openMode) { +void QLocalSocket_connectToServerWithOpenMode(QLocalSocket* self, int openMode) { self->connectToServer(static_cast(openMode)); } @@ -770,11 +770,11 @@ bool QLocalSocket_setSocketDescriptor3(QLocalSocket* self, intptr_t socketDescri return self->setSocketDescriptor((qintptr)(socketDescriptor), static_cast(socketState), static_cast(openMode)); } -bool QLocalSocket_waitForConnected1(QLocalSocket* self, int msecs) { +bool QLocalSocket_waitForConnectedWithMsecs(QLocalSocket* self, int msecs) { return self->waitForConnected(static_cast(msecs)); } -bool QLocalSocket_waitForDisconnected1(QLocalSocket* self, int msecs) { +bool QLocalSocket_waitForDisconnectedWithMsecs(QLocalSocket* self, int msecs) { return self->waitForDisconnected(static_cast(msecs)); } diff --git a/qt/network/gen_qlocalsocket.go b/qt/network/gen_qlocalsocket.go index e4852a37..8b17ddc3 100644 --- a/qt/network/gen_qlocalsocket.go +++ b/qt/network/gen_qlocalsocket.go @@ -368,8 +368,8 @@ func QLocalSocket_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QLocalSocket) ConnectToServer1(openMode qt.QIODevice__OpenModeFlag) { - C.QLocalSocket_connectToServer1(this.h, (C.int)(openMode)) +func (this *QLocalSocket) ConnectToServerWithOpenMode(openMode qt.QIODevice__OpenModeFlag) { + C.QLocalSocket_connectToServerWithOpenMode(this.h, (C.int)(openMode)) } func (this *QLocalSocket) ConnectToServer2(name string, openMode qt.QIODevice__OpenModeFlag) { @@ -388,12 +388,12 @@ func (this *QLocalSocket) SetSocketDescriptor3(socketDescriptor uintptr, socketS return (bool)(C.QLocalSocket_setSocketDescriptor3(this.h, (C.intptr_t)(socketDescriptor), (C.int)(socketState), (C.int)(openMode))) } -func (this *QLocalSocket) WaitForConnected1(msecs int) bool { - return (bool)(C.QLocalSocket_waitForConnected1(this.h, (C.int)(msecs))) +func (this *QLocalSocket) WaitForConnectedWithMsecs(msecs int) bool { + return (bool)(C.QLocalSocket_waitForConnectedWithMsecs(this.h, (C.int)(msecs))) } -func (this *QLocalSocket) WaitForDisconnected1(msecs int) bool { - return (bool)(C.QLocalSocket_waitForDisconnected1(this.h, (C.int)(msecs))) +func (this *QLocalSocket) WaitForDisconnectedWithMsecs(msecs int) bool { + return (bool)(C.QLocalSocket_waitForDisconnectedWithMsecs(this.h, (C.int)(msecs))) } // SetOpenMode can only be called from a QLocalSocket that was directly constructed. diff --git a/qt/network/gen_qlocalsocket.h b/qt/network/gen_qlocalsocket.h index eed3c18c..29743aeb 100644 --- a/qt/network/gen_qlocalsocket.h +++ b/qt/network/gen_qlocalsocket.h @@ -82,12 +82,12 @@ struct miqt_string QLocalSocket_tr2(const char* s, const char* c); struct miqt_string QLocalSocket_tr3(const char* s, const char* c, int n); struct miqt_string QLocalSocket_trUtf82(const char* s, const char* c); struct miqt_string QLocalSocket_trUtf83(const char* s, const char* c, int n); -void QLocalSocket_connectToServer1(QLocalSocket* self, int openMode); +void QLocalSocket_connectToServerWithOpenMode(QLocalSocket* self, int openMode); void QLocalSocket_connectToServer2(QLocalSocket* self, struct miqt_string name, int openMode); bool QLocalSocket_setSocketDescriptor2(QLocalSocket* self, intptr_t socketDescriptor, int socketState); bool QLocalSocket_setSocketDescriptor3(QLocalSocket* self, intptr_t socketDescriptor, int socketState, int openMode); -bool QLocalSocket_waitForConnected1(QLocalSocket* self, int msecs); -bool QLocalSocket_waitForDisconnected1(QLocalSocket* self, int msecs); +bool QLocalSocket_waitForConnectedWithMsecs(QLocalSocket* self, int msecs); +bool QLocalSocket_waitForDisconnectedWithMsecs(QLocalSocket* self, int msecs); bool QLocalSocket_override_virtual_isSequential(void* self, intptr_t slot); bool QLocalSocket_virtualbase_isSequential(const void* self); bool QLocalSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); diff --git a/qt/network/gen_qnetworkaccessmanager.cpp b/qt/network/gen_qnetworkaccessmanager.cpp index 0afe992f..515d64c9 100644 --- a/qt/network/gen_qnetworkaccessmanager.cpp +++ b/qt/network/gen_qnetworkaccessmanager.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "gen_qnetworkaccessmanager.h" @@ -447,7 +448,7 @@ void QNetworkAccessManager_connectToHostEncrypted(QNetworkAccessManager* self, s self->connectToHostEncrypted(hostName_QString); } -void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration, struct miqt_string peerName) { +void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration, struct miqt_string peerName) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString peerName_QString = QString::fromUtf8(peerName.data, peerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), *sslConfiguration, peerName_QString); @@ -641,27 +642,27 @@ void QNetworkAccessManager_enableStrictTransportSecurityStore2(QNetworkAccessMan self->enableStrictTransportSecurityStore(enabled, storeDir_QString); } -QNetworkReply* QNetworkAccessManager_sendCustomRequest32(QNetworkAccessManager* self, QNetworkRequest* request, struct miqt_string verb, QIODevice* data) { +QNetworkReply* QNetworkAccessManager_sendCustomRequest4(QNetworkAccessManager* self, QNetworkRequest* request, struct miqt_string verb, QIODevice* data) { QByteArray verb_QByteArray(verb.data, verb.len); return self->sendCustomRequest(*request, verb_QByteArray, data); } -void QNetworkAccessManager_connectToHostEncrypted22(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port) { +void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port)); } -void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration) { +void QNetworkAccessManager_connectToHostEncrypted4(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), *sslConfiguration); } -void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port) { +void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHost(hostName_QString, static_cast(port)); } -void QNetworkAccessManager_setTransferTimeout1(QNetworkAccessManager* self, int timeout) { +void QNetworkAccessManager_setTransferTimeoutWithTimeout(QNetworkAccessManager* self, int timeout) { self->setTransferTimeout(static_cast(timeout)); } diff --git a/qt/network/gen_qnetworkaccessmanager.go b/qt/network/gen_qnetworkaccessmanager.go index 0e45b67b..d23473c7 100644 --- a/qt/network/gen_qnetworkaccessmanager.go +++ b/qt/network/gen_qnetworkaccessmanager.go @@ -335,7 +335,7 @@ func (this *QNetworkAccessManager) ConnectToHostEncrypted2(hostName string, port peerName_ms.data = C.CString(peerName) peerName_ms.len = C.size_t(len(peerName)) defer C.free(unsafe.Pointer(peerName_ms.data)) - C.QNetworkAccessManager_connectToHostEncrypted2(this.h, hostName_ms, (C.uint16_t)(port), sslConfiguration.cPointer(), peerName_ms) + C.QNetworkAccessManager_connectToHostEncrypted2(this.h, hostName_ms, (C.ushort)(port), sslConfiguration.cPointer(), peerName_ms) } func (this *QNetworkAccessManager) ConnectToHost(hostName string) { @@ -601,7 +601,7 @@ func (this *QNetworkAccessManager) EnableStrictTransportSecurityStore2(enabled b C.QNetworkAccessManager_enableStrictTransportSecurityStore2(this.h, (C.bool)(enabled), storeDir_ms) } -func (this *QNetworkAccessManager) SendCustomRequest32(request *QNetworkRequest, verb []byte, data *qt.QIODevice) *QNetworkReply { +func (this *QNetworkAccessManager) SendCustomRequest4(request *QNetworkRequest, verb []byte, data *qt.QIODevice) *QNetworkReply { verb_alias := C.struct_miqt_string{} if len(verb) > 0 { verb_alias.data = (*C.char)(unsafe.Pointer(&verb[0])) @@ -609,23 +609,23 @@ func (this *QNetworkAccessManager) SendCustomRequest32(request *QNetworkRequest, verb_alias.data = (*C.char)(unsafe.Pointer(nil)) } verb_alias.len = C.size_t(len(verb)) - return newQNetworkReply(C.QNetworkAccessManager_sendCustomRequest32(this.h, request.cPointer(), verb_alias, (*C.QIODevice)(data.UnsafePointer()))) + return newQNetworkReply(C.QNetworkAccessManager_sendCustomRequest4(this.h, request.cPointer(), verb_alias, (*C.QIODevice)(data.UnsafePointer()))) } -func (this *QNetworkAccessManager) ConnectToHostEncrypted22(hostName string, port uint16) { +func (this *QNetworkAccessManager) ConnectToHostEncrypted3(hostName string, port uint16) { hostName_ms := C.struct_miqt_string{} hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QNetworkAccessManager_connectToHostEncrypted22(this.h, hostName_ms, (C.uint16_t)(port)) + C.QNetworkAccessManager_connectToHostEncrypted3(this.h, hostName_ms, (C.ushort)(port)) } -func (this *QNetworkAccessManager) ConnectToHostEncrypted3(hostName string, port uint16, sslConfiguration *QSslConfiguration) { +func (this *QNetworkAccessManager) ConnectToHostEncrypted4(hostName string, port uint16, sslConfiguration *QSslConfiguration) { hostName_ms := C.struct_miqt_string{} hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QNetworkAccessManager_connectToHostEncrypted3(this.h, hostName_ms, (C.uint16_t)(port), sslConfiguration.cPointer()) + C.QNetworkAccessManager_connectToHostEncrypted4(this.h, hostName_ms, (C.ushort)(port), sslConfiguration.cPointer()) } func (this *QNetworkAccessManager) ConnectToHost2(hostName string, port uint16) { @@ -633,11 +633,11 @@ func (this *QNetworkAccessManager) ConnectToHost2(hostName string, port uint16) hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QNetworkAccessManager_connectToHost2(this.h, hostName_ms, (C.uint16_t)(port)) + C.QNetworkAccessManager_connectToHost2(this.h, hostName_ms, (C.ushort)(port)) } -func (this *QNetworkAccessManager) SetTransferTimeout1(timeout int) { - C.QNetworkAccessManager_setTransferTimeout1(this.h, (C.int)(timeout)) +func (this *QNetworkAccessManager) SetTransferTimeoutWithTimeout(timeout int) { + C.QNetworkAccessManager_setTransferTimeoutWithTimeout(this.h, (C.int)(timeout)) } // SupportedSchemesImplementation can only be called from a QNetworkAccessManager that was directly constructed. diff --git a/qt/network/gen_qnetworkaccessmanager.h b/qt/network/gen_qnetworkaccessmanager.h index 9104834e..8537145a 100644 --- a/qt/network/gen_qnetworkaccessmanager.h +++ b/qt/network/gen_qnetworkaccessmanager.h @@ -102,7 +102,7 @@ QNetworkConfiguration* QNetworkAccessManager_activeConfiguration(const QNetworkA void QNetworkAccessManager_setNetworkAccessible(QNetworkAccessManager* self, int accessible); int QNetworkAccessManager_networkAccessible(const QNetworkAccessManager* self); void QNetworkAccessManager_connectToHostEncrypted(QNetworkAccessManager* self, struct miqt_string hostName); -void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration, struct miqt_string peerName); +void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration, struct miqt_string peerName); void QNetworkAccessManager_connectToHost(QNetworkAccessManager* self, struct miqt_string hostName); void QNetworkAccessManager_setRedirectPolicy(QNetworkAccessManager* self, int policy); int QNetworkAccessManager_redirectPolicy(const QNetworkAccessManager* self); @@ -132,11 +132,11 @@ struct miqt_string QNetworkAccessManager_tr3(const char* s, const char* c, int n struct miqt_string QNetworkAccessManager_trUtf82(const char* s, const char* c); struct miqt_string QNetworkAccessManager_trUtf83(const char* s, const char* c, int n); void QNetworkAccessManager_enableStrictTransportSecurityStore2(QNetworkAccessManager* self, bool enabled, struct miqt_string storeDir); -QNetworkReply* QNetworkAccessManager_sendCustomRequest32(QNetworkAccessManager* self, QNetworkRequest* request, struct miqt_string verb, QIODevice* data); -void QNetworkAccessManager_connectToHostEncrypted22(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port); -void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration); -void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port); -void QNetworkAccessManager_setTransferTimeout1(QNetworkAccessManager* self, int timeout); +QNetworkReply* QNetworkAccessManager_sendCustomRequest4(QNetworkAccessManager* self, QNetworkRequest* request, struct miqt_string verb, QIODevice* data); +void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port); +void QNetworkAccessManager_connectToHostEncrypted4(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration); +void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port); +void QNetworkAccessManager_setTransferTimeoutWithTimeout(QNetworkAccessManager* self, int timeout); bool QNetworkAccessManager_override_virtual_createRequest(void* self, intptr_t slot); QNetworkReply* QNetworkAccessManager_virtualbase_createRequest(void* self, int op, QNetworkRequest* request, QIODevice* outgoingData); bool QNetworkAccessManager_override_virtual_event(void* self, intptr_t slot); diff --git a/qt/network/gen_qnetworkconfigmanager.cpp b/qt/network/gen_qnetworkconfigmanager.cpp index 52374074..e64a8932 100644 --- a/qt/network/gen_qnetworkconfigmanager.cpp +++ b/qt/network/gen_qnetworkconfigmanager.cpp @@ -365,7 +365,7 @@ struct miqt_string QNetworkConfigurationManager_trUtf83(const char* s, const cha return _ms; } -struct miqt_array /* of QNetworkConfiguration* */ QNetworkConfigurationManager_allConfigurations1(const QNetworkConfigurationManager* self, int flags) { +struct miqt_array /* of QNetworkConfiguration* */ QNetworkConfigurationManager_allConfigurationsWithFlags(const QNetworkConfigurationManager* self, int flags) { QList _ret = self->allConfigurations(static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory QNetworkConfiguration** _arr = static_cast(malloc(sizeof(QNetworkConfiguration*) * _ret.length())); diff --git a/qt/network/gen_qnetworkconfigmanager.go b/qt/network/gen_qnetworkconfigmanager.go index 94f36c6d..07d17d0f 100644 --- a/qt/network/gen_qnetworkconfigmanager.go +++ b/qt/network/gen_qnetworkconfigmanager.go @@ -284,8 +284,8 @@ func QNetworkConfigurationManager_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QNetworkConfigurationManager) AllConfigurations1(flags QNetworkConfiguration__StateFlag) []QNetworkConfiguration { - var _ma C.struct_miqt_array = C.QNetworkConfigurationManager_allConfigurations1(this.h, (C.int)(flags)) +func (this *QNetworkConfigurationManager) AllConfigurationsWithFlags(flags QNetworkConfiguration__StateFlag) []QNetworkConfiguration { + var _ma C.struct_miqt_array = C.QNetworkConfigurationManager_allConfigurationsWithFlags(this.h, (C.int)(flags)) _ret := make([]QNetworkConfiguration, int(_ma.len)) _outCast := (*[0xffff]*C.QNetworkConfiguration)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/network/gen_qnetworkconfigmanager.h b/qt/network/gen_qnetworkconfigmanager.h index ffd42c3f..f22aa48a 100644 --- a/qt/network/gen_qnetworkconfigmanager.h +++ b/qt/network/gen_qnetworkconfigmanager.h @@ -61,7 +61,7 @@ struct miqt_string QNetworkConfigurationManager_tr2(const char* s, const char* c struct miqt_string QNetworkConfigurationManager_tr3(const char* s, const char* c, int n); struct miqt_string QNetworkConfigurationManager_trUtf82(const char* s, const char* c); struct miqt_string QNetworkConfigurationManager_trUtf83(const char* s, const char* c, int n); -struct miqt_array /* of QNetworkConfiguration* */ QNetworkConfigurationManager_allConfigurations1(const QNetworkConfigurationManager* self, int flags); +struct miqt_array /* of QNetworkConfiguration* */ QNetworkConfigurationManager_allConfigurationsWithFlags(const QNetworkConfigurationManager* self, int flags); bool QNetworkConfigurationManager_override_virtual_event(void* self, intptr_t slot); bool QNetworkConfigurationManager_virtualbase_event(void* self, QEvent* event); bool QNetworkConfigurationManager_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt/network/gen_qnetworkcookie.cpp b/qt/network/gen_qnetworkcookie.cpp index 10bcf0fe..a7665d1b 100644 --- a/qt/network/gen_qnetworkcookie.cpp +++ b/qt/network/gen_qnetworkcookie.cpp @@ -171,7 +171,7 @@ struct miqt_array /* of QNetworkCookie* */ QNetworkCookie_parseCookies(struct m return _out; } -struct miqt_string QNetworkCookie_toRawForm1(const QNetworkCookie* self, int form) { +struct miqt_string QNetworkCookie_toRawFormWithForm(const QNetworkCookie* self, int form) { QByteArray _qb = self->toRawForm(static_cast(form)); struct miqt_string _ms; _ms.len = _qb.length(); diff --git a/qt/network/gen_qnetworkcookie.go b/qt/network/gen_qnetworkcookie.go index 56e9deb3..1b52b751 100644 --- a/qt/network/gen_qnetworkcookie.go +++ b/qt/network/gen_qnetworkcookie.go @@ -244,8 +244,8 @@ func QNetworkCookie_ParseCookies(cookieString []byte) []QNetworkCookie { return _ret } -func (this *QNetworkCookie) ToRawForm1(form QNetworkCookie__RawForm) []byte { - var _bytearray C.struct_miqt_string = C.QNetworkCookie_toRawForm1(this.h, (C.int)(form)) +func (this *QNetworkCookie) ToRawFormWithForm(form QNetworkCookie__RawForm) []byte { + var _bytearray C.struct_miqt_string = C.QNetworkCookie_toRawFormWithForm(this.h, (C.int)(form)) _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) C.free(unsafe.Pointer(_bytearray.data)) return _ret diff --git a/qt/network/gen_qnetworkcookie.h b/qt/network/gen_qnetworkcookie.h index 896ebe3a..392f7c1d 100644 --- a/qt/network/gen_qnetworkcookie.h +++ b/qt/network/gen_qnetworkcookie.h @@ -51,7 +51,7 @@ struct miqt_string QNetworkCookie_toRawForm(const QNetworkCookie* self); bool QNetworkCookie_hasSameIdentifier(const QNetworkCookie* self, QNetworkCookie* other); void QNetworkCookie_normalize(QNetworkCookie* self, QUrl* url); struct miqt_array /* of QNetworkCookie* */ QNetworkCookie_parseCookies(struct miqt_string cookieString); -struct miqt_string QNetworkCookie_toRawForm1(const QNetworkCookie* self, int form); +struct miqt_string QNetworkCookie_toRawFormWithForm(const QNetworkCookie* self, int form); void QNetworkCookie_delete(QNetworkCookie* self); #ifdef __cplusplus diff --git a/qt/network/gen_qnetworkdatagram.cpp b/qt/network/gen_qnetworkdatagram.cpp index 9987452c..594b1349 100644 --- a/qt/network/gen_qnetworkdatagram.cpp +++ b/qt/network/gen_qnetworkdatagram.cpp @@ -30,7 +30,7 @@ QNetworkDatagram* QNetworkDatagram_new4(struct miqt_string data, QHostAddress* d return new QNetworkDatagram(data_QByteArray, *destinationAddress); } -QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, uint16_t port) { +QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, unsigned short port) { QByteArray data_QByteArray(data.data, data.len); return new QNetworkDatagram(data_QByteArray, *destinationAddress, static_cast(port)); } @@ -84,7 +84,7 @@ void QNetworkDatagram_setSender(QNetworkDatagram* self, QHostAddress* address) { self->setSender(*address); } -void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, uint16_t port) { +void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, unsigned short port) { self->setDestination(*address, static_cast(port)); } @@ -115,7 +115,7 @@ QNetworkDatagram* QNetworkDatagram_makeReply(const QNetworkDatagram* self, struc return new QNetworkDatagram(self->makeReply(payload_QByteArray)); } -void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, uint16_t port) { +void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, unsigned short port) { self->setSender(*address, static_cast(port)); } diff --git a/qt/network/gen_qnetworkdatagram.go b/qt/network/gen_qnetworkdatagram.go index 156b85bd..b3fafe93 100644 --- a/qt/network/gen_qnetworkdatagram.go +++ b/qt/network/gen_qnetworkdatagram.go @@ -93,7 +93,7 @@ func NewQNetworkDatagram5(data []byte, destinationAddress *QHostAddress, port ui } data_alias.len = C.size_t(len(data)) - return newQNetworkDatagram(C.QNetworkDatagram_new5(data_alias, destinationAddress.cPointer(), (C.uint16_t)(port))) + return newQNetworkDatagram(C.QNetworkDatagram_new5(data_alias, destinationAddress.cPointer(), (C.ushort)(port))) } func (this *QNetworkDatagram) OperatorAssign(other *QNetworkDatagram) { @@ -149,7 +149,7 @@ func (this *QNetworkDatagram) SetSender(address *QHostAddress) { } func (this *QNetworkDatagram) SetDestination(address *QHostAddress, port uint16) { - C.QNetworkDatagram_setDestination(this.h, address.cPointer(), (C.uint16_t)(port)) + C.QNetworkDatagram_setDestination(this.h, address.cPointer(), (C.ushort)(port)) } func (this *QNetworkDatagram) HopLimit() int { @@ -192,7 +192,7 @@ func (this *QNetworkDatagram) MakeReply(payload []byte) *QNetworkDatagram { } func (this *QNetworkDatagram) SetSender2(address *QHostAddress, port uint16) { - C.QNetworkDatagram_setSender2(this.h, address.cPointer(), (C.uint16_t)(port)) + C.QNetworkDatagram_setSender2(this.h, address.cPointer(), (C.ushort)(port)) } // Delete this object from C++ memory. diff --git a/qt/network/gen_qnetworkdatagram.h b/qt/network/gen_qnetworkdatagram.h index ec1af83f..0b49c30e 100644 --- a/qt/network/gen_qnetworkdatagram.h +++ b/qt/network/gen_qnetworkdatagram.h @@ -26,7 +26,7 @@ QNetworkDatagram* QNetworkDatagram_new(); QNetworkDatagram* QNetworkDatagram_new2(struct miqt_string data); QNetworkDatagram* QNetworkDatagram_new3(QNetworkDatagram* other); QNetworkDatagram* QNetworkDatagram_new4(struct miqt_string data, QHostAddress* destinationAddress); -QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, uint16_t port); +QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, unsigned short port); void QNetworkDatagram_operatorAssign(QNetworkDatagram* self, QNetworkDatagram* other); void QNetworkDatagram_swap(QNetworkDatagram* self, QNetworkDatagram* other); void QNetworkDatagram_clear(QNetworkDatagram* self); @@ -39,13 +39,13 @@ QHostAddress* QNetworkDatagram_destinationAddress(const QNetworkDatagram* self); int QNetworkDatagram_senderPort(const QNetworkDatagram* self); int QNetworkDatagram_destinationPort(const QNetworkDatagram* self); void QNetworkDatagram_setSender(QNetworkDatagram* self, QHostAddress* address); -void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, uint16_t port); +void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, unsigned short port); int QNetworkDatagram_hopLimit(const QNetworkDatagram* self); void QNetworkDatagram_setHopLimit(QNetworkDatagram* self, int count); struct miqt_string QNetworkDatagram_data(const QNetworkDatagram* self); void QNetworkDatagram_setData(QNetworkDatagram* self, struct miqt_string data); QNetworkDatagram* QNetworkDatagram_makeReply(const QNetworkDatagram* self, struct miqt_string payload); -void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, uint16_t port); +void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, unsigned short port); void QNetworkDatagram_delete(QNetworkDatagram* self); #ifdef __cplusplus diff --git a/qt/network/gen_qnetworkproxy.cpp b/qt/network/gen_qnetworkproxy.cpp index a32d64a9..1c5e9aa0 100644 --- a/qt/network/gen_qnetworkproxy.cpp +++ b/qt/network/gen_qnetworkproxy.cpp @@ -34,7 +34,7 @@ QNetworkProxyQuery* QNetworkProxyQuery_new3(struct miqt_string hostname, int por return new QNetworkProxyQuery(hostname_QString, static_cast(port)); } -QNetworkProxyQuery* QNetworkProxyQuery_new4(uint16_t bindPort) { +QNetworkProxyQuery* QNetworkProxyQuery_new4(unsigned short bindPort) { return new QNetworkProxyQuery(static_cast(bindPort)); } @@ -47,7 +47,7 @@ QNetworkProxyQuery* QNetworkProxyQuery_new6(QNetworkConfiguration* networkConfig return new QNetworkProxyQuery(*networkConfiguration, hostname_QString, static_cast(port)); } -QNetworkProxyQuery* QNetworkProxyQuery_new7(QNetworkConfiguration* networkConfiguration, uint16_t bindPort) { +QNetworkProxyQuery* QNetworkProxyQuery_new7(QNetworkConfiguration* networkConfiguration, unsigned short bindPort) { return new QNetworkProxyQuery(*networkConfiguration, static_cast(bindPort)); } @@ -71,12 +71,12 @@ QNetworkProxyQuery* QNetworkProxyQuery_new11(struct miqt_string hostname, int po return new QNetworkProxyQuery(hostname_QString, static_cast(port), protocolTag_QString, static_cast(queryType)); } -QNetworkProxyQuery* QNetworkProxyQuery_new12(uint16_t bindPort, struct miqt_string protocolTag) { +QNetworkProxyQuery* QNetworkProxyQuery_new12(unsigned short bindPort, struct miqt_string protocolTag) { QString protocolTag_QString = QString::fromUtf8(protocolTag.data, protocolTag.len); return new QNetworkProxyQuery(static_cast(bindPort), protocolTag_QString); } -QNetworkProxyQuery* QNetworkProxyQuery_new13(uint16_t bindPort, struct miqt_string protocolTag, int queryType) { +QNetworkProxyQuery* QNetworkProxyQuery_new13(unsigned short bindPort, struct miqt_string protocolTag, int queryType) { QString protocolTag_QString = QString::fromUtf8(protocolTag.data, protocolTag.len); return new QNetworkProxyQuery(static_cast(bindPort), protocolTag_QString, static_cast(queryType)); } @@ -97,12 +97,12 @@ QNetworkProxyQuery* QNetworkProxyQuery_new16(QNetworkConfiguration* networkConfi return new QNetworkProxyQuery(*networkConfiguration, hostname_QString, static_cast(port), protocolTag_QString, static_cast(queryType)); } -QNetworkProxyQuery* QNetworkProxyQuery_new17(QNetworkConfiguration* networkConfiguration, uint16_t bindPort, struct miqt_string protocolTag) { +QNetworkProxyQuery* QNetworkProxyQuery_new17(QNetworkConfiguration* networkConfiguration, unsigned short bindPort, struct miqt_string protocolTag) { QString protocolTag_QString = QString::fromUtf8(protocolTag.data, protocolTag.len); return new QNetworkProxyQuery(*networkConfiguration, static_cast(bindPort), protocolTag_QString); } -QNetworkProxyQuery* QNetworkProxyQuery_new18(QNetworkConfiguration* networkConfiguration, uint16_t bindPort, struct miqt_string protocolTag, int queryType) { +QNetworkProxyQuery* QNetworkProxyQuery_new18(QNetworkConfiguration* networkConfiguration, unsigned short bindPort, struct miqt_string protocolTag, int queryType) { QString protocolTag_QString = QString::fromUtf8(protocolTag.data, protocolTag.len); return new QNetworkProxyQuery(*networkConfiguration, static_cast(bindPort), protocolTag_QString, static_cast(queryType)); } @@ -217,18 +217,18 @@ QNetworkProxy* QNetworkProxy_new4(int type, struct miqt_string hostName) { return new QNetworkProxy(static_cast(type), hostName_QString); } -QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, uint16_t port) { +QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); return new QNetworkProxy(static_cast(type), hostName_QString, static_cast(port)); } -QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user) { +QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString user_QString = QString::fromUtf8(user.data, user.len); return new QNetworkProxy(static_cast(type), hostName_QString, static_cast(port), user_QString); } -QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user, struct miqt_string password) { +QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user, struct miqt_string password) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString user_QString = QString::fromUtf8(user.data, user.len); QString password_QString = QString::fromUtf8(password.data, password.len); @@ -325,13 +325,13 @@ struct miqt_string QNetworkProxy_hostName(const QNetworkProxy* self) { return _ms; } -void QNetworkProxy_setPort(QNetworkProxy* self, uint16_t port) { +void QNetworkProxy_setPort(QNetworkProxy* self, unsigned short port) { self->setPort(static_cast(port)); } -uint16_t QNetworkProxy_port(const QNetworkProxy* self) { +unsigned short QNetworkProxy_port(const QNetworkProxy* self) { quint16 _ret = self->port(); - return static_cast(_ret); + return static_cast(_ret); } void QNetworkProxy_setApplicationProxy(QNetworkProxy* proxy) { @@ -485,7 +485,7 @@ void QNetworkProxyFactory_operatorAssign(QNetworkProxyFactory* self, QNetworkPro self->operator=(*param1); } -struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_systemProxyForQuery1(QNetworkProxyQuery* query) { +struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_systemProxyForQueryWithQuery(QNetworkProxyQuery* query) { QList _ret = QNetworkProxyFactory::systemProxyForQuery(*query); // Convert QList<> from C++ memory to manually-managed C memory QNetworkProxy** _arr = static_cast(malloc(sizeof(QNetworkProxy*) * _ret.length())); diff --git a/qt/network/gen_qnetworkproxy.go b/qt/network/gen_qnetworkproxy.go index 9ca475d8..c5a587cc 100644 --- a/qt/network/gen_qnetworkproxy.go +++ b/qt/network/gen_qnetworkproxy.go @@ -106,7 +106,7 @@ func NewQNetworkProxyQuery3(hostname string, port int) *QNetworkProxyQuery { // NewQNetworkProxyQuery4 constructs a new QNetworkProxyQuery object. func NewQNetworkProxyQuery4(bindPort uint16) *QNetworkProxyQuery { - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new4((C.uint16_t)(bindPort))) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new4((C.ushort)(bindPort))) } // NewQNetworkProxyQuery5 constructs a new QNetworkProxyQuery object. @@ -128,7 +128,7 @@ func NewQNetworkProxyQuery6(networkConfiguration *QNetworkConfiguration, hostnam // NewQNetworkProxyQuery7 constructs a new QNetworkProxyQuery object. func NewQNetworkProxyQuery7(networkConfiguration *QNetworkConfiguration, bindPort uint16) *QNetworkProxyQuery { - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new7(networkConfiguration.cPointer(), (C.uint16_t)(bindPort))) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new7(networkConfiguration.cPointer(), (C.ushort)(bindPort))) } // NewQNetworkProxyQuery8 constructs a new QNetworkProxyQuery object. @@ -178,7 +178,7 @@ func NewQNetworkProxyQuery12(bindPort uint16, protocolTag string) *QNetworkProxy protocolTag_ms.len = C.size_t(len(protocolTag)) defer C.free(unsafe.Pointer(protocolTag_ms.data)) - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new12((C.uint16_t)(bindPort), protocolTag_ms)) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new12((C.ushort)(bindPort), protocolTag_ms)) } // NewQNetworkProxyQuery13 constructs a new QNetworkProxyQuery object. @@ -188,7 +188,7 @@ func NewQNetworkProxyQuery13(bindPort uint16, protocolTag string, queryType QNet protocolTag_ms.len = C.size_t(len(protocolTag)) defer C.free(unsafe.Pointer(protocolTag_ms.data)) - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new13((C.uint16_t)(bindPort), protocolTag_ms, (C.int)(queryType))) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new13((C.ushort)(bindPort), protocolTag_ms, (C.int)(queryType))) } // NewQNetworkProxyQuery14 constructs a new QNetworkProxyQuery object. @@ -232,7 +232,7 @@ func NewQNetworkProxyQuery17(networkConfiguration *QNetworkConfiguration, bindPo protocolTag_ms.len = C.size_t(len(protocolTag)) defer C.free(unsafe.Pointer(protocolTag_ms.data)) - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new17(networkConfiguration.cPointer(), (C.uint16_t)(bindPort), protocolTag_ms)) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new17(networkConfiguration.cPointer(), (C.ushort)(bindPort), protocolTag_ms)) } // NewQNetworkProxyQuery18 constructs a new QNetworkProxyQuery object. @@ -242,7 +242,7 @@ func NewQNetworkProxyQuery18(networkConfiguration *QNetworkConfiguration, bindPo protocolTag_ms.len = C.size_t(len(protocolTag)) defer C.free(unsafe.Pointer(protocolTag_ms.data)) - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new18(networkConfiguration.cPointer(), (C.uint16_t)(bindPort), protocolTag_ms, (C.int)(queryType))) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new18(networkConfiguration.cPointer(), (C.ushort)(bindPort), protocolTag_ms, (C.int)(queryType))) } func (this *QNetworkProxyQuery) OperatorAssign(other *QNetworkProxyQuery) { @@ -416,7 +416,7 @@ func NewQNetworkProxy5(typeVal QNetworkProxy__ProxyType, hostName string, port u hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - return newQNetworkProxy(C.QNetworkProxy_new5((C.int)(typeVal), hostName_ms, (C.uint16_t)(port))) + return newQNetworkProxy(C.QNetworkProxy_new5((C.int)(typeVal), hostName_ms, (C.ushort)(port))) } // NewQNetworkProxy6 constructs a new QNetworkProxy object. @@ -430,7 +430,7 @@ func NewQNetworkProxy6(typeVal QNetworkProxy__ProxyType, hostName string, port u user_ms.len = C.size_t(len(user)) defer C.free(unsafe.Pointer(user_ms.data)) - return newQNetworkProxy(C.QNetworkProxy_new6((C.int)(typeVal), hostName_ms, (C.uint16_t)(port), user_ms)) + return newQNetworkProxy(C.QNetworkProxy_new6((C.int)(typeVal), hostName_ms, (C.ushort)(port), user_ms)) } // NewQNetworkProxy7 constructs a new QNetworkProxy object. @@ -448,7 +448,7 @@ func NewQNetworkProxy7(typeVal QNetworkProxy__ProxyType, hostName string, port u password_ms.len = C.size_t(len(password)) defer C.free(unsafe.Pointer(password_ms.data)) - return newQNetworkProxy(C.QNetworkProxy_new7((C.int)(typeVal), hostName_ms, (C.uint16_t)(port), user_ms, password_ms)) + return newQNetworkProxy(C.QNetworkProxy_new7((C.int)(typeVal), hostName_ms, (C.ushort)(port), user_ms, password_ms)) } func (this *QNetworkProxy) OperatorAssign(other *QNetworkProxy) { @@ -537,7 +537,7 @@ func (this *QNetworkProxy) HostName() string { } func (this *QNetworkProxy) SetPort(port uint16) { - C.QNetworkProxy_setPort(this.h, (C.uint16_t)(port)) + C.QNetworkProxy_setPort(this.h, (C.ushort)(port)) } func (this *QNetworkProxy) Port() uint16 { @@ -724,8 +724,8 @@ func (this *QNetworkProxyFactory) OperatorAssign(param1 *QNetworkProxyFactory) { C.QNetworkProxyFactory_operatorAssign(this.h, param1.cPointer()) } -func QNetworkProxyFactory_SystemProxyForQuery1(query *QNetworkProxyQuery) []QNetworkProxy { - var _ma C.struct_miqt_array = C.QNetworkProxyFactory_systemProxyForQuery1(query.cPointer()) +func QNetworkProxyFactory_SystemProxyForQueryWithQuery(query *QNetworkProxyQuery) []QNetworkProxy { + var _ma C.struct_miqt_array = C.QNetworkProxyFactory_systemProxyForQueryWithQuery(query.cPointer()) _ret := make([]QNetworkProxy, int(_ma.len)) _outCast := (*[0xffff]*C.QNetworkProxy)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/network/gen_qnetworkproxy.h b/qt/network/gen_qnetworkproxy.h index 5a994c7b..4e54cdf3 100644 --- a/qt/network/gen_qnetworkproxy.h +++ b/qt/network/gen_qnetworkproxy.h @@ -33,21 +33,21 @@ typedef struct QVariant QVariant; QNetworkProxyQuery* QNetworkProxyQuery_new(); QNetworkProxyQuery* QNetworkProxyQuery_new2(QUrl* requestUrl); QNetworkProxyQuery* QNetworkProxyQuery_new3(struct miqt_string hostname, int port); -QNetworkProxyQuery* QNetworkProxyQuery_new4(uint16_t bindPort); +QNetworkProxyQuery* QNetworkProxyQuery_new4(unsigned short bindPort); QNetworkProxyQuery* QNetworkProxyQuery_new5(QNetworkConfiguration* networkConfiguration, QUrl* requestUrl); QNetworkProxyQuery* QNetworkProxyQuery_new6(QNetworkConfiguration* networkConfiguration, struct miqt_string hostname, int port); -QNetworkProxyQuery* QNetworkProxyQuery_new7(QNetworkConfiguration* networkConfiguration, uint16_t bindPort); +QNetworkProxyQuery* QNetworkProxyQuery_new7(QNetworkConfiguration* networkConfiguration, unsigned short bindPort); QNetworkProxyQuery* QNetworkProxyQuery_new8(QNetworkProxyQuery* other); QNetworkProxyQuery* QNetworkProxyQuery_new9(QUrl* requestUrl, int queryType); QNetworkProxyQuery* QNetworkProxyQuery_new10(struct miqt_string hostname, int port, struct miqt_string protocolTag); QNetworkProxyQuery* QNetworkProxyQuery_new11(struct miqt_string hostname, int port, struct miqt_string protocolTag, int queryType); -QNetworkProxyQuery* QNetworkProxyQuery_new12(uint16_t bindPort, struct miqt_string protocolTag); -QNetworkProxyQuery* QNetworkProxyQuery_new13(uint16_t bindPort, struct miqt_string protocolTag, int queryType); +QNetworkProxyQuery* QNetworkProxyQuery_new12(unsigned short bindPort, struct miqt_string protocolTag); +QNetworkProxyQuery* QNetworkProxyQuery_new13(unsigned short bindPort, struct miqt_string protocolTag, int queryType); QNetworkProxyQuery* QNetworkProxyQuery_new14(QNetworkConfiguration* networkConfiguration, QUrl* requestUrl, int queryType); QNetworkProxyQuery* QNetworkProxyQuery_new15(QNetworkConfiguration* networkConfiguration, struct miqt_string hostname, int port, struct miqt_string protocolTag); QNetworkProxyQuery* QNetworkProxyQuery_new16(QNetworkConfiguration* networkConfiguration, struct miqt_string hostname, int port, struct miqt_string protocolTag, int queryType); -QNetworkProxyQuery* QNetworkProxyQuery_new17(QNetworkConfiguration* networkConfiguration, uint16_t bindPort, struct miqt_string protocolTag); -QNetworkProxyQuery* QNetworkProxyQuery_new18(QNetworkConfiguration* networkConfiguration, uint16_t bindPort, struct miqt_string protocolTag, int queryType); +QNetworkProxyQuery* QNetworkProxyQuery_new17(QNetworkConfiguration* networkConfiguration, unsigned short bindPort, struct miqt_string protocolTag); +QNetworkProxyQuery* QNetworkProxyQuery_new18(QNetworkConfiguration* networkConfiguration, unsigned short bindPort, struct miqt_string protocolTag, int queryType); void QNetworkProxyQuery_operatorAssign(QNetworkProxyQuery* self, QNetworkProxyQuery* other); void QNetworkProxyQuery_swap(QNetworkProxyQuery* self, QNetworkProxyQuery* other); bool QNetworkProxyQuery_operatorEqual(const QNetworkProxyQuery* self, QNetworkProxyQuery* other); @@ -72,9 +72,9 @@ QNetworkProxy* QNetworkProxy_new(); QNetworkProxy* QNetworkProxy_new2(int type); QNetworkProxy* QNetworkProxy_new3(QNetworkProxy* other); QNetworkProxy* QNetworkProxy_new4(int type, struct miqt_string hostName); -QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, uint16_t port); -QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user); -QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user, struct miqt_string password); +QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, unsigned short port); +QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user); +QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user, struct miqt_string password); void QNetworkProxy_operatorAssign(QNetworkProxy* self, QNetworkProxy* other); void QNetworkProxy_swap(QNetworkProxy* self, QNetworkProxy* other); bool QNetworkProxy_operatorEqual(const QNetworkProxy* self, QNetworkProxy* other); @@ -91,8 +91,8 @@ void QNetworkProxy_setPassword(QNetworkProxy* self, struct miqt_string password) struct miqt_string QNetworkProxy_password(const QNetworkProxy* self); void QNetworkProxy_setHostName(QNetworkProxy* self, struct miqt_string hostName); struct miqt_string QNetworkProxy_hostName(const QNetworkProxy* self); -void QNetworkProxy_setPort(QNetworkProxy* self, uint16_t port); -uint16_t QNetworkProxy_port(const QNetworkProxy* self); +void QNetworkProxy_setPort(QNetworkProxy* self, unsigned short port); +unsigned short QNetworkProxy_port(const QNetworkProxy* self); void QNetworkProxy_setApplicationProxy(QNetworkProxy* proxy); QNetworkProxy* QNetworkProxy_applicationProxy(); QVariant* QNetworkProxy_header(const QNetworkProxy* self, int header); @@ -111,7 +111,7 @@ void QNetworkProxyFactory_setApplicationProxyFactory(QNetworkProxyFactory* facto struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_proxyForQuery(QNetworkProxyQuery* query); struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_systemProxyForQuery(); void QNetworkProxyFactory_operatorAssign(QNetworkProxyFactory* self, QNetworkProxyFactory* param1); -struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_systemProxyForQuery1(QNetworkProxyQuery* query); +struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_systemProxyForQueryWithQuery(QNetworkProxyQuery* query); bool QNetworkProxyFactory_override_virtual_queryProxy(void* self, intptr_t slot); struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_virtualbase_queryProxy(void* self, QNetworkProxyQuery* query); void QNetworkProxyFactory_delete(QNetworkProxyFactory* self); diff --git a/qt/network/gen_qnetworkrequest.cpp b/qt/network/gen_qnetworkrequest.cpp index e5200a16..994b317f 100644 --- a/qt/network/gen_qnetworkrequest.cpp +++ b/qt/network/gen_qnetworkrequest.cpp @@ -180,7 +180,7 @@ QVariant* QNetworkRequest_attribute2(const QNetworkRequest* self, int code, QVar return new QVariant(self->attribute(static_cast(code), *defaultValue)); } -void QNetworkRequest_setTransferTimeout1(QNetworkRequest* self, int timeout) { +void QNetworkRequest_setTransferTimeoutWithTimeout(QNetworkRequest* self, int timeout) { self->setTransferTimeout(static_cast(timeout)); } diff --git a/qt/network/gen_qnetworkrequest.go b/qt/network/gen_qnetworkrequest.go index 58684bdb..a183964d 100644 --- a/qt/network/gen_qnetworkrequest.go +++ b/qt/network/gen_qnetworkrequest.go @@ -334,8 +334,8 @@ func (this *QNetworkRequest) Attribute2(code QNetworkRequest__Attribute, default return _goptr } -func (this *QNetworkRequest) SetTransferTimeout1(timeout int) { - C.QNetworkRequest_setTransferTimeout1(this.h, (C.int)(timeout)) +func (this *QNetworkRequest) SetTransferTimeoutWithTimeout(timeout int) { + C.QNetworkRequest_setTransferTimeoutWithTimeout(this.h, (C.int)(timeout)) } // Delete this object from C++ memory. diff --git a/qt/network/gen_qnetworkrequest.h b/qt/network/gen_qnetworkrequest.h index fc649a2d..c0016db8 100644 --- a/qt/network/gen_qnetworkrequest.h +++ b/qt/network/gen_qnetworkrequest.h @@ -62,7 +62,7 @@ void QNetworkRequest_setHttp2Configuration(QNetworkRequest* self, QHttp2Configur int QNetworkRequest_transferTimeout(const QNetworkRequest* self); void QNetworkRequest_setTransferTimeout(QNetworkRequest* self); QVariant* QNetworkRequest_attribute2(const QNetworkRequest* self, int code, QVariant* defaultValue); -void QNetworkRequest_setTransferTimeout1(QNetworkRequest* self, int timeout); +void QNetworkRequest_setTransferTimeoutWithTimeout(QNetworkRequest* self, int timeout); void QNetworkRequest_delete(QNetworkRequest* self); #ifdef __cplusplus diff --git a/qt/network/gen_qnetworksession.cpp b/qt/network/gen_qnetworksession.cpp index 2150e041..faf33b2d 100644 --- a/qt/network/gen_qnetworksession.cpp +++ b/qt/network/gen_qnetworksession.cpp @@ -448,7 +448,7 @@ struct miqt_string QNetworkSession_trUtf83(const char* s, const char* c, int n) return _ms; } -bool QNetworkSession_waitForOpened1(QNetworkSession* self, int msecs) { +bool QNetworkSession_waitForOpenedWithMsecs(QNetworkSession* self, int msecs) { return self->waitForOpened(static_cast(msecs)); } diff --git a/qt/network/gen_qnetworksession.go b/qt/network/gen_qnetworksession.go index 98a69ea0..f3998110 100644 --- a/qt/network/gen_qnetworksession.go +++ b/qt/network/gen_qnetworksession.go @@ -394,8 +394,8 @@ func QNetworkSession_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QNetworkSession) WaitForOpened1(msecs int) bool { - return (bool)(C.QNetworkSession_waitForOpened1(this.h, (C.int)(msecs))) +func (this *QNetworkSession) WaitForOpenedWithMsecs(msecs int) bool { + return (bool)(C.QNetworkSession_waitForOpenedWithMsecs(this.h, (C.int)(msecs))) } // Sender can only be called from a QNetworkSession that was directly constructed. diff --git a/qt/network/gen_qnetworksession.h b/qt/network/gen_qnetworksession.h index 650fde00..4512e2ed 100644 --- a/qt/network/gen_qnetworksession.h +++ b/qt/network/gen_qnetworksession.h @@ -85,7 +85,7 @@ struct miqt_string QNetworkSession_tr2(const char* s, const char* c); struct miqt_string QNetworkSession_tr3(const char* s, const char* c, int n); struct miqt_string QNetworkSession_trUtf82(const char* s, const char* c); struct miqt_string QNetworkSession_trUtf83(const char* s, const char* c, int n); -bool QNetworkSession_waitForOpened1(QNetworkSession* self, int msecs); +bool QNetworkSession_waitForOpenedWithMsecs(QNetworkSession* self, int msecs); bool QNetworkSession_override_virtual_connectNotify(void* self, intptr_t slot); void QNetworkSession_virtualbase_connectNotify(void* self, QMetaMethod* signal); bool QNetworkSession_override_virtual_disconnectNotify(void* self, intptr_t slot); diff --git a/qt/network/gen_qsslcertificate.cpp b/qt/network/gen_qsslcertificate.cpp index 823ef059..3edb4e38 100644 --- a/qt/network/gen_qsslcertificate.cpp +++ b/qt/network/gen_qsslcertificate.cpp @@ -382,7 +382,7 @@ void* QSslCertificate_handle(const QSslCertificate* self) { return static_cast(_ret); } -struct miqt_string QSslCertificate_digest1(const QSslCertificate* self, int algorithm) { +struct miqt_string QSslCertificate_digestWithAlgorithm(const QSslCertificate* self, int algorithm) { QByteArray _qb = self->digest(static_cast(algorithm)); struct miqt_string _ms; _ms.len = _qb.length(); @@ -466,7 +466,7 @@ struct miqt_array /* of QSslError* */ QSslCertificate_verify2(struct miqt_array return _out; } -bool QSslCertificate_importPkcs124(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates) { +bool QSslCertificate_importPkcs122(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates) { QList caCertificates_QList; caCertificates_QList.reserve(caCertificates.len); QSslCertificate** caCertificates_arr = static_cast(caCertificates.data); @@ -476,7 +476,7 @@ bool QSslCertificate_importPkcs124(QIODevice* device, QSslKey* key, QSslCertific return QSslCertificate::importPkcs12(device, key, cert, &caCertificates_QList); } -bool QSslCertificate_importPkcs125(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates, struct miqt_string passPhrase) { +bool QSslCertificate_importPkcs123(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates, struct miqt_string passPhrase) { QList caCertificates_QList; caCertificates_QList.reserve(caCertificates.len); QSslCertificate** caCertificates_arr = static_cast(caCertificates.data); diff --git a/qt/network/gen_qsslcertificate.go b/qt/network/gen_qsslcertificate.go index c094bc52..366735d5 100644 --- a/qt/network/gen_qsslcertificate.go +++ b/qt/network/gen_qsslcertificate.go @@ -417,8 +417,8 @@ func (this *QSslCertificate) Handle() unsafe.Pointer { return (unsafe.Pointer)(C.QSslCertificate_handle(this.h)) } -func (this *QSslCertificate) Digest1(algorithm qt.QCryptographicHash__Algorithm) []byte { - var _bytearray C.struct_miqt_string = C.QSslCertificate_digest1(this.h, (C.int)(algorithm)) +func (this *QSslCertificate) DigestWithAlgorithm(algorithm qt.QCryptographicHash__Algorithm) []byte { + var _bytearray C.struct_miqt_string = C.QSslCertificate_digestWithAlgorithm(this.h, (C.int)(algorithm)) _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) C.free(unsafe.Pointer(_bytearray.data)) return _ret @@ -509,17 +509,17 @@ func QSslCertificate_Verify2(certificateChain []QSslCertificate, hostName string return _ret } -func QSslCertificate_ImportPkcs124(device *qt.QIODevice, key *QSslKey, cert *QSslCertificate, caCertificates []QSslCertificate) bool { +func QSslCertificate_ImportPkcs122(device *qt.QIODevice, key *QSslKey, cert *QSslCertificate, caCertificates []QSslCertificate) bool { caCertificates_CArray := (*[0xffff]*C.QSslCertificate)(C.malloc(C.size_t(8 * len(caCertificates)))) defer C.free(unsafe.Pointer(caCertificates_CArray)) for i := range caCertificates { caCertificates_CArray[i] = caCertificates[i].cPointer() } caCertificates_ma := C.struct_miqt_array{len: C.size_t(len(caCertificates)), data: unsafe.Pointer(caCertificates_CArray)} - return (bool)(C.QSslCertificate_importPkcs124((*C.QIODevice)(device.UnsafePointer()), key.cPointer(), cert.cPointer(), caCertificates_ma)) + return (bool)(C.QSslCertificate_importPkcs122((*C.QIODevice)(device.UnsafePointer()), key.cPointer(), cert.cPointer(), caCertificates_ma)) } -func QSslCertificate_ImportPkcs125(device *qt.QIODevice, key *QSslKey, cert *QSslCertificate, caCertificates []QSslCertificate, passPhrase []byte) bool { +func QSslCertificate_ImportPkcs123(device *qt.QIODevice, key *QSslKey, cert *QSslCertificate, caCertificates []QSslCertificate, passPhrase []byte) bool { caCertificates_CArray := (*[0xffff]*C.QSslCertificate)(C.malloc(C.size_t(8 * len(caCertificates)))) defer C.free(unsafe.Pointer(caCertificates_CArray)) for i := range caCertificates { @@ -533,7 +533,7 @@ func QSslCertificate_ImportPkcs125(device *qt.QIODevice, key *QSslKey, cert *QSs passPhrase_alias.data = (*C.char)(unsafe.Pointer(nil)) } passPhrase_alias.len = C.size_t(len(passPhrase)) - return (bool)(C.QSslCertificate_importPkcs125((*C.QIODevice)(device.UnsafePointer()), key.cPointer(), cert.cPointer(), caCertificates_ma, passPhrase_alias)) + return (bool)(C.QSslCertificate_importPkcs123((*C.QIODevice)(device.UnsafePointer()), key.cPointer(), cert.cPointer(), caCertificates_ma, passPhrase_alias)) } // Delete this object from C++ memory. diff --git a/qt/network/gen_qsslcertificate.h b/qt/network/gen_qsslcertificate.h index 629b006e..0eafc612 100644 --- a/qt/network/gen_qsslcertificate.h +++ b/qt/network/gen_qsslcertificate.h @@ -69,14 +69,14 @@ struct miqt_array /* of QSslCertificate* */ QSslCertificate_fromData(struct miq struct miqt_array /* of QSslError* */ QSslCertificate_verify(struct miqt_array /* of QSslCertificate* */ certificateChain); bool QSslCertificate_importPkcs12(QIODevice* device, QSslKey* key, QSslCertificate* cert); void* QSslCertificate_handle(const QSslCertificate* self); -struct miqt_string QSslCertificate_digest1(const QSslCertificate* self, int algorithm); +struct miqt_string QSslCertificate_digestWithAlgorithm(const QSslCertificate* self, int algorithm); struct miqt_array /* of QSslCertificate* */ QSslCertificate_fromPath2(struct miqt_string path, int format); struct miqt_array /* of QSslCertificate* */ QSslCertificate_fromPath3(struct miqt_string path, int format, int syntax); struct miqt_array /* of QSslCertificate* */ QSslCertificate_fromDevice2(QIODevice* device, int format); struct miqt_array /* of QSslCertificate* */ QSslCertificate_fromData2(struct miqt_string data, int format); struct miqt_array /* of QSslError* */ QSslCertificate_verify2(struct miqt_array /* of QSslCertificate* */ certificateChain, struct miqt_string hostName); -bool QSslCertificate_importPkcs124(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates); -bool QSslCertificate_importPkcs125(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates, struct miqt_string passPhrase); +bool QSslCertificate_importPkcs122(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates); +bool QSslCertificate_importPkcs123(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates, struct miqt_string passPhrase); void QSslCertificate_delete(QSslCertificate* self); #ifdef __cplusplus diff --git a/qt/network/gen_qsslconfiguration.cpp b/qt/network/gen_qsslconfiguration.cpp index 96118c00..dce7c3da 100644 --- a/qt/network/gen_qsslconfiguration.cpp +++ b/qt/network/gen_qsslconfiguration.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include "gen_qsslconfiguration.h" diff --git a/qt/network/gen_qssldiffiehellmanparameters.cpp b/qt/network/gen_qssldiffiehellmanparameters.cpp index 3d791f42..64d83d4a 100644 --- a/qt/network/gen_qssldiffiehellmanparameters.cpp +++ b/qt/network/gen_qssldiffiehellmanparameters.cpp @@ -73,7 +73,7 @@ QSslDiffieHellmanParameters* QSslDiffieHellmanParameters_fromEncoded2(struct miq return new QSslDiffieHellmanParameters(QSslDiffieHellmanParameters::fromEncoded(encoded_QByteArray, static_cast(format))); } -QSslDiffieHellmanParameters* QSslDiffieHellmanParameters_fromEncoded22(QIODevice* device, int format) { +QSslDiffieHellmanParameters* QSslDiffieHellmanParameters_fromEncoded3(QIODevice* device, int format) { return new QSslDiffieHellmanParameters(QSslDiffieHellmanParameters::fromEncoded(device, static_cast(format))); } diff --git a/qt/network/gen_qssldiffiehellmanparameters.go b/qt/network/gen_qssldiffiehellmanparameters.go index c3dbf1ae..9d13f65d 100644 --- a/qt/network/gen_qssldiffiehellmanparameters.go +++ b/qt/network/gen_qssldiffiehellmanparameters.go @@ -131,8 +131,8 @@ func QSslDiffieHellmanParameters_FromEncoded2(encoded []byte, format QSsl__Encod return _goptr } -func QSslDiffieHellmanParameters_FromEncoded22(device *qt.QIODevice, format QSsl__EncodingFormat) *QSslDiffieHellmanParameters { - _goptr := newQSslDiffieHellmanParameters(C.QSslDiffieHellmanParameters_fromEncoded22((*C.QIODevice)(device.UnsafePointer()), (C.int)(format))) +func QSslDiffieHellmanParameters_FromEncoded3(device *qt.QIODevice, format QSsl__EncodingFormat) *QSslDiffieHellmanParameters { + _goptr := newQSslDiffieHellmanParameters(C.QSslDiffieHellmanParameters_fromEncoded3((*C.QIODevice)(device.UnsafePointer()), (C.int)(format))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/network/gen_qssldiffiehellmanparameters.h b/qt/network/gen_qssldiffiehellmanparameters.h index adda34e5..09a16af6 100644 --- a/qt/network/gen_qssldiffiehellmanparameters.h +++ b/qt/network/gen_qssldiffiehellmanparameters.h @@ -34,7 +34,7 @@ bool QSslDiffieHellmanParameters_isValid(const QSslDiffieHellmanParameters* self int QSslDiffieHellmanParameters_error(const QSslDiffieHellmanParameters* self); struct miqt_string QSslDiffieHellmanParameters_errorString(const QSslDiffieHellmanParameters* self); QSslDiffieHellmanParameters* QSslDiffieHellmanParameters_fromEncoded2(struct miqt_string encoded, int format); -QSslDiffieHellmanParameters* QSslDiffieHellmanParameters_fromEncoded22(QIODevice* device, int format); +QSslDiffieHellmanParameters* QSslDiffieHellmanParameters_fromEncoded3(QIODevice* device, int format); void QSslDiffieHellmanParameters_delete(QSslDiffieHellmanParameters* self); #ifdef __cplusplus diff --git a/qt/network/gen_qsslkey.cpp b/qt/network/gen_qsslkey.cpp index b3f1eaf7..6b26f5ee 100644 --- a/qt/network/gen_qsslkey.cpp +++ b/qt/network/gen_qsslkey.cpp @@ -127,7 +127,7 @@ bool QSslKey_operatorNotEqual(const QSslKey* self, QSslKey* key) { return (*self != *key); } -struct miqt_string QSslKey_toPem1(const QSslKey* self, struct miqt_string passPhrase) { +struct miqt_string QSslKey_toPemWithPassPhrase(const QSslKey* self, struct miqt_string passPhrase) { QByteArray passPhrase_QByteArray(passPhrase.data, passPhrase.len); QByteArray _qb = self->toPem(passPhrase_QByteArray); struct miqt_string _ms; @@ -137,7 +137,7 @@ struct miqt_string QSslKey_toPem1(const QSslKey* self, struct miqt_string passPh return _ms; } -struct miqt_string QSslKey_toDer1(const QSslKey* self, struct miqt_string passPhrase) { +struct miqt_string QSslKey_toDerWithPassPhrase(const QSslKey* self, struct miqt_string passPhrase) { QByteArray passPhrase_QByteArray(passPhrase.data, passPhrase.len); QByteArray _qb = self->toDer(passPhrase_QByteArray); struct miqt_string _ms; diff --git a/qt/network/gen_qsslkey.go b/qt/network/gen_qsslkey.go index f674e86a..ec2cd3e0 100644 --- a/qt/network/gen_qsslkey.go +++ b/qt/network/gen_qsslkey.go @@ -214,7 +214,7 @@ func (this *QSslKey) OperatorNotEqual(key *QSslKey) bool { return (bool)(C.QSslKey_operatorNotEqual(this.h, key.cPointer())) } -func (this *QSslKey) ToPem1(passPhrase []byte) []byte { +func (this *QSslKey) ToPemWithPassPhrase(passPhrase []byte) []byte { passPhrase_alias := C.struct_miqt_string{} if len(passPhrase) > 0 { passPhrase_alias.data = (*C.char)(unsafe.Pointer(&passPhrase[0])) @@ -222,13 +222,13 @@ func (this *QSslKey) ToPem1(passPhrase []byte) []byte { passPhrase_alias.data = (*C.char)(unsafe.Pointer(nil)) } passPhrase_alias.len = C.size_t(len(passPhrase)) - var _bytearray C.struct_miqt_string = C.QSslKey_toPem1(this.h, passPhrase_alias) + var _bytearray C.struct_miqt_string = C.QSslKey_toPemWithPassPhrase(this.h, passPhrase_alias) _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) C.free(unsafe.Pointer(_bytearray.data)) return _ret } -func (this *QSslKey) ToDer1(passPhrase []byte) []byte { +func (this *QSslKey) ToDerWithPassPhrase(passPhrase []byte) []byte { passPhrase_alias := C.struct_miqt_string{} if len(passPhrase) > 0 { passPhrase_alias.data = (*C.char)(unsafe.Pointer(&passPhrase[0])) @@ -236,7 +236,7 @@ func (this *QSslKey) ToDer1(passPhrase []byte) []byte { passPhrase_alias.data = (*C.char)(unsafe.Pointer(nil)) } passPhrase_alias.len = C.size_t(len(passPhrase)) - var _bytearray C.struct_miqt_string = C.QSslKey_toDer1(this.h, passPhrase_alias) + var _bytearray C.struct_miqt_string = C.QSslKey_toDerWithPassPhrase(this.h, passPhrase_alias) _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) C.free(unsafe.Pointer(_bytearray.data)) return _ret diff --git a/qt/network/gen_qsslkey.h b/qt/network/gen_qsslkey.h index aa6658e5..6e16f282 100644 --- a/qt/network/gen_qsslkey.h +++ b/qt/network/gen_qsslkey.h @@ -46,8 +46,8 @@ struct miqt_string QSslKey_toDer(const QSslKey* self); void* QSslKey_handle(const QSslKey* self); bool QSslKey_operatorEqual(const QSslKey* self, QSslKey* key); bool QSslKey_operatorNotEqual(const QSslKey* self, QSslKey* key); -struct miqt_string QSslKey_toPem1(const QSslKey* self, struct miqt_string passPhrase); -struct miqt_string QSslKey_toDer1(const QSslKey* self, struct miqt_string passPhrase); +struct miqt_string QSslKey_toPemWithPassPhrase(const QSslKey* self, struct miqt_string passPhrase); +struct miqt_string QSslKey_toDerWithPassPhrase(const QSslKey* self, struct miqt_string passPhrase); void QSslKey_delete(QSslKey* self); #ifdef __cplusplus diff --git a/qt/network/gen_qsslsocket.cpp b/qt/network/gen_qsslsocket.cpp index 13f0a0ae..650bf0d6 100644 --- a/qt/network/gen_qsslsocket.cpp +++ b/qt/network/gen_qsslsocket.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "gen_qsslsocket.h" @@ -38,7 +39,7 @@ void miqt_exec_callback_QSslSocket_preSharedKeyAuthenticationRequired(intptr_t, void miqt_exec_callback_QSslSocket_newSessionTicketReceived(intptr_t); void miqt_exec_callback_QSslSocket_resume(QSslSocket*, intptr_t); bool miqt_exec_callback_QSslSocket_setSocketDescriptor(QSslSocket*, intptr_t, intptr_t, int, int); -void miqt_exec_callback_QSslSocket_connectToHost(QSslSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +void miqt_exec_callback_QSslSocket_connectToHost(QSslSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QSslSocket_disconnectFromHost(QSslSocket*, intptr_t); void miqt_exec_callback_QSslSocket_setSocketOption(QSslSocket*, intptr_t, int, QVariant*); QVariant* miqt_exec_callback_QSslSocket_socketOption(QSslSocket*, intptr_t, int); @@ -141,7 +142,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODevice::OpenMode openMode_ret = openMode; int sigval3 = static_cast(openMode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -152,7 +153,7 @@ public: } - friend void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol); + friend void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -714,9 +715,9 @@ public: // Wrappers to allow calling protected methods: friend void QSslSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QSslSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QSslSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QSslSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QSslSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QSslSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -773,12 +774,12 @@ void QSslSocket_resume(QSslSocket* self) { self->resume(); } -void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, uint16_t port) { +void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port)); } -void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName) { +void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString sslPeerName_QString = QString::fromUtf8(sslPeerName.data, sslPeerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), sslPeerName_QString); @@ -788,7 +789,7 @@ bool QSslSocket_setSocketDescriptor(QSslSocket* self, intptr_t socketDescriptor, return self->setSocketDescriptor((qintptr)(socketDescriptor), static_cast(state), static_cast(openMode)); } -void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol) { +void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHost(hostName_QString, static_cast(port), static_cast(openMode), static_cast(protocol)); } @@ -1397,23 +1398,23 @@ struct miqt_string QSslSocket_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode) { +void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), static_cast(mode)); } -void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); } -void QSslSocket_connectToHostEncrypted42(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode) { +void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString sslPeerName_QString = QString::fromUtf8(sslPeerName.data, sslPeerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), sslPeerName_QString, static_cast(mode)); } -void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode, int protocol) { +void QSslSocket_connectToHostEncrypted6(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString sslPeerName_QString = QString::fromUtf8(sslPeerName.data, sslPeerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), sslPeerName_QString, static_cast(mode), static_cast(protocol)); @@ -1460,7 +1461,7 @@ bool QSslSocket_addDefaultCaCertificates3(struct miqt_string path, int format, i return QSslSocket::addDefaultCaCertificates(path_QString, static_cast(format), static_cast(syntax)); } -bool QSslSocket_waitForEncrypted1(QSslSocket* self, int msecs) { +bool QSslSocket_waitForEncryptedWithMsecs(QSslSocket* self, int msecs) { return self->waitForEncrypted(static_cast(msecs)); } @@ -1506,7 +1507,7 @@ bool QSslSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol) { +void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQSslSocket*)(self) )->QSslSocket::connectToHost(hostName_QString, static_cast(port), static_cast(openMode), static_cast(protocol)); @@ -2027,7 +2028,7 @@ void QSslSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, } -void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQSslSocket* self_cast = dynamic_cast( (QSslSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -2053,7 +2054,7 @@ void QSslSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self } -void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQSslSocket* self_cast = dynamic_cast( (QSslSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt/network/gen_qsslsocket.go b/qt/network/gen_qsslsocket.go index 49766d80..7dbc4118 100644 --- a/qt/network/gen_qsslsocket.go +++ b/qt/network/gen_qsslsocket.go @@ -117,7 +117,7 @@ func (this *QSslSocket) ConnectToHostEncrypted(hostName string, port uint16) { hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHostEncrypted(this.h, hostName_ms, (C.uint16_t)(port)) + C.QSslSocket_connectToHostEncrypted(this.h, hostName_ms, (C.ushort)(port)) } func (this *QSslSocket) ConnectToHostEncrypted2(hostName string, port uint16, sslPeerName string) { @@ -129,7 +129,7 @@ func (this *QSslSocket) ConnectToHostEncrypted2(hostName string, port uint16, ss sslPeerName_ms.data = C.CString(sslPeerName) sslPeerName_ms.len = C.size_t(len(sslPeerName)) defer C.free(unsafe.Pointer(sslPeerName_ms.data)) - C.QSslSocket_connectToHostEncrypted2(this.h, hostName_ms, (C.uint16_t)(port), sslPeerName_ms) + C.QSslSocket_connectToHostEncrypted2(this.h, hostName_ms, (C.ushort)(port), sslPeerName_ms) } func (this *QSslSocket) SetSocketDescriptor(socketDescriptor uintptr, state QAbstractSocket__SocketState, openMode qt.QIODevice__OpenModeFlag) bool { @@ -141,7 +141,7 @@ func (this *QSslSocket) ConnectToHost(hostName string, port uint16, openMode qt. hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHost(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(openMode), (C.int)(protocol)) + C.QSslSocket_connectToHost(this.h, hostName_ms, (C.ushort)(port), (C.int)(openMode), (C.int)(protocol)) } func (this *QSslSocket) DisconnectFromHost() { @@ -806,7 +806,7 @@ func (this *QSslSocket) ConnectToHostEncrypted3(hostName string, port uint16, mo hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHostEncrypted3(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(mode)) + C.QSslSocket_connectToHostEncrypted3(this.h, hostName_ms, (C.ushort)(port), (C.int)(mode)) } func (this *QSslSocket) ConnectToHostEncrypted4(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol) { @@ -814,10 +814,10 @@ func (this *QSslSocket) ConnectToHostEncrypted4(hostName string, port uint16, mo hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHostEncrypted4(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QSslSocket_connectToHostEncrypted4(this.h, hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } -func (this *QSslSocket) ConnectToHostEncrypted42(hostName string, port uint16, sslPeerName string, mode qt.QIODevice__OpenModeFlag) { +func (this *QSslSocket) ConnectToHostEncrypted5(hostName string, port uint16, sslPeerName string, mode qt.QIODevice__OpenModeFlag) { hostName_ms := C.struct_miqt_string{} hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) @@ -826,10 +826,10 @@ func (this *QSslSocket) ConnectToHostEncrypted42(hostName string, port uint16, s sslPeerName_ms.data = C.CString(sslPeerName) sslPeerName_ms.len = C.size_t(len(sslPeerName)) defer C.free(unsafe.Pointer(sslPeerName_ms.data)) - C.QSslSocket_connectToHostEncrypted42(this.h, hostName_ms, (C.uint16_t)(port), sslPeerName_ms, (C.int)(mode)) + C.QSslSocket_connectToHostEncrypted5(this.h, hostName_ms, (C.ushort)(port), sslPeerName_ms, (C.int)(mode)) } -func (this *QSslSocket) ConnectToHostEncrypted5(hostName string, port uint16, sslPeerName string, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol) { +func (this *QSslSocket) ConnectToHostEncrypted6(hostName string, port uint16, sslPeerName string, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol) { hostName_ms := C.struct_miqt_string{} hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) @@ -838,7 +838,7 @@ func (this *QSslSocket) ConnectToHostEncrypted5(hostName string, port uint16, ss sslPeerName_ms.data = C.CString(sslPeerName) sslPeerName_ms.len = C.size_t(len(sslPeerName)) defer C.free(unsafe.Pointer(sslPeerName_ms.data)) - C.QSslSocket_connectToHostEncrypted5(this.h, hostName_ms, (C.uint16_t)(port), sslPeerName_ms, (C.int)(mode), (C.int)(protocol)) + C.QSslSocket_connectToHostEncrypted6(this.h, hostName_ms, (C.ushort)(port), sslPeerName_ms, (C.int)(mode), (C.int)(protocol)) } func (this *QSslSocket) SetLocalCertificate2(fileName string, format QSsl__EncodingFormat) { @@ -912,8 +912,8 @@ func QSslSocket_AddDefaultCaCertificates3(path string, format QSsl__EncodingForm return (bool)(C.QSslSocket_addDefaultCaCertificates3(path_ms, (C.int)(format), (C.int)(syntax))) } -func (this *QSslSocket) WaitForEncrypted1(msecs int) bool { - return (bool)(C.QSslSocket_waitForEncrypted1(this.h, (C.int)(msecs))) +func (this *QSslSocket) WaitForEncryptedWithMsecs(msecs int) bool { + return (bool)(C.QSslSocket_waitForEncryptedWithMsecs(this.h, (C.int)(msecs))) } // SetSocketState can only be called from a QSslSocket that was directly constructed. @@ -944,7 +944,7 @@ func (this *QSslSocket) SetSocketError(socketError QAbstractSocket__SocketError) func (this *QSslSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QSslSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QSslSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -968,7 +968,7 @@ func (this *QSslSocket) SetLocalAddress(address *QHostAddress) { func (this *QSslSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QSslSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QSslSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -1151,7 +1151,7 @@ func (this *QSslSocket) callVirtualBase_ConnectToHost(hostName string, port uint hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(openMode), (C.int)(protocol)) + C.QSslSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(openMode), (C.int)(protocol)) } func (this *QSslSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, openMode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, openMode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -1162,7 +1162,7 @@ func (this *QSslSocket) OnConnectToHost(slot func(super func(hostName string, po } //export miqt_exec_callback_QSslSocket_connectToHost -func miqt_exec_callback_QSslSocket_connectToHost(self *C.QSslSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, openMode C.int, protocol C.int) { +func miqt_exec_callback_QSslSocket_connectToHost(self *C.QSslSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, openMode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, openMode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, openMode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/network/gen_qsslsocket.h b/qt/network/gen_qsslsocket.h index 354bef5e..b6f671ef 100644 --- a/qt/network/gen_qsslsocket.h +++ b/qt/network/gen_qsslsocket.h @@ -64,10 +64,10 @@ void* QSslSocket_metacast(QSslSocket* self, const char* param1); struct miqt_string QSslSocket_tr(const char* s); struct miqt_string QSslSocket_trUtf8(const char* s); void QSslSocket_resume(QSslSocket* self); -void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, uint16_t port); -void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName); +void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, unsigned short port); +void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName); bool QSslSocket_setSocketDescriptor(QSslSocket* self, intptr_t socketDescriptor, int state, int openMode); -void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol); +void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol); void QSslSocket_disconnectFromHost(QSslSocket* self); void QSslSocket_setSocketOption(QSslSocket* self, int option, QVariant* value); QVariant* QSslSocket_socketOption(QSslSocket* self, int option); @@ -159,10 +159,10 @@ struct miqt_string QSslSocket_tr2(const char* s, const char* c); struct miqt_string QSslSocket_tr3(const char* s, const char* c, int n); struct miqt_string QSslSocket_trUtf82(const char* s, const char* c); struct miqt_string QSslSocket_trUtf83(const char* s, const char* c, int n); -void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode); -void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); -void QSslSocket_connectToHostEncrypted42(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode); -void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode, int protocol); +void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode); +void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); +void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode); +void QSslSocket_connectToHostEncrypted6(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode, int protocol); void QSslSocket_setLocalCertificate2(QSslSocket* self, struct miqt_string fileName, int format); void QSslSocket_setPrivateKey2(QSslSocket* self, struct miqt_string fileName, int algorithm); void QSslSocket_setPrivateKey3(QSslSocket* self, struct miqt_string fileName, int algorithm, int format); @@ -171,13 +171,13 @@ bool QSslSocket_addCaCertificates2(QSslSocket* self, struct miqt_string path, in bool QSslSocket_addCaCertificates3(QSslSocket* self, struct miqt_string path, int format, int syntax); bool QSslSocket_addDefaultCaCertificates2(struct miqt_string path, int format); bool QSslSocket_addDefaultCaCertificates3(struct miqt_string path, int format, int syntax); -bool QSslSocket_waitForEncrypted1(QSslSocket* self, int msecs); +bool QSslSocket_waitForEncryptedWithMsecs(QSslSocket* self, int msecs); bool QSslSocket_override_virtual_resume(void* self, intptr_t slot); void QSslSocket_virtualbase_resume(void* self); bool QSslSocket_override_virtual_setSocketDescriptor(void* self, intptr_t slot); bool QSslSocket_virtualbase_setSocketDescriptor(void* self, intptr_t socketDescriptor, int state, int openMode); bool QSslSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol); +void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol); bool QSslSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QSslSocket_virtualbase_disconnectFromHost(void* self); bool QSslSocket_override_virtual_setSocketOption(void* self, intptr_t slot); @@ -240,9 +240,9 @@ bool QSslSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QSslSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QSslSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QSslSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QSslSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QSslSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QSslSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QSslSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt/network/gen_qtcpserver.cpp b/qt/network/gen_qtcpserver.cpp index 9f7c5e40..c4da7f62 100644 --- a/qt/network/gen_qtcpserver.cpp +++ b/qt/network/gen_qtcpserver.cpp @@ -302,9 +302,9 @@ int QTcpServer_maxPendingConnections(const QTcpServer* self) { return self->maxPendingConnections(); } -uint16_t QTcpServer_serverPort(const QTcpServer* self) { +unsigned short QTcpServer_serverPort(const QTcpServer* self) { quint16 _ret = self->serverPort(); - return static_cast(_ret); + return static_cast(_ret); } QHostAddress* QTcpServer_serverAddress(const QTcpServer* self) { @@ -430,15 +430,15 @@ struct miqt_string QTcpServer_trUtf83(const char* s, const char* c, int n) { return _ms; } -bool QTcpServer_listen1(QTcpServer* self, QHostAddress* address) { +bool QTcpServer_listenWithAddress(QTcpServer* self, QHostAddress* address) { return self->listen(*address); } -bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, uint16_t port) { +bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, unsigned short port) { return self->listen(*address, static_cast(port)); } -bool QTcpServer_waitForNewConnection1(QTcpServer* self, int msec) { +bool QTcpServer_waitForNewConnectionWithMsec(QTcpServer* self, int msec) { return self->waitForNewConnection(static_cast(msec)); } diff --git a/qt/network/gen_qtcpserver.go b/qt/network/gen_qtcpserver.go index 142d9caa..87373906 100644 --- a/qt/network/gen_qtcpserver.go +++ b/qt/network/gen_qtcpserver.go @@ -251,16 +251,16 @@ func QTcpServer_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QTcpServer) Listen1(address *QHostAddress) bool { - return (bool)(C.QTcpServer_listen1(this.h, address.cPointer())) +func (this *QTcpServer) ListenWithAddress(address *QHostAddress) bool { + return (bool)(C.QTcpServer_listenWithAddress(this.h, address.cPointer())) } func (this *QTcpServer) Listen2(address *QHostAddress, port uint16) bool { - return (bool)(C.QTcpServer_listen2(this.h, address.cPointer(), (C.uint16_t)(port))) + return (bool)(C.QTcpServer_listen2(this.h, address.cPointer(), (C.ushort)(port))) } -func (this *QTcpServer) WaitForNewConnection1(msec int) bool { - return (bool)(C.QTcpServer_waitForNewConnection1(this.h, (C.int)(msec))) +func (this *QTcpServer) WaitForNewConnectionWithMsec(msec int) bool { + return (bool)(C.QTcpServer_waitForNewConnectionWithMsec(this.h, (C.int)(msec))) } func (this *QTcpServer) WaitForNewConnection2(msec int, timedOut *bool) bool { diff --git a/qt/network/gen_qtcpserver.h b/qt/network/gen_qtcpserver.h index af0bb6dd..e1239468 100644 --- a/qt/network/gen_qtcpserver.h +++ b/qt/network/gen_qtcpserver.h @@ -50,7 +50,7 @@ void QTcpServer_close(QTcpServer* self); bool QTcpServer_isListening(const QTcpServer* self); void QTcpServer_setMaxPendingConnections(QTcpServer* self, int numConnections); int QTcpServer_maxPendingConnections(const QTcpServer* self); -uint16_t QTcpServer_serverPort(const QTcpServer* self); +unsigned short QTcpServer_serverPort(const QTcpServer* self); QHostAddress* QTcpServer_serverAddress(const QTcpServer* self); intptr_t QTcpServer_socketDescriptor(const QTcpServer* self); bool QTcpServer_setSocketDescriptor(QTcpServer* self, intptr_t socketDescriptor); @@ -72,9 +72,9 @@ struct miqt_string QTcpServer_tr2(const char* s, const char* c); struct miqt_string QTcpServer_tr3(const char* s, const char* c, int n); struct miqt_string QTcpServer_trUtf82(const char* s, const char* c); struct miqt_string QTcpServer_trUtf83(const char* s, const char* c, int n); -bool QTcpServer_listen1(QTcpServer* self, QHostAddress* address); -bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, uint16_t port); -bool QTcpServer_waitForNewConnection1(QTcpServer* self, int msec); +bool QTcpServer_listenWithAddress(QTcpServer* self, QHostAddress* address); +bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, unsigned short port); +bool QTcpServer_waitForNewConnectionWithMsec(QTcpServer* self, int msec); bool QTcpServer_waitForNewConnection2(QTcpServer* self, int msec, bool* timedOut); bool QTcpServer_override_virtual_hasPendingConnections(void* self, intptr_t slot); bool QTcpServer_virtualbase_hasPendingConnections(const void* self); diff --git a/qt/network/gen_qtcpsocket.cpp b/qt/network/gen_qtcpsocket.cpp index 71d5fa07..94453d61 100644 --- a/qt/network/gen_qtcpsocket.cpp +++ b/qt/network/gen_qtcpsocket.cpp @@ -20,7 +20,7 @@ extern "C" { #endif void miqt_exec_callback_QTcpSocket_resume(QTcpSocket*, intptr_t); -void miqt_exec_callback_QTcpSocket_connectToHost(QTcpSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +void miqt_exec_callback_QTcpSocket_connectToHost(QTcpSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QTcpSocket_disconnectFromHost(QTcpSocket*, intptr_t); long long miqt_exec_callback_QTcpSocket_bytesAvailable(const QTcpSocket*, intptr_t); long long miqt_exec_callback_QTcpSocket_bytesToWrite(const QTcpSocket*, intptr_t); @@ -101,7 +101,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODevice::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -112,7 +112,7 @@ public: } - friend void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -697,9 +697,9 @@ public: // Wrappers to allow calling protected methods: friend void QTcpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QTcpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QTcpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QTcpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QTcpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QTcpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -822,7 +822,7 @@ bool QTcpSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQTcpSocket*)(self) )->QTcpSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1359,7 +1359,7 @@ void QTcpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, } -void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQTcpSocket* self_cast = dynamic_cast( (QTcpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1385,7 +1385,7 @@ void QTcpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self } -void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQTcpSocket* self_cast = dynamic_cast( (QTcpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt/network/gen_qtcpsocket.go b/qt/network/gen_qtcpsocket.go index c965f5ff..d2b8b9ae 100644 --- a/qt/network/gen_qtcpsocket.go +++ b/qt/network/gen_qtcpsocket.go @@ -163,7 +163,7 @@ func (this *QTcpSocket) SetSocketError(socketError QAbstractSocket__SocketError) func (this *QTcpSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QTcpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QTcpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -187,7 +187,7 @@ func (this *QTcpSocket) SetLocalAddress(address *QHostAddress) { func (this *QTcpSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QTcpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QTcpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -338,7 +338,7 @@ func (this *QTcpSocket) callVirtualBase_ConnectToHost(hostName string, port uint hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QTcpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QTcpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QTcpSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -349,7 +349,7 @@ func (this *QTcpSocket) OnConnectToHost(slot func(super func(hostName string, po } //export miqt_exec_callback_QTcpSocket_connectToHost -func miqt_exec_callback_QTcpSocket_connectToHost(self *C.QTcpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QTcpSocket_connectToHost(self *C.QTcpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/network/gen_qtcpsocket.h b/qt/network/gen_qtcpsocket.h index 561eaf26..75a64410 100644 --- a/qt/network/gen_qtcpsocket.h +++ b/qt/network/gen_qtcpsocket.h @@ -54,7 +54,7 @@ struct miqt_string QTcpSocket_trUtf83(const char* s, const char* c, int n); bool QTcpSocket_override_virtual_resume(void* self, intptr_t slot); void QTcpSocket_virtualbase_resume(void* self); bool QTcpSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QTcpSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QTcpSocket_virtualbase_disconnectFromHost(void* self); bool QTcpSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); @@ -119,9 +119,9 @@ bool QTcpSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QTcpSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QTcpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QTcpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QTcpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QTcpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QTcpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QTcpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt/network/gen_qudpsocket.cpp b/qt/network/gen_qudpsocket.cpp index 12247c90..021bb5f9 100644 --- a/qt/network/gen_qudpsocket.cpp +++ b/qt/network/gen_qudpsocket.cpp @@ -23,7 +23,7 @@ extern "C" { #endif void miqt_exec_callback_QUdpSocket_resume(QUdpSocket*, intptr_t); -void miqt_exec_callback_QUdpSocket_connectToHost(QUdpSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +void miqt_exec_callback_QUdpSocket_connectToHost(QUdpSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QUdpSocket_disconnectFromHost(QUdpSocket*, intptr_t); long long miqt_exec_callback_QUdpSocket_bytesAvailable(const QUdpSocket*, intptr_t); long long miqt_exec_callback_QUdpSocket_bytesToWrite(const QUdpSocket*, intptr_t); @@ -104,7 +104,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODevice::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -115,7 +115,7 @@ public: } - friend void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -700,9 +700,9 @@ public: // Wrappers to allow calling protected methods: friend void QUdpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QUdpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QUdpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QUdpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QUdpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QUdpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -802,12 +802,12 @@ long long QUdpSocket_writeDatagram(QUdpSocket* self, QNetworkDatagram* datagram) return static_cast(_ret); } -long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, uint16_t port) { +long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, unsigned short port) { qint64 _ret = self->writeDatagram(data, static_cast(len), *host, static_cast(port)); return static_cast(_ret); } -long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, uint16_t port) { +long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, unsigned short port) { QByteArray datagram_QByteArray(datagram.data, datagram.len); qint64 _ret = self->writeDatagram(datagram_QByteArray, *host, static_cast(port)); return static_cast(_ret); @@ -857,16 +857,16 @@ struct miqt_string QUdpSocket_trUtf83(const char* s, const char* c, int n) { return _ms; } -QNetworkDatagram* QUdpSocket_receiveDatagram1(QUdpSocket* self, long long maxSize) { +QNetworkDatagram* QUdpSocket_receiveDatagramWithMaxSize(QUdpSocket* self, long long maxSize) { return new QNetworkDatagram(self->receiveDatagram(static_cast(maxSize))); } -long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host) { +long long QUdpSocket_readDatagram2(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host) { qint64 _ret = self->readDatagram(data, static_cast(maxlen), host); return static_cast(_ret); } -long long QUdpSocket_readDatagram4(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, uint16_t* port) { +long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, unsigned short* port) { qint64 _ret = self->readDatagram(data, static_cast(maxlen), host, static_cast(port)); return static_cast(_ret); } @@ -897,7 +897,7 @@ bool QUdpSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQUdpSocket*)(self) )->QUdpSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1434,7 +1434,7 @@ void QUdpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, } -void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQUdpSocket* self_cast = dynamic_cast( (QUdpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1460,7 +1460,7 @@ void QUdpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self } -void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQUdpSocket* self_cast = dynamic_cast( (QUdpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt/network/gen_qudpsocket.go b/qt/network/gen_qudpsocket.go index df3ad3b6..454b80da 100644 --- a/qt/network/gen_qudpsocket.go +++ b/qt/network/gen_qudpsocket.go @@ -144,7 +144,7 @@ func (this *QUdpSocket) WriteDatagram(datagram *QNetworkDatagram) int64 { func (this *QUdpSocket) WriteDatagram2(data string, lenVal int64, host *QHostAddress, port uint16) int64 { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - return (int64)(C.QUdpSocket_writeDatagram2(this.h, data_Cstring, (C.longlong)(lenVal), host.cPointer(), (C.uint16_t)(port))) + return (int64)(C.QUdpSocket_writeDatagram2(this.h, data_Cstring, (C.longlong)(lenVal), host.cPointer(), (C.ushort)(port))) } func (this *QUdpSocket) WriteDatagram3(datagram []byte, host *QHostAddress, port uint16) int64 { @@ -155,7 +155,7 @@ func (this *QUdpSocket) WriteDatagram3(datagram []byte, host *QHostAddress, port datagram_alias.data = (*C.char)(unsafe.Pointer(nil)) } datagram_alias.len = C.size_t(len(datagram)) - return (int64)(C.QUdpSocket_writeDatagram3(this.h, datagram_alias, host.cPointer(), (C.uint16_t)(port))) + return (int64)(C.QUdpSocket_writeDatagram3(this.h, datagram_alias, host.cPointer(), (C.ushort)(port))) } func QUdpSocket_Tr2(s string, c string) string { @@ -202,22 +202,22 @@ func QUdpSocket_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QUdpSocket) ReceiveDatagram1(maxSize int64) *QNetworkDatagram { - _goptr := newQNetworkDatagram(C.QUdpSocket_receiveDatagram1(this.h, (C.longlong)(maxSize))) +func (this *QUdpSocket) ReceiveDatagramWithMaxSize(maxSize int64) *QNetworkDatagram { + _goptr := newQNetworkDatagram(C.QUdpSocket_receiveDatagramWithMaxSize(this.h, (C.longlong)(maxSize))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QUdpSocket) ReadDatagram3(data string, maxlen int64, host *QHostAddress) int64 { +func (this *QUdpSocket) ReadDatagram2(data string, maxlen int64, host *QHostAddress) int64 { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - return (int64)(C.QUdpSocket_readDatagram3(this.h, data_Cstring, (C.longlong)(maxlen), host.cPointer())) + return (int64)(C.QUdpSocket_readDatagram2(this.h, data_Cstring, (C.longlong)(maxlen), host.cPointer())) } -func (this *QUdpSocket) ReadDatagram4(data string, maxlen int64, host *QHostAddress, port *uint16) int64 { +func (this *QUdpSocket) ReadDatagram3(data string, maxlen int64, host *QHostAddress, port *uint16) int64 { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - return (int64)(C.QUdpSocket_readDatagram4(this.h, data_Cstring, (C.longlong)(maxlen), host.cPointer(), (*C.uint16_t)(unsafe.Pointer(port)))) + return (int64)(C.QUdpSocket_readDatagram3(this.h, data_Cstring, (C.longlong)(maxlen), host.cPointer(), (*C.ushort)(unsafe.Pointer(port)))) } // SetSocketState can only be called from a QUdpSocket that was directly constructed. @@ -248,7 +248,7 @@ func (this *QUdpSocket) SetSocketError(socketError QAbstractSocket__SocketError) func (this *QUdpSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QUdpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QUdpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -272,7 +272,7 @@ func (this *QUdpSocket) SetLocalAddress(address *QHostAddress) { func (this *QUdpSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QUdpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QUdpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -423,7 +423,7 @@ func (this *QUdpSocket) callVirtualBase_ConnectToHost(hostName string, port uint hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QUdpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QUdpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QUdpSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -434,7 +434,7 @@ func (this *QUdpSocket) OnConnectToHost(slot func(super func(hostName string, po } //export miqt_exec_callback_QUdpSocket_connectToHost -func miqt_exec_callback_QUdpSocket_connectToHost(self *C.QUdpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QUdpSocket_connectToHost(self *C.QUdpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/network/gen_qudpsocket.h b/qt/network/gen_qudpsocket.h index 8c2963a4..2590ce8e 100644 --- a/qt/network/gen_qudpsocket.h +++ b/qt/network/gen_qudpsocket.h @@ -62,19 +62,19 @@ long long QUdpSocket_pendingDatagramSize(const QUdpSocket* self); QNetworkDatagram* QUdpSocket_receiveDatagram(QUdpSocket* self); long long QUdpSocket_readDatagram(QUdpSocket* self, char* data, long long maxlen); long long QUdpSocket_writeDatagram(QUdpSocket* self, QNetworkDatagram* datagram); -long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, uint16_t port); -long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, uint16_t port); +long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, unsigned short port); +long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, unsigned short port); struct miqt_string QUdpSocket_tr2(const char* s, const char* c); struct miqt_string QUdpSocket_tr3(const char* s, const char* c, int n); struct miqt_string QUdpSocket_trUtf82(const char* s, const char* c); struct miqt_string QUdpSocket_trUtf83(const char* s, const char* c, int n); -QNetworkDatagram* QUdpSocket_receiveDatagram1(QUdpSocket* self, long long maxSize); -long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host); -long long QUdpSocket_readDatagram4(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, uint16_t* port); +QNetworkDatagram* QUdpSocket_receiveDatagramWithMaxSize(QUdpSocket* self, long long maxSize); +long long QUdpSocket_readDatagram2(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host); +long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, unsigned short* port); bool QUdpSocket_override_virtual_resume(void* self, intptr_t slot); void QUdpSocket_virtualbase_resume(void* self); bool QUdpSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QUdpSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QUdpSocket_virtualbase_disconnectFromHost(void* self); bool QUdpSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); @@ -139,9 +139,9 @@ bool QUdpSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QUdpSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QUdpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QUdpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QUdpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QUdpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QUdpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QUdpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt/printsupport/gen_qprintpreviewwidget.cpp b/qt/printsupport/gen_qprintpreviewwidget.cpp index bcc38a5c..4564031e 100644 --- a/qt/printsupport/gen_qprintpreviewwidget.cpp +++ b/qt/printsupport/gen_qprintpreviewwidget.cpp @@ -1225,11 +1225,11 @@ struct miqt_string QPrintPreviewWidget_trUtf83(const char* s, const char* c, int return _ms; } -void QPrintPreviewWidget_zoomIn1(QPrintPreviewWidget* self, double zoom) { +void QPrintPreviewWidget_zoomInWithZoom(QPrintPreviewWidget* self, double zoom) { self->zoomIn(static_cast(zoom)); } -void QPrintPreviewWidget_zoomOut1(QPrintPreviewWidget* self, double zoom) { +void QPrintPreviewWidget_zoomOutWithZoom(QPrintPreviewWidget* self, double zoom) { self->zoomOut(static_cast(zoom)); } diff --git a/qt/printsupport/gen_qprintpreviewwidget.go b/qt/printsupport/gen_qprintpreviewwidget.go index 72085f75..38eef509 100644 --- a/qt/printsupport/gen_qprintpreviewwidget.go +++ b/qt/printsupport/gen_qprintpreviewwidget.go @@ -304,12 +304,12 @@ func QPrintPreviewWidget_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QPrintPreviewWidget) ZoomIn1(zoom float64) { - C.QPrintPreviewWidget_zoomIn1(this.h, (C.double)(zoom)) +func (this *QPrintPreviewWidget) ZoomInWithZoom(zoom float64) { + C.QPrintPreviewWidget_zoomInWithZoom(this.h, (C.double)(zoom)) } -func (this *QPrintPreviewWidget) ZoomOut1(zoom float64) { - C.QPrintPreviewWidget_zoomOut1(this.h, (C.double)(zoom)) +func (this *QPrintPreviewWidget) ZoomOutWithZoom(zoom float64) { + C.QPrintPreviewWidget_zoomOutWithZoom(this.h, (C.double)(zoom)) } // UpdateMicroFocus can only be called from a QPrintPreviewWidget that was directly constructed. diff --git a/qt/printsupport/gen_qprintpreviewwidget.h b/qt/printsupport/gen_qprintpreviewwidget.h index 22c7c10b..9fb1217e 100644 --- a/qt/printsupport/gen_qprintpreviewwidget.h +++ b/qt/printsupport/gen_qprintpreviewwidget.h @@ -126,8 +126,8 @@ 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_zoomInWithZoom(QPrintPreviewWidget* self, double zoom); +void QPrintPreviewWidget_zoomOutWithZoom(QPrintPreviewWidget* self, double zoom); bool QPrintPreviewWidget_override_virtual_setVisible(void* self, intptr_t slot); void QPrintPreviewWidget_virtualbase_setVisible(void* self, bool visible); bool QPrintPreviewWidget_override_virtual_devType(void* self, intptr_t slot); diff --git a/qt/script/gen_qscriptengine.cpp b/qt/script/gen_qscriptengine.cpp index 1b9df8d4..77d825ad 100644 --- a/qt/script/gen_qscriptengine.cpp +++ b/qt/script/gen_qscriptengine.cpp @@ -575,7 +575,7 @@ QScriptValue* QScriptEngine_evaluate3(QScriptEngine* self, struct miqt_string pr return new QScriptValue(self->evaluate(program_QString, fileName_QString, static_cast(lineNumber))); } -void QScriptEngine_abortEvaluation1(QScriptEngine* self, QScriptValue* result) { +void QScriptEngine_abortEvaluationWithResult(QScriptEngine* self, QScriptValue* result) { self->abortEvaluation(*result); } @@ -583,23 +583,23 @@ QScriptValue* QScriptEngine_newObject2(QScriptEngine* self, QScriptClass* script return new QScriptValue(self->newObject(scriptClass, *data)); } -QScriptValue* QScriptEngine_newArray1(QScriptEngine* self, unsigned int length) { +QScriptValue* QScriptEngine_newArrayWithLength(QScriptEngine* self, unsigned int length) { return new QScriptValue(self->newArray(static_cast(length))); } -QScriptValue* QScriptEngine_newQObject22(QScriptEngine* self, QObject* object, int ownership) { +QScriptValue* QScriptEngine_newQObject3(QScriptEngine* self, QObject* object, int ownership) { return new QScriptValue(self->newQObject(object, static_cast(ownership))); } -QScriptValue* QScriptEngine_newQObject3(QScriptEngine* self, QObject* object, int ownership, int* options) { +QScriptValue* QScriptEngine_newQObject4(QScriptEngine* self, QObject* object, int ownership, int* options) { return new QScriptValue(self->newQObject(object, static_cast(ownership), (const QScriptEngine::QObjectWrapOptions&)(*options))); } -QScriptValue* QScriptEngine_newQObject32(QScriptEngine* self, QScriptValue* scriptObject, QObject* qtObject, int ownership) { +QScriptValue* QScriptEngine_newQObject5(QScriptEngine* self, QScriptValue* scriptObject, QObject* qtObject, int ownership) { return new QScriptValue(self->newQObject(*scriptObject, qtObject, static_cast(ownership))); } -QScriptValue* QScriptEngine_newQObject4(QScriptEngine* self, QScriptValue* scriptObject, QObject* qtObject, int ownership, int* options) { +QScriptValue* QScriptEngine_newQObject6(QScriptEngine* self, QScriptValue* scriptObject, QObject* qtObject, int ownership, int* options) { return new QScriptValue(self->newQObject(*scriptObject, qtObject, static_cast(ownership), (const QScriptEngine::QObjectWrapOptions&)(*options))); } @@ -607,7 +607,7 @@ QScriptValue* QScriptEngine_newQMetaObject2(QScriptEngine* self, QMetaObject* me return new QScriptValue(self->newQMetaObject(metaObject, *ctor)); } -void QScriptEngine_installTranslatorFunctions1(QScriptEngine* self, QScriptValue* object) { +void QScriptEngine_installTranslatorFunctionsWithObject(QScriptEngine* self, QScriptValue* object) { self->installTranslatorFunctions(*object); } diff --git a/qt/script/gen_qscriptengine.go b/qt/script/gen_qscriptengine.go index 667df87f..97d247ef 100644 --- a/qt/script/gen_qscriptengine.go +++ b/qt/script/gen_qscriptengine.go @@ -577,8 +577,8 @@ func (this *QScriptEngine) Evaluate3(program string, fileName string, lineNumber return _goptr } -func (this *QScriptEngine) AbortEvaluation1(result *QScriptValue) { - C.QScriptEngine_abortEvaluation1(this.h, result.cPointer()) +func (this *QScriptEngine) AbortEvaluationWithResult(result *QScriptValue) { + C.QScriptEngine_abortEvaluationWithResult(this.h, result.cPointer()) } func (this *QScriptEngine) NewObject2(scriptClass *QScriptClass, data *QScriptValue) *QScriptValue { @@ -587,32 +587,32 @@ func (this *QScriptEngine) NewObject2(scriptClass *QScriptClass, data *QScriptVa return _goptr } -func (this *QScriptEngine) NewArray1(length uint) *QScriptValue { - _goptr := newQScriptValue(C.QScriptEngine_newArray1(this.h, (C.uint)(length))) +func (this *QScriptEngine) NewArrayWithLength(length uint) *QScriptValue { + _goptr := newQScriptValue(C.QScriptEngine_newArrayWithLength(this.h, (C.uint)(length))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QScriptEngine) NewQObject22(object *qt.QObject, ownership QScriptEngine__ValueOwnership) *QScriptValue { - _goptr := newQScriptValue(C.QScriptEngine_newQObject22(this.h, (*C.QObject)(object.UnsafePointer()), (C.int)(ownership))) +func (this *QScriptEngine) NewQObject3(object *qt.QObject, ownership QScriptEngine__ValueOwnership) *QScriptValue { + _goptr := newQScriptValue(C.QScriptEngine_newQObject3(this.h, (*C.QObject)(object.UnsafePointer()), (C.int)(ownership))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QScriptEngine) NewQObject3(object *qt.QObject, ownership QScriptEngine__ValueOwnership, options *QScriptEngine__QObjectWrapOption) *QScriptValue { - _goptr := newQScriptValue(C.QScriptEngine_newQObject3(this.h, (*C.QObject)(object.UnsafePointer()), (C.int)(ownership), (*C.int)(unsafe.Pointer(options)))) +func (this *QScriptEngine) NewQObject4(object *qt.QObject, ownership QScriptEngine__ValueOwnership, options *QScriptEngine__QObjectWrapOption) *QScriptValue { + _goptr := newQScriptValue(C.QScriptEngine_newQObject4(this.h, (*C.QObject)(object.UnsafePointer()), (C.int)(ownership), (*C.int)(unsafe.Pointer(options)))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QScriptEngine) NewQObject32(scriptObject *QScriptValue, qtObject *qt.QObject, ownership QScriptEngine__ValueOwnership) *QScriptValue { - _goptr := newQScriptValue(C.QScriptEngine_newQObject32(this.h, scriptObject.cPointer(), (*C.QObject)(qtObject.UnsafePointer()), (C.int)(ownership))) +func (this *QScriptEngine) NewQObject5(scriptObject *QScriptValue, qtObject *qt.QObject, ownership QScriptEngine__ValueOwnership) *QScriptValue { + _goptr := newQScriptValue(C.QScriptEngine_newQObject5(this.h, scriptObject.cPointer(), (*C.QObject)(qtObject.UnsafePointer()), (C.int)(ownership))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QScriptEngine) NewQObject4(scriptObject *QScriptValue, qtObject *qt.QObject, ownership QScriptEngine__ValueOwnership, options *QScriptEngine__QObjectWrapOption) *QScriptValue { - _goptr := newQScriptValue(C.QScriptEngine_newQObject4(this.h, scriptObject.cPointer(), (*C.QObject)(qtObject.UnsafePointer()), (C.int)(ownership), (*C.int)(unsafe.Pointer(options)))) +func (this *QScriptEngine) NewQObject6(scriptObject *QScriptValue, qtObject *qt.QObject, ownership QScriptEngine__ValueOwnership, options *QScriptEngine__QObjectWrapOption) *QScriptValue { + _goptr := newQScriptValue(C.QScriptEngine_newQObject6(this.h, scriptObject.cPointer(), (*C.QObject)(qtObject.UnsafePointer()), (C.int)(ownership), (*C.int)(unsafe.Pointer(options)))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -623,8 +623,8 @@ func (this *QScriptEngine) NewQMetaObject2(metaObject *qt.QMetaObject, ctor *QSc return _goptr } -func (this *QScriptEngine) InstallTranslatorFunctions1(object *QScriptValue) { - C.QScriptEngine_installTranslatorFunctions1(this.h, object.cPointer()) +func (this *QScriptEngine) InstallTranslatorFunctionsWithObject(object *QScriptValue) { + C.QScriptEngine_installTranslatorFunctionsWithObject(this.h, object.cPointer()) } // Sender can only be called from a QScriptEngine that was directly constructed. diff --git a/qt/script/gen_qscriptengine.h b/qt/script/gen_qscriptengine.h index c6634734..f57e35bd 100644 --- a/qt/script/gen_qscriptengine.h +++ b/qt/script/gen_qscriptengine.h @@ -121,15 +121,15 @@ struct miqt_string QScriptEngine_trUtf82(const char* s, const char* c); struct miqt_string QScriptEngine_trUtf83(const char* s, const char* c, int n); QScriptValue* QScriptEngine_evaluate2(QScriptEngine* self, struct miqt_string program, struct miqt_string fileName); QScriptValue* QScriptEngine_evaluate3(QScriptEngine* self, struct miqt_string program, struct miqt_string fileName, int lineNumber); -void QScriptEngine_abortEvaluation1(QScriptEngine* self, QScriptValue* result); +void QScriptEngine_abortEvaluationWithResult(QScriptEngine* self, QScriptValue* result); QScriptValue* QScriptEngine_newObject2(QScriptEngine* self, QScriptClass* scriptClass, QScriptValue* data); -QScriptValue* QScriptEngine_newArray1(QScriptEngine* self, unsigned int length); -QScriptValue* QScriptEngine_newQObject22(QScriptEngine* self, QObject* object, int ownership); -QScriptValue* QScriptEngine_newQObject3(QScriptEngine* self, QObject* object, int ownership, int* options); -QScriptValue* QScriptEngine_newQObject32(QScriptEngine* self, QScriptValue* scriptObject, QObject* qtObject, int ownership); -QScriptValue* QScriptEngine_newQObject4(QScriptEngine* self, QScriptValue* scriptObject, QObject* qtObject, int ownership, int* options); +QScriptValue* QScriptEngine_newArrayWithLength(QScriptEngine* self, unsigned int length); +QScriptValue* QScriptEngine_newQObject3(QScriptEngine* self, QObject* object, int ownership); +QScriptValue* QScriptEngine_newQObject4(QScriptEngine* self, QObject* object, int ownership, int* options); +QScriptValue* QScriptEngine_newQObject5(QScriptEngine* self, QScriptValue* scriptObject, QObject* qtObject, int ownership); +QScriptValue* QScriptEngine_newQObject6(QScriptEngine* self, QScriptValue* scriptObject, QObject* qtObject, int ownership, int* options); QScriptValue* QScriptEngine_newQMetaObject2(QScriptEngine* self, QMetaObject* metaObject, QScriptValue* ctor); -void QScriptEngine_installTranslatorFunctions1(QScriptEngine* self, QScriptValue* object); +void QScriptEngine_installTranslatorFunctionsWithObject(QScriptEngine* self, QScriptValue* object); bool QScriptEngine_override_virtual_event(void* self, intptr_t slot); bool QScriptEngine_virtualbase_event(void* self, QEvent* event); bool QScriptEngine_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt/script/gen_qscriptstring.cpp b/qt/script/gen_qscriptstring.cpp index 222c54e6..4d896862 100644 --- a/qt/script/gen_qscriptstring.cpp +++ b/qt/script/gen_qscriptstring.cpp @@ -64,7 +64,7 @@ struct miqt_string QScriptString_ToQString(const QScriptString* self) { return _ms; } -unsigned int QScriptString_toArrayIndex1(const QScriptString* self, bool* ok) { +unsigned int QScriptString_toArrayIndexWithOk(const QScriptString* self, bool* ok) { quint32 _ret = self->toArrayIndex(ok); return static_cast(_ret); } diff --git a/qt/script/gen_qscriptstring.go b/qt/script/gen_qscriptstring.go index f096cf5f..d1518062 100644 --- a/qt/script/gen_qscriptstring.go +++ b/qt/script/gen_qscriptstring.go @@ -91,8 +91,8 @@ func (this *QScriptString) ToQString() string { return _ret } -func (this *QScriptString) ToArrayIndex1(ok *bool) uint { - return (uint)(C.QScriptString_toArrayIndex1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QScriptString) ToArrayIndexWithOk(ok *bool) uint { + return (uint)(C.QScriptString_toArrayIndexWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } // Delete this object from C++ memory. diff --git a/qt/script/gen_qscriptstring.h b/qt/script/gen_qscriptstring.h index aa532ce0..1b24820a 100644 --- a/qt/script/gen_qscriptstring.h +++ b/qt/script/gen_qscriptstring.h @@ -29,7 +29,7 @@ bool QScriptString_operatorNotEqual(const QScriptString* self, QScriptString* ot unsigned int QScriptString_toArrayIndex(const QScriptString* self); struct miqt_string QScriptString_toString(const QScriptString* self); struct miqt_string QScriptString_ToQString(const QScriptString* self); -unsigned int QScriptString_toArrayIndex1(const QScriptString* self, bool* ok); +unsigned int QScriptString_toArrayIndexWithOk(const QScriptString* self, bool* ok); void QScriptString_delete(QScriptString* self); #ifdef __cplusplus diff --git a/qt/script/gen_qscriptvalue.cpp b/qt/script/gen_qscriptvalue.cpp index cc4ce432..2873975e 100644 --- a/qt/script/gen_qscriptvalue.cpp +++ b/qt/script/gen_qscriptvalue.cpp @@ -199,9 +199,9 @@ unsigned int QScriptValue_toUInt32(const QScriptValue* self) { return static_cast(_ret); } -uint16_t QScriptValue_toUInt16(const QScriptValue* self) { +unsigned short QScriptValue_toUInt16(const QScriptValue* self) { quint16 _ret = self->toUInt16(); - return static_cast(_ret); + return static_cast(_ret); } QVariant* QScriptValue_toVariant(const QScriptValue* self) { @@ -339,24 +339,24 @@ QScriptValue* QScriptValue_property2(const QScriptValue* self, struct miqt_strin return new QScriptValue(self->property(name_QString, (const QScriptValue::ResolveFlags&)(*mode))); } -void QScriptValue_setProperty32(QScriptValue* self, struct miqt_string name, QScriptValue* value, int* flags) { +void QScriptValue_setProperty4(QScriptValue* self, struct miqt_string name, QScriptValue* value, int* flags) { QString name_QString = QString::fromUtf8(name.data, name.len); self->setProperty(name_QString, *value, (const QScriptValue::PropertyFlags&)(*flags)); } -QScriptValue* QScriptValue_property22(const QScriptValue* self, unsigned int arrayIndex, int* mode) { +QScriptValue* QScriptValue_property3(const QScriptValue* self, unsigned int arrayIndex, int* mode) { return new QScriptValue(self->property(static_cast(arrayIndex), (const QScriptValue::ResolveFlags&)(*mode))); } -void QScriptValue_setProperty33(QScriptValue* self, unsigned int arrayIndex, QScriptValue* value, int* flags) { +void QScriptValue_setProperty5(QScriptValue* self, unsigned int arrayIndex, QScriptValue* value, int* flags) { self->setProperty(static_cast(arrayIndex), *value, (const QScriptValue::PropertyFlags&)(*flags)); } -QScriptValue* QScriptValue_property23(const QScriptValue* self, QScriptString* name, int* mode) { +QScriptValue* QScriptValue_property4(const QScriptValue* self, QScriptString* name, int* mode) { return new QScriptValue(self->property(*name, (const QScriptValue::ResolveFlags&)(*mode))); } -void QScriptValue_setProperty34(QScriptValue* self, QScriptString* name, QScriptValue* value, int* flags) { +void QScriptValue_setProperty6(QScriptValue* self, QScriptString* name, QScriptValue* value, int* flags) { self->setProperty(*name, *value, (const QScriptValue::PropertyFlags&)(*flags)); } @@ -366,16 +366,16 @@ int QScriptValue_propertyFlags2(const QScriptValue* self, struct miqt_string nam return static_cast(_ret); } -int QScriptValue_propertyFlags22(const QScriptValue* self, QScriptString* name, int* mode) { +int QScriptValue_propertyFlags3(const QScriptValue* self, QScriptString* name, int* mode) { QScriptValue::PropertyFlags _ret = self->propertyFlags(*name, (const QScriptValue::ResolveFlags&)(*mode)); return static_cast(_ret); } -QScriptValue* QScriptValue_call1(QScriptValue* self, QScriptValue* thisObject) { +QScriptValue* QScriptValue_callWithThisObject(QScriptValue* self, QScriptValue* thisObject) { return new QScriptValue(self->call(*thisObject)); } -QScriptValue* QScriptValue_call22(QScriptValue* self, QScriptValue* thisObject, struct miqt_array /* of QScriptValue* */ args) { +QScriptValue* QScriptValue_call3(QScriptValue* self, QScriptValue* thisObject, struct miqt_array /* of QScriptValue* */ args) { QScriptValueList args_QList; args_QList.reserve(args.len); QScriptValue** args_arr = static_cast(args.data); @@ -385,7 +385,7 @@ QScriptValue* QScriptValue_call22(QScriptValue* self, QScriptValue* thisObject, return new QScriptValue(self->call(*thisObject, args_QList)); } -QScriptValue* QScriptValue_construct1(QScriptValue* self, struct miqt_array /* of QScriptValue* */ args) { +QScriptValue* QScriptValue_constructWithArgs(QScriptValue* self, struct miqt_array /* of QScriptValue* */ args) { QScriptValueList args_QList; args_QList.reserve(args.len); QScriptValue** args_arr = static_cast(args.data); diff --git a/qt/script/gen_qscriptvalue.go b/qt/script/gen_qscriptvalue.go index 3f5d01fa..fb2c31e4 100644 --- a/qt/script/gen_qscriptvalue.go +++ b/qt/script/gen_qscriptvalue.go @@ -463,32 +463,32 @@ func (this *QScriptValue) Property2(name string, mode *QScriptValue__ResolveFlag return _goptr } -func (this *QScriptValue) SetProperty32(name string, value *QScriptValue, flags *QScriptValue__PropertyFlag) { +func (this *QScriptValue) SetProperty4(name string, value *QScriptValue, flags *QScriptValue__PropertyFlag) { 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.QScriptValue_setProperty32(this.h, name_ms, value.cPointer(), (*C.int)(unsafe.Pointer(flags))) + C.QScriptValue_setProperty4(this.h, name_ms, value.cPointer(), (*C.int)(unsafe.Pointer(flags))) } -func (this *QScriptValue) Property22(arrayIndex uint, mode *QScriptValue__ResolveFlag) *QScriptValue { - _goptr := newQScriptValue(C.QScriptValue_property22(this.h, (C.uint)(arrayIndex), (*C.int)(unsafe.Pointer(mode)))) +func (this *QScriptValue) Property3(arrayIndex uint, mode *QScriptValue__ResolveFlag) *QScriptValue { + _goptr := newQScriptValue(C.QScriptValue_property3(this.h, (C.uint)(arrayIndex), (*C.int)(unsafe.Pointer(mode)))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QScriptValue) SetProperty33(arrayIndex uint, value *QScriptValue, flags *QScriptValue__PropertyFlag) { - C.QScriptValue_setProperty33(this.h, (C.uint)(arrayIndex), value.cPointer(), (*C.int)(unsafe.Pointer(flags))) +func (this *QScriptValue) SetProperty5(arrayIndex uint, value *QScriptValue, flags *QScriptValue__PropertyFlag) { + C.QScriptValue_setProperty5(this.h, (C.uint)(arrayIndex), value.cPointer(), (*C.int)(unsafe.Pointer(flags))) } -func (this *QScriptValue) Property23(name *QScriptString, mode *QScriptValue__ResolveFlag) *QScriptValue { - _goptr := newQScriptValue(C.QScriptValue_property23(this.h, name.cPointer(), (*C.int)(unsafe.Pointer(mode)))) +func (this *QScriptValue) Property4(name *QScriptString, mode *QScriptValue__ResolveFlag) *QScriptValue { + _goptr := newQScriptValue(C.QScriptValue_property4(this.h, name.cPointer(), (*C.int)(unsafe.Pointer(mode)))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QScriptValue) SetProperty34(name *QScriptString, value *QScriptValue, flags *QScriptValue__PropertyFlag) { - C.QScriptValue_setProperty34(this.h, name.cPointer(), value.cPointer(), (*C.int)(unsafe.Pointer(flags))) +func (this *QScriptValue) SetProperty6(name *QScriptString, value *QScriptValue, flags *QScriptValue__PropertyFlag) { + C.QScriptValue_setProperty6(this.h, name.cPointer(), value.cPointer(), (*C.int)(unsafe.Pointer(flags))) } func (this *QScriptValue) PropertyFlags2(name string, mode *QScriptValue__ResolveFlag) QScriptValue__PropertyFlag { @@ -499,36 +499,36 @@ func (this *QScriptValue) PropertyFlags2(name string, mode *QScriptValue__Resolv return (QScriptValue__PropertyFlag)(C.QScriptValue_propertyFlags2(this.h, name_ms, (*C.int)(unsafe.Pointer(mode)))) } -func (this *QScriptValue) PropertyFlags22(name *QScriptString, mode *QScriptValue__ResolveFlag) QScriptValue__PropertyFlag { - return (QScriptValue__PropertyFlag)(C.QScriptValue_propertyFlags22(this.h, name.cPointer(), (*C.int)(unsafe.Pointer(mode)))) +func (this *QScriptValue) PropertyFlags3(name *QScriptString, mode *QScriptValue__ResolveFlag) QScriptValue__PropertyFlag { + return (QScriptValue__PropertyFlag)(C.QScriptValue_propertyFlags3(this.h, name.cPointer(), (*C.int)(unsafe.Pointer(mode)))) } -func (this *QScriptValue) Call1(thisObject *QScriptValue) *QScriptValue { - _goptr := newQScriptValue(C.QScriptValue_call1(this.h, thisObject.cPointer())) +func (this *QScriptValue) CallWithThisObject(thisObject *QScriptValue) *QScriptValue { + _goptr := newQScriptValue(C.QScriptValue_callWithThisObject(this.h, thisObject.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QScriptValue) Call22(thisObject *QScriptValue, args []QScriptValue) *QScriptValue { +func (this *QScriptValue) Call3(thisObject *QScriptValue, args []QScriptValue) *QScriptValue { args_CArray := (*[0xffff]*C.QScriptValue)(C.malloc(C.size_t(8 * len(args)))) defer C.free(unsafe.Pointer(args_CArray)) for i := range args { args_CArray[i] = args[i].cPointer() } args_ma := C.struct_miqt_array{len: C.size_t(len(args)), data: unsafe.Pointer(args_CArray)} - _goptr := newQScriptValue(C.QScriptValue_call22(this.h, thisObject.cPointer(), args_ma)) + _goptr := newQScriptValue(C.QScriptValue_call3(this.h, thisObject.cPointer(), args_ma)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QScriptValue) Construct1(args []QScriptValue) *QScriptValue { +func (this *QScriptValue) ConstructWithArgs(args []QScriptValue) *QScriptValue { args_CArray := (*[0xffff]*C.QScriptValue)(C.malloc(C.size_t(8 * len(args)))) defer C.free(unsafe.Pointer(args_CArray)) for i := range args { args_CArray[i] = args[i].cPointer() } args_ma := C.struct_miqt_array{len: C.size_t(len(args)), data: unsafe.Pointer(args_CArray)} - _goptr := newQScriptValue(C.QScriptValue_construct1(this.h, args_ma)) + _goptr := newQScriptValue(C.QScriptValue_constructWithArgs(this.h, args_ma)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/script/gen_qscriptvalue.h b/qt/script/gen_qscriptvalue.h index 9ff81873..9cd99bf1 100644 --- a/qt/script/gen_qscriptvalue.h +++ b/qt/script/gen_qscriptvalue.h @@ -77,7 +77,7 @@ bool QScriptValue_toBoolean(const QScriptValue* self); double QScriptValue_toInteger(const QScriptValue* self); int QScriptValue_toInt32(const QScriptValue* self); unsigned int QScriptValue_toUInt32(const QScriptValue* self); -uint16_t QScriptValue_toUInt16(const QScriptValue* self); +unsigned short QScriptValue_toUInt16(const QScriptValue* self); QVariant* QScriptValue_toVariant(const QScriptValue* self); QObject* QScriptValue_toQObject(const QScriptValue* self); QMetaObject* QScriptValue_toQMetaObject(const QScriptValue* self); @@ -110,16 +110,16 @@ QScriptClass* QScriptValue_scriptClass(const QScriptValue* self); void QScriptValue_setScriptClass(QScriptValue* self, QScriptClass* scriptClass); long long QScriptValue_objectId(const QScriptValue* self); QScriptValue* QScriptValue_property2(const QScriptValue* self, struct miqt_string name, int* mode); -void QScriptValue_setProperty32(QScriptValue* self, struct miqt_string name, QScriptValue* value, int* flags); -QScriptValue* QScriptValue_property22(const QScriptValue* self, unsigned int arrayIndex, int* mode); -void QScriptValue_setProperty33(QScriptValue* self, unsigned int arrayIndex, QScriptValue* value, int* flags); -QScriptValue* QScriptValue_property23(const QScriptValue* self, QScriptString* name, int* mode); -void QScriptValue_setProperty34(QScriptValue* self, QScriptString* name, QScriptValue* value, int* flags); +void QScriptValue_setProperty4(QScriptValue* self, struct miqt_string name, QScriptValue* value, int* flags); +QScriptValue* QScriptValue_property3(const QScriptValue* self, unsigned int arrayIndex, int* mode); +void QScriptValue_setProperty5(QScriptValue* self, unsigned int arrayIndex, QScriptValue* value, int* flags); +QScriptValue* QScriptValue_property4(const QScriptValue* self, QScriptString* name, int* mode); +void QScriptValue_setProperty6(QScriptValue* self, QScriptString* name, QScriptValue* value, int* flags); int QScriptValue_propertyFlags2(const QScriptValue* self, struct miqt_string name, int* mode); -int QScriptValue_propertyFlags22(const QScriptValue* self, QScriptString* name, int* mode); -QScriptValue* QScriptValue_call1(QScriptValue* self, QScriptValue* thisObject); -QScriptValue* QScriptValue_call22(QScriptValue* self, QScriptValue* thisObject, struct miqt_array /* of QScriptValue* */ args); -QScriptValue* QScriptValue_construct1(QScriptValue* self, struct miqt_array /* of QScriptValue* */ args); +int QScriptValue_propertyFlags3(const QScriptValue* self, QScriptString* name, int* mode); +QScriptValue* QScriptValue_callWithThisObject(QScriptValue* self, QScriptValue* thisObject); +QScriptValue* QScriptValue_call3(QScriptValue* self, QScriptValue* thisObject, struct miqt_array /* of QScriptValue* */ args); +QScriptValue* QScriptValue_constructWithArgs(QScriptValue* self, struct miqt_array /* of QScriptValue* */ args); void QScriptValue_delete(QScriptValue* self); #ifdef __cplusplus diff --git a/qt/svg/gen_qsvgrenderer.cpp b/qt/svg/gen_qsvgrenderer.cpp index c988197a..08e5e97f 100644 --- a/qt/svg/gen_qsvgrenderer.cpp +++ b/qt/svg/gen_qsvgrenderer.cpp @@ -420,7 +420,7 @@ struct miqt_string QSvgRenderer_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QSvgRenderer_render32(QSvgRenderer* self, QPainter* p, struct miqt_string elementId, QRectF* bounds) { +void QSvgRenderer_render4(QSvgRenderer* self, QPainter* p, struct miqt_string elementId, QRectF* bounds) { QString elementId_QString = QString::fromUtf8(elementId.data, elementId.len); self->render(p, elementId_QString, *bounds); } diff --git a/qt/svg/gen_qsvgrenderer.go b/qt/svg/gen_qsvgrenderer.go index 08cdfd7d..6c3cb2e3 100644 --- a/qt/svg/gen_qsvgrenderer.go +++ b/qt/svg/gen_qsvgrenderer.go @@ -349,12 +349,12 @@ func QSvgRenderer_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QSvgRenderer) Render32(p *qt.QPainter, elementId string, bounds *qt.QRectF) { +func (this *QSvgRenderer) Render4(p *qt.QPainter, elementId string, bounds *qt.QRectF) { elementId_ms := C.struct_miqt_string{} elementId_ms.data = C.CString(elementId) elementId_ms.len = C.size_t(len(elementId)) defer C.free(unsafe.Pointer(elementId_ms.data)) - C.QSvgRenderer_render32(this.h, (*C.QPainter)(p.UnsafePointer()), elementId_ms, (*C.QRectF)(bounds.UnsafePointer())) + C.QSvgRenderer_render4(this.h, (*C.QPainter)(p.UnsafePointer()), elementId_ms, (*C.QRectF)(bounds.UnsafePointer())) } // Sender can only be called from a QSvgRenderer that was directly constructed. diff --git a/qt/svg/gen_qsvgrenderer.h b/qt/svg/gen_qsvgrenderer.h index a05f72e6..b60a1dbf 100644 --- a/qt/svg/gen_qsvgrenderer.h +++ b/qt/svg/gen_qsvgrenderer.h @@ -89,7 +89,7 @@ struct miqt_string QSvgRenderer_tr2(const char* s, const char* c); struct miqt_string QSvgRenderer_tr3(const char* s, const char* c, int n); struct miqt_string QSvgRenderer_trUtf82(const char* s, const char* c); struct miqt_string QSvgRenderer_trUtf83(const char* s, const char* c, int n); -void QSvgRenderer_render32(QSvgRenderer* self, QPainter* p, struct miqt_string elementId, QRectF* bounds); +void QSvgRenderer_render4(QSvgRenderer* self, QPainter* p, struct miqt_string elementId, QRectF* bounds); bool QSvgRenderer_override_virtual_event(void* self, intptr_t slot); bool QSvgRenderer_virtualbase_event(void* self, QEvent* event); bool QSvgRenderer_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt/webchannel/gen_qwebchannel.cpp b/qt/webchannel/gen_qwebchannel.cpp index b7296054..ad02f3d5 100644 --- a/qt/webchannel/gen_qwebchannel.cpp +++ b/qt/webchannel/gen_qwebchannel.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include diff --git a/qt/webengine/gen_qwebengineclientcertificateselection.cpp b/qt/webengine/gen_qwebengineclientcertificateselection.cpp index f58d6458..dd7b908a 100644 --- a/qt/webengine/gen_qwebengineclientcertificateselection.cpp +++ b/qt/webengine/gen_qwebengineclientcertificateselection.cpp @@ -1,6 +1,6 @@ -#include #include #include +#include #include #include #include "gen_qwebengineclientcertificateselection.h" diff --git a/qt/webengine/gen_qwebengineclientcertificatestore.cpp b/qt/webengine/gen_qwebengineclientcertificatestore.cpp index 4ccecdfa..8f398b31 100644 --- a/qt/webengine/gen_qwebengineclientcertificatestore.cpp +++ b/qt/webengine/gen_qwebengineclientcertificatestore.cpp @@ -1,6 +1,6 @@ -#include #include #include +#include #include #include #include "gen_qwebengineclientcertificatestore.h" diff --git a/qt/webengine/gen_qwebenginehttprequest.cpp b/qt/webengine/gen_qwebenginehttprequest.cpp index 00bfae9d..55325c29 100644 --- a/qt/webengine/gen_qwebenginehttprequest.cpp +++ b/qt/webengine/gen_qwebenginehttprequest.cpp @@ -1,10 +1,10 @@ #include -#include #include #include #include #include #include +#include #include #include #include "gen_qwebenginehttprequest.h" diff --git a/qt/webengine/gen_qwebengineprofile.cpp b/qt/webengine/gen_qwebengineprofile.cpp index 497b567b..ced4f12f 100644 --- a/qt/webengine/gen_qwebengineprofile.cpp +++ b/qt/webengine/gen_qwebengineprofile.cpp @@ -538,7 +538,7 @@ struct miqt_string QWebEngineProfile_trUtf83(const char* s, const char* c, int n return _ms; } -void QWebEngineProfile_setUseForGlobalCertificateVerification1(QWebEngineProfile* self, bool enabled) { +void QWebEngineProfile_setUseForGlobalCertificateVerificationWithEnabled(QWebEngineProfile* self, bool enabled) { self->setUseForGlobalCertificateVerification(enabled); } diff --git a/qt/webengine/gen_qwebengineprofile.go b/qt/webengine/gen_qwebengineprofile.go index b55473fd..3649ad2c 100644 --- a/qt/webengine/gen_qwebengineprofile.go +++ b/qt/webengine/gen_qwebengineprofile.go @@ -435,8 +435,8 @@ func QWebEngineProfile_TrUtf83(s string, c string, n int) string { return _ret } -func (this *QWebEngineProfile) SetUseForGlobalCertificateVerification1(enabled bool) { - C.QWebEngineProfile_setUseForGlobalCertificateVerification1(this.h, (C.bool)(enabled)) +func (this *QWebEngineProfile) SetUseForGlobalCertificateVerificationWithEnabled(enabled bool) { + C.QWebEngineProfile_setUseForGlobalCertificateVerificationWithEnabled(this.h, (C.bool)(enabled)) } // Sender can only be called from a QWebEngineProfile that was directly constructed. diff --git a/qt/webengine/gen_qwebengineprofile.h b/qt/webengine/gen_qwebengineprofile.h index bdcee8fc..7d1f65b7 100644 --- a/qt/webengine/gen_qwebengineprofile.h +++ b/qt/webengine/gen_qwebengineprofile.h @@ -103,7 +103,7 @@ struct miqt_string QWebEngineProfile_tr2(const char* s, const char* c); struct miqt_string QWebEngineProfile_tr3(const char* s, const char* c, int n); struct miqt_string QWebEngineProfile_trUtf82(const char* s, const char* c); struct miqt_string QWebEngineProfile_trUtf83(const char* s, const char* c, int n); -void QWebEngineProfile_setUseForGlobalCertificateVerification1(QWebEngineProfile* self, bool enabled); +void QWebEngineProfile_setUseForGlobalCertificateVerificationWithEnabled(QWebEngineProfile* self, bool enabled); bool QWebEngineProfile_override_virtual_event(void* self, intptr_t slot); bool QWebEngineProfile_virtualbase_event(void* self, QEvent* event); bool QWebEngineProfile_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt/webkit/gen_qwebelement.cpp b/qt/webkit/gen_qwebelement.cpp index 67200369..7c4784cc 100644 --- a/qt/webkit/gen_qwebelement.cpp +++ b/qt/webkit/gen_qwebelement.cpp @@ -436,7 +436,7 @@ struct miqt_string QWebElement_attribute2(const QWebElement* self, struct miqt_s return _ms; } -struct miqt_string QWebElement_attributeNS3(const QWebElement* self, struct miqt_string namespaceUri, struct miqt_string name, struct miqt_string defaultValue) { +struct miqt_string QWebElement_attributeNS2(const QWebElement* self, struct miqt_string namespaceUri, struct miqt_string name, struct miqt_string defaultValue) { QString namespaceUri_QString = QString::fromUtf8(namespaceUri.data, namespaceUri.len); QString name_QString = QString::fromUtf8(name.data, name.len); QString defaultValue_QString = QString::fromUtf8(defaultValue.data, defaultValue.len); @@ -450,7 +450,7 @@ struct miqt_string QWebElement_attributeNS3(const QWebElement* self, struct miqt return _ms; } -struct miqt_array /* of struct miqt_string */ QWebElement_attributeNames1(const QWebElement* self, struct miqt_string namespaceUri) { +struct miqt_array /* of struct miqt_string */ QWebElement_attributeNamesWithNamespaceUri(const QWebElement* self, struct miqt_string namespaceUri) { QString namespaceUri_QString = QString::fromUtf8(namespaceUri.data, namespaceUri.len); QStringList _ret = self->attributeNames(namespaceUri_QString); // Convert QList<> from C++ memory to manually-managed C memory diff --git a/qt/webkit/gen_qwebelement.go b/qt/webkit/gen_qwebelement.go index 295ffdf6..1ac7e586 100644 --- a/qt/webkit/gen_qwebelement.go +++ b/qt/webkit/gen_qwebelement.go @@ -543,7 +543,7 @@ func (this *QWebElement) Attribute2(name string, defaultValue string) string { return _ret } -func (this *QWebElement) AttributeNS3(namespaceUri string, name string, defaultValue string) string { +func (this *QWebElement) AttributeNS2(namespaceUri string, name string, defaultValue string) string { namespaceUri_ms := C.struct_miqt_string{} namespaceUri_ms.data = C.CString(namespaceUri) namespaceUri_ms.len = C.size_t(len(namespaceUri)) @@ -556,18 +556,18 @@ func (this *QWebElement) AttributeNS3(namespaceUri string, name string, defaultV 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.QWebElement_attributeNS3(this.h, namespaceUri_ms, name_ms, defaultValue_ms) + var _ms C.struct_miqt_string = C.QWebElement_attributeNS2(this.h, namespaceUri_ms, name_ms, defaultValue_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QWebElement) AttributeNames1(namespaceUri string) []string { +func (this *QWebElement) AttributeNamesWithNamespaceUri(namespaceUri string) []string { 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)) - var _ma C.struct_miqt_array = C.QWebElement_attributeNames1(this.h, namespaceUri_ms) + var _ma C.struct_miqt_array = C.QWebElement_attributeNamesWithNamespaceUri(this.h, namespaceUri_ms) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/webkit/gen_qwebelement.h b/qt/webkit/gen_qwebelement.h index ab88ad16..7d36452b 100644 --- a/qt/webkit/gen_qwebelement.h +++ b/qt/webkit/gen_qwebelement.h @@ -109,8 +109,8 @@ void QWebElement_setStyleProperty(QWebElement* self, struct miqt_string name, st void QWebElement_render(QWebElement* self, QPainter* painter); void QWebElement_render2(QWebElement* self, QPainter* painter, QRect* clipRect); struct miqt_string QWebElement_attribute2(const QWebElement* self, struct miqt_string name, struct miqt_string defaultValue); -struct miqt_string QWebElement_attributeNS3(const QWebElement* self, struct miqt_string namespaceUri, struct miqt_string name, struct miqt_string defaultValue); -struct miqt_array /* of struct miqt_string */ QWebElement_attributeNames1(const QWebElement* self, struct miqt_string namespaceUri); +struct miqt_string QWebElement_attributeNS2(const QWebElement* self, struct miqt_string namespaceUri, struct miqt_string name, struct miqt_string defaultValue); +struct miqt_array /* of struct miqt_string */ QWebElement_attributeNamesWithNamespaceUri(const QWebElement* self, struct miqt_string namespaceUri); void QWebElement_delete(QWebElement* self); QWebElementCollection* QWebElementCollection_new(); diff --git a/qt/webkit/gen_qwebframe.cpp b/qt/webkit/gen_qwebframe.cpp index cd9cbb66..fb0aab63 100644 --- a/qt/webkit/gen_qwebframe.cpp +++ b/qt/webkit/gen_qwebframe.cpp @@ -624,16 +624,16 @@ void QWebFrame_setContent3(QWebFrame* self, struct miqt_string data, struct miqt self->setContent(data_QByteArray, mimeType_QString, *baseUrl); } -void QWebFrame_addToJavaScriptWindowObject3(QWebFrame* self, struct miqt_string name, QObject* object, int ownership) { +void QWebFrame_addToJavaScriptWindowObject2(QWebFrame* self, struct miqt_string name, QObject* object, int ownership) { QString name_QString = QString::fromUtf8(name.data, name.len); self->addToJavaScriptWindowObject(name_QString, object, static_cast(ownership)); } -void QWebFrame_render22(QWebFrame* self, QPainter* param1, QRegion* clip) { +void QWebFrame_render3(QWebFrame* self, QPainter* param1, QRegion* clip) { self->render(param1, *clip); } -void QWebFrame_render3(QWebFrame* self, QPainter* param1, int layer, QRegion* clip) { +void QWebFrame_render4(QWebFrame* self, QPainter* param1, int layer, QRegion* clip) { self->render(param1, static_cast(layer), *clip); } diff --git a/qt/webkit/gen_qwebframe.go b/qt/webkit/gen_qwebframe.go index 1fae60aa..e109e3a2 100644 --- a/qt/webkit/gen_qwebframe.go +++ b/qt/webkit/gen_qwebframe.go @@ -827,18 +827,18 @@ func (this *QWebFrame) SetContent3(data []byte, mimeType string, baseUrl *qt.QUr C.QWebFrame_setContent3(this.h, data_alias, mimeType_ms, (*C.QUrl)(baseUrl.UnsafePointer())) } -func (this *QWebFrame) AddToJavaScriptWindowObject3(name string, object *qt.QObject, ownership QWebFrame__ValueOwnership) { +func (this *QWebFrame) AddToJavaScriptWindowObject2(name string, object *qt.QObject, ownership QWebFrame__ValueOwnership) { 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.QWebFrame_addToJavaScriptWindowObject3(this.h, name_ms, (*C.QObject)(object.UnsafePointer()), (C.int)(ownership)) + C.QWebFrame_addToJavaScriptWindowObject2(this.h, name_ms, (*C.QObject)(object.UnsafePointer()), (C.int)(ownership)) } -func (this *QWebFrame) Render22(param1 *qt.QPainter, clip *qt.QRegion) { - C.QWebFrame_render22(this.h, (*C.QPainter)(param1.UnsafePointer()), (*C.QRegion)(clip.UnsafePointer())) +func (this *QWebFrame) Render3(param1 *qt.QPainter, clip *qt.QRegion) { + C.QWebFrame_render3(this.h, (*C.QPainter)(param1.UnsafePointer()), (*C.QRegion)(clip.UnsafePointer())) } -func (this *QWebFrame) Render3(param1 *qt.QPainter, layer QWebFrame__RenderLayer, clip *qt.QRegion) { - C.QWebFrame_render3(this.h, (*C.QPainter)(param1.UnsafePointer()), (C.int)(layer), (*C.QRegion)(clip.UnsafePointer())) +func (this *QWebFrame) Render4(param1 *qt.QPainter, layer QWebFrame__RenderLayer, clip *qt.QRegion) { + C.QWebFrame_render4(this.h, (*C.QPainter)(param1.UnsafePointer()), (C.int)(layer), (*C.QRegion)(clip.UnsafePointer())) } diff --git a/qt/webkit/gen_qwebframe.h b/qt/webkit/gen_qwebframe.h index 46f80528..06b8e98c 100644 --- a/qt/webkit/gen_qwebframe.h +++ b/qt/webkit/gen_qwebframe.h @@ -166,9 +166,9 @@ void QWebFrame_load3(QWebFrame* self, QNetworkRequest* request, int operation, s void QWebFrame_setHtml2(QWebFrame* self, struct miqt_string html, QUrl* baseUrl); void QWebFrame_setContent2(QWebFrame* self, struct miqt_string data, struct miqt_string mimeType); void QWebFrame_setContent3(QWebFrame* self, struct miqt_string data, struct miqt_string mimeType, QUrl* baseUrl); -void QWebFrame_addToJavaScriptWindowObject3(QWebFrame* self, struct miqt_string name, QObject* object, int ownership); -void QWebFrame_render22(QWebFrame* self, QPainter* param1, QRegion* clip); -void QWebFrame_render3(QWebFrame* self, QPainter* param1, int layer, QRegion* clip); +void QWebFrame_addToJavaScriptWindowObject2(QWebFrame* self, struct miqt_string name, QObject* object, int ownership); +void QWebFrame_render3(QWebFrame* self, QPainter* param1, QRegion* clip); +void QWebFrame_render4(QWebFrame* self, QPainter* param1, int layer, QRegion* clip); #ifdef __cplusplus } /* extern C */ diff --git a/qt/webkit/gen_qwebsettings.cpp b/qt/webkit/gen_qwebsettings.cpp index cac69214..4118fb1c 100644 --- a/qt/webkit/gen_qwebsettings.cpp +++ b/qt/webkit/gen_qwebsettings.cpp @@ -263,7 +263,7 @@ struct miqt_string QWebSettings_cssMediaType(const QWebSettings* self) { return _ms; } -void QWebSettings_enablePersistentStorage1(struct miqt_string path) { +void QWebSettings_enablePersistentStorageWithPath(struct miqt_string path) { QString path_QString = QString::fromUtf8(path.data, path.len); QWebSettings::enablePersistentStorage(path_QString); } diff --git a/qt/webkit/gen_qwebsettings.go b/qt/webkit/gen_qwebsettings.go index f0059c38..ca1d61f4 100644 --- a/qt/webkit/gen_qwebsettings.go +++ b/qt/webkit/gen_qwebsettings.go @@ -370,10 +370,10 @@ func (this *QWebSettings) CssMediaType() string { return _ret } -func QWebSettings_EnablePersistentStorage1(path string) { +func QWebSettings_EnablePersistentStorageWithPath(path string) { 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.QWebSettings_enablePersistentStorage1(path_ms) + C.QWebSettings_enablePersistentStorageWithPath(path_ms) } diff --git a/qt/webkit/gen_qwebsettings.h b/qt/webkit/gen_qwebsettings.h index 579f27e7..c8fa5b72 100644 --- a/qt/webkit/gen_qwebsettings.h +++ b/qt/webkit/gen_qwebsettings.h @@ -67,7 +67,7 @@ void QWebSettings_setThirdPartyCookiePolicy(QWebSettings* self, int thirdPartyCo int QWebSettings_thirdPartyCookiePolicy(const QWebSettings* self); void QWebSettings_setCSSMediaType(QWebSettings* self, struct miqt_string cSSMediaType); struct miqt_string QWebSettings_cssMediaType(const QWebSettings* self); -void QWebSettings_enablePersistentStorage1(struct miqt_string path); +void QWebSettings_enablePersistentStorageWithPath(struct miqt_string path); #ifdef __cplusplus } /* extern C */ diff --git a/qt6/cbor/gen_qcborarray.cpp b/qt6/cbor/gen_qcborarray.cpp index 2ff9e888..bf09eb32 100644 --- a/qt6/cbor/gen_qcborarray.cpp +++ b/qt6/cbor/gen_qcborarray.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include "gen_qcborarray.h" @@ -240,10 +241,33 @@ QCborArray* QCborArray_fromStringList(struct miqt_array /* of struct miqt_string return new QCborArray(QCborArray::fromStringList(list_QList)); } +QCborArray* QCborArray_fromVariantList(struct miqt_array /* of QVariant* */ list) { + QVariantList list_QList; + list_QList.reserve(list.len); + QVariant** list_arr = static_cast(list.data); + for(size_t i = 0; i < list.len; ++i) { + list_QList.push_back(*(list_arr[i])); + } + return new QCborArray(QCborArray::fromVariantList(list_QList)); +} + QCborArray* QCborArray_fromJsonArray(QJsonArray* array) { return new QCborArray(QCborArray::fromJsonArray(*array)); } +struct miqt_array /* of QVariant* */ QCborArray_toVariantList(const QCborArray* self) { + QVariantList _ret = self->toVariantList(); + // Convert QList<> from C++ memory to manually-managed C memory + QVariant** _arr = static_cast(malloc(sizeof(QVariant*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = new QVariant(_ret[i]); + } + struct miqt_array _out; + _out.len = _ret.length(); + _out.data = static_cast(_arr); + return _out; +} + QJsonArray* QCborArray_toJsonArray(const QCborArray* self) { return new QJsonArray(self->toJsonArray()); } diff --git a/qt6/cbor/gen_qcborarray.go b/qt6/cbor/gen_qcborarray.go index 6d429b69..cc31a7fb 100644 --- a/qt6/cbor/gen_qcborarray.go +++ b/qt6/cbor/gen_qcborarray.go @@ -322,12 +322,36 @@ func QCborArray_FromStringList(list []string) *QCborArray { return _goptr } +func QCborArray_FromVariantList(list []qt6.QVariant) *QCborArray { + list_CArray := (*[0xffff]*C.QVariant)(C.malloc(C.size_t(8 * len(list)))) + defer C.free(unsafe.Pointer(list_CArray)) + for i := range list { + list_CArray[i] = (*C.QVariant)(list[i].UnsafePointer()) + } + list_ma := C.struct_miqt_array{len: C.size_t(len(list)), data: unsafe.Pointer(list_CArray)} + _goptr := newQCborArray(C.QCborArray_fromVariantList(list_ma)) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func QCborArray_FromJsonArray(array *qt6.QJsonArray) *QCborArray { _goptr := newQCborArray(C.QCborArray_fromJsonArray((*C.QJsonArray)(array.UnsafePointer()))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } +func (this *QCborArray) ToVariantList() []qt6.QVariant { + var _ma C.struct_miqt_array = C.QCborArray_toVariantList(this.h) + _ret := make([]qt6.QVariant, int(_ma.len)) + _outCast := (*[0xffff]*C.QVariant)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _lv_goptr := qt6.UnsafeNewQVariant(unsafe.Pointer(_outCast[i])) + _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + _ret[i] = *_lv_goptr + } + return _ret +} + func (this *QCborArray) ToJsonArray() *qt6.QJsonArray { _goptr := qt6.UnsafeNewQJsonArray(unsafe.Pointer(C.QCborArray_toJsonArray(this.h))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer diff --git a/qt6/cbor/gen_qcborarray.h b/qt6/cbor/gen_qcborarray.h index 7eb14411..86b16122 100644 --- a/qt6/cbor/gen_qcborarray.h +++ b/qt6/cbor/gen_qcborarray.h @@ -30,6 +30,7 @@ class QCborValue; class QCborValueConstRef; class QCborValueRef; class QJsonArray; +class QVariant; #else typedef struct QCborArray QCborArray; typedef struct QCborArray__ConstIterator QCborArray__ConstIterator; @@ -38,6 +39,7 @@ typedef struct QCborValue QCborValue; typedef struct QCborValueConstRef QCborValueConstRef; typedef struct QCborValueRef QCborValueRef; typedef struct QJsonArray QJsonArray; +typedef struct QVariant QVariant; #endif QCborArray* QCborArray_new(); @@ -92,7 +94,9 @@ 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_fromVariantList(struct miqt_array /* of QVariant* */ list); QCborArray* QCborArray_fromJsonArray(QJsonArray* array); +struct miqt_array /* of QVariant* */ QCborArray_toVariantList(const QCborArray* self); QJsonArray* QCborArray_toJsonArray(const QCborArray* self); void QCborArray_delete(QCborArray* self); diff --git a/qt6/cbor/gen_qcbormap.cpp b/qt6/cbor/gen_qcbormap.cpp index de892562..1a925050 100644 --- a/qt6/cbor/gen_qcbormap.cpp +++ b/qt6/cbor/gen_qcbormap.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qt6/cbor/gen_qcborstreamreader.cpp b/qt6/cbor/gen_qcborstreamreader.cpp index 9282eeb3..c4849bcc 100644 --- a/qt6/cbor/gen_qcborstreamreader.cpp +++ b/qt6/cbor/gen_qcborstreamreader.cpp @@ -241,7 +241,7 @@ long long QCborStreamReader_toInteger(const QCborStreamReader* self) { return static_cast(_ret); } -bool QCborStreamReader_next1(QCborStreamReader* self, int maxRecursion) { +bool QCborStreamReader_nextWithMaxRecursion(QCborStreamReader* self, int maxRecursion) { return self->next(static_cast(maxRecursion)); } diff --git a/qt6/cbor/gen_qcborstreamreader.go b/qt6/cbor/gen_qcborstreamreader.go index 660f799a..569aad85 100644 --- a/qt6/cbor/gen_qcborstreamreader.go +++ b/qt6/cbor/gen_qcborstreamreader.go @@ -320,8 +320,8 @@ func (this *QCborStreamReader) ToInteger() int64 { return (int64)(C.QCborStreamReader_toInteger(this.h)) } -func (this *QCborStreamReader) Next1(maxRecursion int) bool { - return (bool)(C.QCborStreamReader_next1(this.h, (C.int)(maxRecursion))) +func (this *QCborStreamReader) NextWithMaxRecursion(maxRecursion int) bool { + return (bool)(C.QCborStreamReader_nextWithMaxRecursion(this.h, (C.int)(maxRecursion))) } // Delete this object from C++ memory. diff --git a/qt6/cbor/gen_qcborstreamreader.h b/qt6/cbor/gen_qcborstreamreader.h index f8ac0c5d..0183209f 100644 --- a/qt6/cbor/gen_qcborstreamreader.h +++ b/qt6/cbor/gen_qcborstreamreader.h @@ -78,7 +78,7 @@ uint8_t QCborStreamReader_toSimpleType(const QCborStreamReader* self); float QCborStreamReader_toFloat(const QCborStreamReader* self); double QCborStreamReader_toDouble(const QCborStreamReader* self); long long QCborStreamReader_toInteger(const QCborStreamReader* self); -bool QCborStreamReader_next1(QCborStreamReader* self, int maxRecursion); +bool QCborStreamReader_nextWithMaxRecursion(QCborStreamReader* self, int maxRecursion); void QCborStreamReader_delete(QCborStreamReader* self); #ifdef __cplusplus diff --git a/qt6/cbor/gen_qcborstreamwriter.cpp b/qt6/cbor/gen_qcborstreamwriter.cpp index a5062be3..64fca3b7 100644 --- a/qt6/cbor/gen_qcborstreamwriter.cpp +++ b/qt6/cbor/gen_qcborstreamwriter.cpp @@ -117,7 +117,7 @@ bool QCborStreamWriter_endMap(QCborStreamWriter* self) { return self->endMap(); } -void QCborStreamWriter_append22(QCborStreamWriter* self, const char* str, ptrdiff_t size) { +void QCborStreamWriter_append5(QCborStreamWriter* self, const char* str, ptrdiff_t size) { self->append(str, (qsizetype)(size)); } diff --git a/qt6/cbor/gen_qcborstreamwriter.go b/qt6/cbor/gen_qcborstreamwriter.go index 7755520b..7f2bf90e 100644 --- a/qt6/cbor/gen_qcborstreamwriter.go +++ b/qt6/cbor/gen_qcborstreamwriter.go @@ -165,10 +165,10 @@ func (this *QCborStreamWriter) EndMap() bool { return (bool)(C.QCborStreamWriter_endMap(this.h)) } -func (this *QCborStreamWriter) Append22(str string, size int64) { +func (this *QCborStreamWriter) Append5(str string, size int64) { str_Cstring := C.CString(str) defer C.free(unsafe.Pointer(str_Cstring)) - C.QCborStreamWriter_append22(this.h, str_Cstring, (C.ptrdiff_t)(size)) + C.QCborStreamWriter_append5(this.h, str_Cstring, (C.ptrdiff_t)(size)) } // Delete this object from C++ memory. diff --git a/qt6/cbor/gen_qcborstreamwriter.h b/qt6/cbor/gen_qcborstreamwriter.h index 3d2ebdce..8f62d85b 100644 --- a/qt6/cbor/gen_qcborstreamwriter.h +++ b/qt6/cbor/gen_qcborstreamwriter.h @@ -48,7 +48,7 @@ bool QCborStreamWriter_endArray(QCborStreamWriter* self); void QCborStreamWriter_startMap(QCborStreamWriter* self); void QCborStreamWriter_startMapWithCount(QCborStreamWriter* self, unsigned long long count); bool QCborStreamWriter_endMap(QCborStreamWriter* self); -void QCborStreamWriter_append22(QCborStreamWriter* self, const char* str, ptrdiff_t size); +void QCborStreamWriter_append5(QCborStreamWriter* self, const char* str, ptrdiff_t size); void QCborStreamWriter_delete(QCborStreamWriter* self); #ifdef __cplusplus diff --git a/qt6/cbor/gen_qcborvalue.cpp b/qt6/cbor/gen_qcborvalue.cpp index 7936485e..c35859a0 100644 --- a/qt6/cbor/gen_qcborvalue.cpp +++ b/qt6/cbor/gen_qcborvalue.cpp @@ -395,34 +395,34 @@ struct miqt_string QCborValue_toDiagnosticNotation(const QCborValue* self) { return _ms; } -uint8_t QCborValue_toSimpleType1(const QCborValue* self, uint8_t defaultValue) { +uint8_t QCborValue_toSimpleTypeWithDefaultValue(const QCborValue* self, uint8_t defaultValue) { QCborSimpleType _ret = self->toSimpleType(static_cast(defaultValue)); return static_cast(_ret); } -long long QCborValue_toInteger1(const QCborValue* self, long long defaultValue) { +long long QCborValue_toIntegerWithDefaultValue(const QCborValue* self, long long defaultValue) { qint64 _ret = self->toInteger(static_cast(defaultValue)); return static_cast(_ret); } -bool QCborValue_toBool1(const QCborValue* self, bool defaultValue) { +bool QCborValue_toBoolWithDefaultValue(const QCborValue* self, bool defaultValue) { return self->toBool(defaultValue); } -double QCborValue_toDouble1(const QCborValue* self, double defaultValue) { +double QCborValue_toDoubleWithDefaultValue(const QCborValue* self, double defaultValue) { return self->toDouble(static_cast(defaultValue)); } -uint64_t QCborValue_tag1(const QCborValue* self, uint64_t defaultValue) { +uint64_t QCborValue_tagWithDefaultValue(const QCborValue* self, uint64_t defaultValue) { QCborTag _ret = self->tag(static_cast(defaultValue)); return static_cast(_ret); } -QCborValue* QCborValue_taggedValue1(const QCborValue* self, QCborValue* defaultValue) { +QCborValue* QCborValue_taggedValueWithDefaultValue(const QCborValue* self, QCborValue* defaultValue) { return new QCborValue(self->taggedValue(*defaultValue)); } -struct miqt_string QCborValue_toByteArray1(const QCborValue* self, struct miqt_string defaultValue) { +struct miqt_string QCborValue_toByteArrayWithDefaultValue(const QCborValue* self, struct miqt_string defaultValue) { QByteArray defaultValue_QByteArray(defaultValue.data, defaultValue.len); QByteArray _qb = self->toByteArray(defaultValue_QByteArray); struct miqt_string _ms; @@ -432,7 +432,7 @@ struct miqt_string QCborValue_toByteArray1(const QCborValue* self, struct miqt_s return _ms; } -struct miqt_string QCborValue_toString1(const QCborValue* self, struct miqt_string defaultValue) { +struct miqt_string QCborValue_toStringWithDefaultValue(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 @@ -444,36 +444,36 @@ struct miqt_string QCborValue_toString1(const QCborValue* self, struct miqt_stri return _ms; } -QDateTime* QCborValue_toDateTime1(const QCborValue* self, QDateTime* defaultValue) { +QDateTime* QCborValue_toDateTimeWithDefaultValue(const QCborValue* self, QDateTime* defaultValue) { return new QDateTime(self->toDateTime(*defaultValue)); } -QUrl* QCborValue_toUrl1(const QCborValue* self, QUrl* defaultValue) { +QUrl* QCborValue_toUrlWithDefaultValue(const QCborValue* self, QUrl* defaultValue) { return new QUrl(self->toUrl(*defaultValue)); } -QRegularExpression* QCborValue_toRegularExpression1(const QCborValue* self, QRegularExpression* defaultValue) { +QRegularExpression* QCborValue_toRegularExpressionWithDefaultValue(const QCborValue* self, QRegularExpression* defaultValue) { return new QRegularExpression(self->toRegularExpression(*defaultValue)); } -QUuid* QCborValue_toUuid1(const QCborValue* self, QUuid* defaultValue) { +QUuid* QCborValue_toUuidWithDefaultValue(const QCborValue* self, QUuid* defaultValue) { return new QUuid(self->toUuid(*defaultValue)); } -QCborValue* QCborValue_fromCbor22(struct miqt_string ba, QCborParserError* error) { +QCborValue* QCborValue_fromCbor4(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 len, QCborParserError* error) { +QCborValue* QCborValue_fromCbor5(const char* data, ptrdiff_t len, QCborParserError* error) { return new QCborValue(QCborValue::fromCbor(data, (qsizetype)(len), error)); } -QCborValue* QCborValue_fromCbor33(const unsigned char* data, ptrdiff_t len, QCborParserError* error) { +QCborValue* QCborValue_fromCbor6(const unsigned char* data, ptrdiff_t len, QCborParserError* error) { return new QCborValue(QCborValue::fromCbor(static_cast(data), (qsizetype)(len), error)); } -struct miqt_string QCborValue_toCbor1(const QCborValue* self, int opt) { +struct miqt_string QCborValue_toCborWithOpt(const QCborValue* self, int opt) { QByteArray _qb = self->toCbor(static_cast(opt)); struct miqt_string _ms; _ms.len = _qb.length(); @@ -486,7 +486,7 @@ void QCborValue_toCbor2(const QCborValue* self, QCborStreamWriter* writer, int o self->toCbor(*writer, static_cast(opt)); } -struct miqt_string QCborValue_toDiagnosticNotation1(const QCborValue* self, int opts) { +struct miqt_string QCborValue_toDiagnosticNotationWithOpts(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(); @@ -730,34 +730,34 @@ struct miqt_string QCborValueConstRef_toDiagnosticNotation(const QCborValueConst return _ms; } -uint8_t QCborValueConstRef_toSimpleType1(const QCborValueConstRef* self, uint8_t defaultValue) { +uint8_t QCborValueConstRef_toSimpleTypeWithDefaultValue(const QCborValueConstRef* self, uint8_t defaultValue) { QCborSimpleType _ret = self->toSimpleType(static_cast(defaultValue)); return static_cast(_ret); } -uint64_t QCborValueConstRef_tag1(const QCborValueConstRef* self, uint64_t defaultValue) { +uint64_t QCborValueConstRef_tagWithDefaultValue(const QCborValueConstRef* self, uint64_t defaultValue) { QCborTag _ret = self->tag(static_cast(defaultValue)); return static_cast(_ret); } -QCborValue* QCborValueConstRef_taggedValue1(const QCborValueConstRef* self, QCborValue* defaultValue) { +QCborValue* QCborValueConstRef_taggedValueWithDefaultValue(const QCborValueConstRef* self, QCborValue* defaultValue) { return new QCborValue(self->taggedValue(*defaultValue)); } -long long QCborValueConstRef_toInteger1(const QCborValueConstRef* self, long long defaultValue) { +long long QCborValueConstRef_toIntegerWithDefaultValue(const QCborValueConstRef* self, long long defaultValue) { qint64 _ret = self->toInteger(static_cast(defaultValue)); return static_cast(_ret); } -bool QCborValueConstRef_toBool1(const QCborValueConstRef* self, bool defaultValue) { +bool QCborValueConstRef_toBoolWithDefaultValue(const QCborValueConstRef* self, bool defaultValue) { return self->toBool(defaultValue); } -double QCborValueConstRef_toDouble1(const QCborValueConstRef* self, double defaultValue) { +double QCborValueConstRef_toDoubleWithDefaultValue(const QCborValueConstRef* self, double defaultValue) { return self->toDouble(static_cast(defaultValue)); } -struct miqt_string QCborValueConstRef_toByteArray1(const QCborValueConstRef* self, struct miqt_string defaultValue) { +struct miqt_string QCborValueConstRef_toByteArrayWithDefaultValue(const QCborValueConstRef* self, struct miqt_string defaultValue) { QByteArray defaultValue_QByteArray(defaultValue.data, defaultValue.len); QByteArray _qb = self->toByteArray(defaultValue_QByteArray); struct miqt_string _ms; @@ -767,7 +767,7 @@ struct miqt_string QCborValueConstRef_toByteArray1(const QCborValueConstRef* sel return _ms; } -struct miqt_string QCborValueConstRef_toString1(const QCborValueConstRef* self, struct miqt_string defaultValue) { +struct miqt_string QCborValueConstRef_toStringWithDefaultValue(const QCborValueConstRef* 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 @@ -779,23 +779,23 @@ struct miqt_string QCborValueConstRef_toString1(const QCborValueConstRef* self, return _ms; } -QDateTime* QCborValueConstRef_toDateTime1(const QCborValueConstRef* self, QDateTime* defaultValue) { +QDateTime* QCborValueConstRef_toDateTimeWithDefaultValue(const QCborValueConstRef* self, QDateTime* defaultValue) { return new QDateTime(self->toDateTime(*defaultValue)); } -QUrl* QCborValueConstRef_toUrl1(const QCborValueConstRef* self, QUrl* defaultValue) { +QUrl* QCborValueConstRef_toUrlWithDefaultValue(const QCborValueConstRef* self, QUrl* defaultValue) { return new QUrl(self->toUrl(*defaultValue)); } -QRegularExpression* QCborValueConstRef_toRegularExpression1(const QCborValueConstRef* self, QRegularExpression* defaultValue) { +QRegularExpression* QCborValueConstRef_toRegularExpressionWithDefaultValue(const QCborValueConstRef* self, QRegularExpression* defaultValue) { return new QRegularExpression(self->toRegularExpression(*defaultValue)); } -QUuid* QCborValueConstRef_toUuid1(const QCborValueConstRef* self, QUuid* defaultValue) { +QUuid* QCborValueConstRef_toUuidWithDefaultValue(const QCborValueConstRef* self, QUuid* defaultValue) { return new QUuid(self->toUuid(*defaultValue)); } -struct miqt_string QCborValueConstRef_toCbor1(const QCborValueConstRef* self, int opt) { +struct miqt_string QCborValueConstRef_toCborWithOpt(const QCborValueConstRef* self, int opt) { QByteArray _qb = self->toCbor(static_cast(opt)); struct miqt_string _ms; _ms.len = _qb.length(); @@ -808,7 +808,7 @@ void QCborValueConstRef_toCbor2(const QCborValueConstRef* self, QCborStreamWrite self->toCbor(*writer, static_cast(opt)); } -struct miqt_string QCborValueConstRef_toDiagnosticNotation1(const QCborValueConstRef* self, int opt) { +struct miqt_string QCborValueConstRef_toDiagnosticNotationWithOpt(const QCborValueConstRef* 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(); @@ -1073,34 +1073,34 @@ struct miqt_string QCborValueRef_toDiagnosticNotation(QCborValueRef* self) { return _ms; } -uint8_t QCborValueRef_toSimpleType1(const QCborValueRef* self, uint8_t defaultValue) { +uint8_t QCborValueRef_toSimpleTypeWithDefaultValue(const QCborValueRef* self, uint8_t defaultValue) { QCborSimpleType _ret = self->toSimpleType(static_cast(defaultValue)); return static_cast(_ret); } -uint64_t QCborValueRef_tag1(const QCborValueRef* self, uint64_t defaultValue) { +uint64_t QCborValueRef_tagWithDefaultValue(const QCborValueRef* self, uint64_t defaultValue) { QCborTag _ret = self->tag(static_cast(defaultValue)); return static_cast(_ret); } -QCborValue* QCborValueRef_taggedValue1(const QCborValueRef* self, QCborValue* defaultValue) { +QCborValue* QCborValueRef_taggedValueWithDefaultValue(const QCborValueRef* self, QCborValue* defaultValue) { return new QCborValue(self->taggedValue(*defaultValue)); } -long long QCborValueRef_toInteger1(const QCborValueRef* self, long long defaultValue) { +long long QCborValueRef_toIntegerWithDefaultValue(const QCborValueRef* self, long long defaultValue) { qint64 _ret = self->toInteger(static_cast(defaultValue)); return static_cast(_ret); } -bool QCborValueRef_toBool1(const QCborValueRef* self, bool defaultValue) { +bool QCborValueRef_toBoolWithDefaultValue(const QCborValueRef* self, bool defaultValue) { return self->toBool(defaultValue); } -double QCborValueRef_toDouble1(const QCborValueRef* self, double defaultValue) { +double QCborValueRef_toDoubleWithDefaultValue(const QCborValueRef* self, double defaultValue) { return self->toDouble(static_cast(defaultValue)); } -struct miqt_string QCborValueRef_toByteArray1(const QCborValueRef* self, struct miqt_string defaultValue) { +struct miqt_string QCborValueRef_toByteArrayWithDefaultValue(const QCborValueRef* self, struct miqt_string defaultValue) { QByteArray defaultValue_QByteArray(defaultValue.data, defaultValue.len); QByteArray _qb = self->toByteArray(defaultValue_QByteArray); struct miqt_string _ms; @@ -1110,7 +1110,7 @@ struct miqt_string QCborValueRef_toByteArray1(const QCborValueRef* self, struct return _ms; } -struct miqt_string QCborValueRef_toString1(const QCborValueRef* self, struct miqt_string defaultValue) { +struct miqt_string QCborValueRef_toStringWithDefaultValue(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 @@ -1122,23 +1122,23 @@ struct miqt_string QCborValueRef_toString1(const QCborValueRef* self, struct miq return _ms; } -QDateTime* QCborValueRef_toDateTime1(const QCborValueRef* self, QDateTime* defaultValue) { +QDateTime* QCborValueRef_toDateTimeWithDefaultValue(const QCborValueRef* self, QDateTime* defaultValue) { return new QDateTime(self->toDateTime(*defaultValue)); } -QUrl* QCborValueRef_toUrl1(const QCborValueRef* self, QUrl* defaultValue) { +QUrl* QCborValueRef_toUrlWithDefaultValue(const QCborValueRef* self, QUrl* defaultValue) { return new QUrl(self->toUrl(*defaultValue)); } -QRegularExpression* QCborValueRef_toRegularExpression1(const QCborValueRef* self, QRegularExpression* defaultValue) { +QRegularExpression* QCborValueRef_toRegularExpressionWithDefaultValue(const QCborValueRef* self, QRegularExpression* defaultValue) { return new QRegularExpression(self->toRegularExpression(*defaultValue)); } -QUuid* QCborValueRef_toUuid1(const QCborValueRef* self, QUuid* defaultValue) { +QUuid* QCborValueRef_toUuidWithDefaultValue(const QCborValueRef* self, QUuid* defaultValue) { return new QUuid(self->toUuid(*defaultValue)); } -struct miqt_string QCborValueRef_toCbor1(QCborValueRef* self, int opt) { +struct miqt_string QCborValueRef_toCborWithOpt(QCborValueRef* self, int opt) { QByteArray _qb = self->toCbor(static_cast(opt)); struct miqt_string _ms; _ms.len = _qb.length(); @@ -1151,7 +1151,7 @@ void QCborValueRef_toCbor2(QCborValueRef* self, QCborStreamWriter* writer, int o self->toCbor(*writer, static_cast(opt)); } -struct miqt_string QCborValueRef_toDiagnosticNotation1(QCborValueRef* self, int opt) { +struct miqt_string QCborValueRef_toDiagnosticNotationWithOpt(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(); diff --git a/qt6/cbor/gen_qcborvalue.go b/qt6/cbor/gen_qcborvalue.go index 243634bb..9a085b75 100644 --- a/qt6/cbor/gen_qcborvalue.go +++ b/qt6/cbor/gen_qcborvalue.go @@ -587,33 +587,33 @@ func (this *QCborValue) ToDiagnosticNotation() string { return _ret } -func (this *QCborValue) ToSimpleType1(defaultValue QCborSimpleType) QCborSimpleType { - return (QCborSimpleType)(C.QCborValue_toSimpleType1(this.h, (C.uint8_t)(defaultValue))) +func (this *QCborValue) ToSimpleTypeWithDefaultValue(defaultValue QCborSimpleType) QCborSimpleType { + return (QCborSimpleType)(C.QCborValue_toSimpleTypeWithDefaultValue(this.h, (C.uint8_t)(defaultValue))) } -func (this *QCborValue) ToInteger1(defaultValue int64) int64 { - return (int64)(C.QCborValue_toInteger1(this.h, (C.longlong)(defaultValue))) +func (this *QCborValue) ToIntegerWithDefaultValue(defaultValue int64) int64 { + return (int64)(C.QCborValue_toIntegerWithDefaultValue(this.h, (C.longlong)(defaultValue))) } -func (this *QCborValue) ToBool1(defaultValue bool) bool { - return (bool)(C.QCborValue_toBool1(this.h, (C.bool)(defaultValue))) +func (this *QCborValue) ToBoolWithDefaultValue(defaultValue bool) bool { + return (bool)(C.QCborValue_toBoolWithDefaultValue(this.h, (C.bool)(defaultValue))) } -func (this *QCborValue) ToDouble1(defaultValue float64) float64 { - return (float64)(C.QCborValue_toDouble1(this.h, (C.double)(defaultValue))) +func (this *QCborValue) ToDoubleWithDefaultValue(defaultValue float64) float64 { + return (float64)(C.QCborValue_toDoubleWithDefaultValue(this.h, (C.double)(defaultValue))) } -func (this *QCborValue) Tag1(defaultValue QCborTag) QCborTag { - return (QCborTag)(C.QCborValue_tag1(this.h, (C.uint64_t)(defaultValue))) +func (this *QCborValue) TagWithDefaultValue(defaultValue QCborTag) QCborTag { + return (QCborTag)(C.QCborValue_tagWithDefaultValue(this.h, (C.uint64_t)(defaultValue))) } -func (this *QCborValue) TaggedValue1(defaultValue *QCborValue) *QCborValue { - _goptr := newQCborValue(C.QCborValue_taggedValue1(this.h, defaultValue.cPointer())) +func (this *QCborValue) TaggedValueWithDefaultValue(defaultValue *QCborValue) *QCborValue { + _goptr := newQCborValue(C.QCborValue_taggedValueWithDefaultValue(this.h, defaultValue.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToByteArray1(defaultValue []byte) []byte { +func (this *QCborValue) ToByteArrayWithDefaultValue(defaultValue []byte) []byte { defaultValue_alias := C.struct_miqt_string{} if len(defaultValue) > 0 { defaultValue_alias.data = (*C.char)(unsafe.Pointer(&defaultValue[0])) @@ -621,48 +621,48 @@ func (this *QCborValue) ToByteArray1(defaultValue []byte) []byte { defaultValue_alias.data = (*C.char)(unsafe.Pointer(nil)) } defaultValue_alias.len = C.size_t(len(defaultValue)) - var _bytearray C.struct_miqt_string = C.QCborValue_toByteArray1(this.h, defaultValue_alias) + var _bytearray C.struct_miqt_string = C.QCborValue_toByteArrayWithDefaultValue(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 { +func (this *QCborValue) ToStringWithDefaultValue(defaultValue string) string { 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) + var _ms C.struct_miqt_string = C.QCborValue_toStringWithDefaultValue(this.h, defaultValue_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QCborValue) ToDateTime1(defaultValue *qt6.QDateTime) *qt6.QDateTime { - _goptr := qt6.UnsafeNewQDateTime(unsafe.Pointer(C.QCborValue_toDateTime1(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())))) +func (this *QCborValue) ToDateTimeWithDefaultValue(defaultValue *qt6.QDateTime) *qt6.QDateTime { + _goptr := qt6.UnsafeNewQDateTime(unsafe.Pointer(C.QCborValue_toDateTimeWithDefaultValue(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToUrl1(defaultValue *qt6.QUrl) *qt6.QUrl { - _goptr := qt6.UnsafeNewQUrl(unsafe.Pointer(C.QCborValue_toUrl1(this.h, (*C.QUrl)(defaultValue.UnsafePointer())))) +func (this *QCborValue) ToUrlWithDefaultValue(defaultValue *qt6.QUrl) *qt6.QUrl { + _goptr := qt6.UnsafeNewQUrl(unsafe.Pointer(C.QCborValue_toUrlWithDefaultValue(this.h, (*C.QUrl)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToRegularExpression1(defaultValue *qt6.QRegularExpression) *qt6.QRegularExpression { - _goptr := qt6.UnsafeNewQRegularExpression(unsafe.Pointer(C.QCborValue_toRegularExpression1(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())))) +func (this *QCborValue) ToRegularExpressionWithDefaultValue(defaultValue *qt6.QRegularExpression) *qt6.QRegularExpression { + _goptr := qt6.UnsafeNewQRegularExpression(unsafe.Pointer(C.QCborValue_toRegularExpressionWithDefaultValue(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToUuid1(defaultValue *qt6.QUuid) *qt6.QUuid { - _goptr := qt6.UnsafeNewQUuid(unsafe.Pointer(C.QCborValue_toUuid1(this.h, (*C.QUuid)(defaultValue.UnsafePointer())))) +func (this *QCborValue) ToUuidWithDefaultValue(defaultValue *qt6.QUuid) *qt6.QUuid { + _goptr := qt6.UnsafeNewQUuid(unsafe.Pointer(C.QCborValue_toUuidWithDefaultValue(this.h, (*C.QUuid)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QCborValue_FromCbor22(ba []byte, error *QCborParserError) *QCborValue { +func QCborValue_FromCbor4(ba []byte, error *QCborParserError) *QCborValue { ba_alias := C.struct_miqt_string{} if len(ba) > 0 { ba_alias.data = (*C.char)(unsafe.Pointer(&ba[0])) @@ -670,27 +670,27 @@ func QCborValue_FromCbor22(ba []byte, error *QCborParserError) *QCborValue { ba_alias.data = (*C.char)(unsafe.Pointer(nil)) } ba_alias.len = C.size_t(len(ba)) - _goptr := newQCborValue(C.QCborValue_fromCbor22(ba_alias, error.cPointer())) + _goptr := newQCborValue(C.QCborValue_fromCbor4(ba_alias, error.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QCborValue_FromCbor32(data string, lenVal int64, error *QCborParserError) *QCborValue { +func QCborValue_FromCbor5(data string, lenVal int64, error *QCborParserError) *QCborValue { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - _goptr := newQCborValue(C.QCborValue_fromCbor32(data_Cstring, (C.ptrdiff_t)(lenVal), error.cPointer())) + _goptr := newQCborValue(C.QCborValue_fromCbor5(data_Cstring, (C.ptrdiff_t)(lenVal), error.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QCborValue_FromCbor33(data *byte, lenVal int64, error *QCborParserError) *QCborValue { - _goptr := newQCborValue(C.QCborValue_fromCbor33((*C.uchar)(unsafe.Pointer(data)), (C.ptrdiff_t)(lenVal), error.cPointer())) +func QCborValue_FromCbor6(data *byte, lenVal int64, error *QCborParserError) *QCborValue { + _goptr := newQCborValue(C.QCborValue_fromCbor6((*C.uchar)(unsafe.Pointer(data)), (C.ptrdiff_t)(lenVal), error.cPointer())) _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)) +func (this *QCborValue) ToCborWithOpt(opt QCborValue__EncodingOption) []byte { + var _bytearray C.struct_miqt_string = C.QCborValue_toCborWithOpt(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 @@ -700,8 +700,8 @@ func (this *QCborValue) ToCbor2(writer *QCborStreamWriter, opt QCborValue__Encod C.QCborValue_toCbor2(this.h, writer.cPointer(), (C.int)(opt)) } -func (this *QCborValue) ToDiagnosticNotation1(opts QCborValue__DiagnosticNotationOption) string { - var _ms C.struct_miqt_string = C.QCborValue_toDiagnosticNotation1(this.h, (C.int)(opts)) +func (this *QCborValue) ToDiagnosticNotationWithOpts(opts QCborValue__DiagnosticNotationOption) string { + var _ms C.struct_miqt_string = C.QCborValue_toDiagnosticNotationWithOpts(this.h, (C.int)(opts)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -999,33 +999,33 @@ func (this *QCborValueConstRef) ToDiagnosticNotation() string { return _ret } -func (this *QCborValueConstRef) ToSimpleType1(defaultValue QCborSimpleType) QCborSimpleType { - return (QCborSimpleType)(C.QCborValueConstRef_toSimpleType1(this.h, (C.uint8_t)(defaultValue))) +func (this *QCborValueConstRef) ToSimpleTypeWithDefaultValue(defaultValue QCborSimpleType) QCborSimpleType { + return (QCborSimpleType)(C.QCborValueConstRef_toSimpleTypeWithDefaultValue(this.h, (C.uint8_t)(defaultValue))) } -func (this *QCborValueConstRef) Tag1(defaultValue QCborTag) QCborTag { - return (QCborTag)(C.QCborValueConstRef_tag1(this.h, (C.uint64_t)(defaultValue))) +func (this *QCborValueConstRef) TagWithDefaultValue(defaultValue QCborTag) QCborTag { + return (QCborTag)(C.QCborValueConstRef_tagWithDefaultValue(this.h, (C.uint64_t)(defaultValue))) } -func (this *QCborValueConstRef) TaggedValue1(defaultValue *QCborValue) *QCborValue { - _goptr := newQCborValue(C.QCborValueConstRef_taggedValue1(this.h, defaultValue.cPointer())) +func (this *QCborValueConstRef) TaggedValueWithDefaultValue(defaultValue *QCborValue) *QCborValue { + _goptr := newQCborValue(C.QCborValueConstRef_taggedValueWithDefaultValue(this.h, defaultValue.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueConstRef) ToInteger1(defaultValue int64) int64 { - return (int64)(C.QCborValueConstRef_toInteger1(this.h, (C.longlong)(defaultValue))) +func (this *QCborValueConstRef) ToIntegerWithDefaultValue(defaultValue int64) int64 { + return (int64)(C.QCborValueConstRef_toIntegerWithDefaultValue(this.h, (C.longlong)(defaultValue))) } -func (this *QCborValueConstRef) ToBool1(defaultValue bool) bool { - return (bool)(C.QCborValueConstRef_toBool1(this.h, (C.bool)(defaultValue))) +func (this *QCborValueConstRef) ToBoolWithDefaultValue(defaultValue bool) bool { + return (bool)(C.QCborValueConstRef_toBoolWithDefaultValue(this.h, (C.bool)(defaultValue))) } -func (this *QCborValueConstRef) ToDouble1(defaultValue float64) float64 { - return (float64)(C.QCborValueConstRef_toDouble1(this.h, (C.double)(defaultValue))) +func (this *QCborValueConstRef) ToDoubleWithDefaultValue(defaultValue float64) float64 { + return (float64)(C.QCborValueConstRef_toDoubleWithDefaultValue(this.h, (C.double)(defaultValue))) } -func (this *QCborValueConstRef) ToByteArray1(defaultValue []byte) []byte { +func (this *QCborValueConstRef) ToByteArrayWithDefaultValue(defaultValue []byte) []byte { defaultValue_alias := C.struct_miqt_string{} if len(defaultValue) > 0 { defaultValue_alias.data = (*C.char)(unsafe.Pointer(&defaultValue[0])) @@ -1033,49 +1033,49 @@ func (this *QCborValueConstRef) ToByteArray1(defaultValue []byte) []byte { defaultValue_alias.data = (*C.char)(unsafe.Pointer(nil)) } defaultValue_alias.len = C.size_t(len(defaultValue)) - var _bytearray C.struct_miqt_string = C.QCborValueConstRef_toByteArray1(this.h, defaultValue_alias) + var _bytearray C.struct_miqt_string = C.QCborValueConstRef_toByteArrayWithDefaultValue(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 *QCborValueConstRef) ToString1(defaultValue string) string { +func (this *QCborValueConstRef) ToStringWithDefaultValue(defaultValue string) string { 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.QCborValueConstRef_toString1(this.h, defaultValue_ms) + var _ms C.struct_miqt_string = C.QCborValueConstRef_toStringWithDefaultValue(this.h, defaultValue_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QCborValueConstRef) ToDateTime1(defaultValue *qt6.QDateTime) *qt6.QDateTime { - _goptr := qt6.UnsafeNewQDateTime(unsafe.Pointer(C.QCborValueConstRef_toDateTime1(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())))) +func (this *QCborValueConstRef) ToDateTimeWithDefaultValue(defaultValue *qt6.QDateTime) *qt6.QDateTime { + _goptr := qt6.UnsafeNewQDateTime(unsafe.Pointer(C.QCborValueConstRef_toDateTimeWithDefaultValue(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueConstRef) ToUrl1(defaultValue *qt6.QUrl) *qt6.QUrl { - _goptr := qt6.UnsafeNewQUrl(unsafe.Pointer(C.QCborValueConstRef_toUrl1(this.h, (*C.QUrl)(defaultValue.UnsafePointer())))) +func (this *QCborValueConstRef) ToUrlWithDefaultValue(defaultValue *qt6.QUrl) *qt6.QUrl { + _goptr := qt6.UnsafeNewQUrl(unsafe.Pointer(C.QCborValueConstRef_toUrlWithDefaultValue(this.h, (*C.QUrl)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueConstRef) ToRegularExpression1(defaultValue *qt6.QRegularExpression) *qt6.QRegularExpression { - _goptr := qt6.UnsafeNewQRegularExpression(unsafe.Pointer(C.QCborValueConstRef_toRegularExpression1(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())))) +func (this *QCborValueConstRef) ToRegularExpressionWithDefaultValue(defaultValue *qt6.QRegularExpression) *qt6.QRegularExpression { + _goptr := qt6.UnsafeNewQRegularExpression(unsafe.Pointer(C.QCborValueConstRef_toRegularExpressionWithDefaultValue(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueConstRef) ToUuid1(defaultValue *qt6.QUuid) *qt6.QUuid { - _goptr := qt6.UnsafeNewQUuid(unsafe.Pointer(C.QCborValueConstRef_toUuid1(this.h, (*C.QUuid)(defaultValue.UnsafePointer())))) +func (this *QCborValueConstRef) ToUuidWithDefaultValue(defaultValue *qt6.QUuid) *qt6.QUuid { + _goptr := qt6.UnsafeNewQUuid(unsafe.Pointer(C.QCborValueConstRef_toUuidWithDefaultValue(this.h, (*C.QUuid)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueConstRef) ToCbor1(opt QCborValue__EncodingOption) []byte { - var _bytearray C.struct_miqt_string = C.QCborValueConstRef_toCbor1(this.h, (C.int)(opt)) +func (this *QCborValueConstRef) ToCborWithOpt(opt QCborValue__EncodingOption) []byte { + var _bytearray C.struct_miqt_string = C.QCborValueConstRef_toCborWithOpt(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 @@ -1085,8 +1085,8 @@ func (this *QCborValueConstRef) ToCbor2(writer *QCborStreamWriter, opt QCborValu C.QCborValueConstRef_toCbor2(this.h, writer.cPointer(), (C.int)(opt)) } -func (this *QCborValueConstRef) ToDiagnosticNotation1(opt QCborValue__DiagnosticNotationOption) string { - var _ms C.struct_miqt_string = C.QCborValueConstRef_toDiagnosticNotation1(this.h, (C.int)(opt)) +func (this *QCborValueConstRef) ToDiagnosticNotationWithOpt(opt QCborValue__DiagnosticNotationOption) string { + var _ms C.struct_miqt_string = C.QCborValueConstRef_toDiagnosticNotationWithOpt(this.h, (C.int)(opt)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1412,33 +1412,33 @@ func (this *QCborValueRef) ToDiagnosticNotation() string { return _ret } -func (this *QCborValueRef) ToSimpleType1(defaultValue QCborSimpleType) QCborSimpleType { - return (QCborSimpleType)(C.QCborValueRef_toSimpleType1(this.h, (C.uint8_t)(defaultValue))) +func (this *QCborValueRef) ToSimpleTypeWithDefaultValue(defaultValue QCborSimpleType) QCborSimpleType { + return (QCborSimpleType)(C.QCborValueRef_toSimpleTypeWithDefaultValue(this.h, (C.uint8_t)(defaultValue))) } -func (this *QCborValueRef) Tag1(defaultValue QCborTag) QCborTag { - return (QCborTag)(C.QCborValueRef_tag1(this.h, (C.uint64_t)(defaultValue))) +func (this *QCborValueRef) TagWithDefaultValue(defaultValue QCborTag) QCborTag { + return (QCborTag)(C.QCborValueRef_tagWithDefaultValue(this.h, (C.uint64_t)(defaultValue))) } -func (this *QCborValueRef) TaggedValue1(defaultValue *QCborValue) *QCborValue { - _goptr := newQCborValue(C.QCborValueRef_taggedValue1(this.h, defaultValue.cPointer())) +func (this *QCborValueRef) TaggedValueWithDefaultValue(defaultValue *QCborValue) *QCborValue { + _goptr := newQCborValue(C.QCborValueRef_taggedValueWithDefaultValue(this.h, defaultValue.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToInteger1(defaultValue int64) int64 { - return (int64)(C.QCborValueRef_toInteger1(this.h, (C.longlong)(defaultValue))) +func (this *QCborValueRef) ToIntegerWithDefaultValue(defaultValue int64) int64 { + return (int64)(C.QCborValueRef_toIntegerWithDefaultValue(this.h, (C.longlong)(defaultValue))) } -func (this *QCborValueRef) ToBool1(defaultValue bool) bool { - return (bool)(C.QCborValueRef_toBool1(this.h, (C.bool)(defaultValue))) +func (this *QCborValueRef) ToBoolWithDefaultValue(defaultValue bool) bool { + return (bool)(C.QCborValueRef_toBoolWithDefaultValue(this.h, (C.bool)(defaultValue))) } -func (this *QCborValueRef) ToDouble1(defaultValue float64) float64 { - return (float64)(C.QCborValueRef_toDouble1(this.h, (C.double)(defaultValue))) +func (this *QCborValueRef) ToDoubleWithDefaultValue(defaultValue float64) float64 { + return (float64)(C.QCborValueRef_toDoubleWithDefaultValue(this.h, (C.double)(defaultValue))) } -func (this *QCborValueRef) ToByteArray1(defaultValue []byte) []byte { +func (this *QCborValueRef) ToByteArrayWithDefaultValue(defaultValue []byte) []byte { defaultValue_alias := C.struct_miqt_string{} if len(defaultValue) > 0 { defaultValue_alias.data = (*C.char)(unsafe.Pointer(&defaultValue[0])) @@ -1446,49 +1446,49 @@ func (this *QCborValueRef) ToByteArray1(defaultValue []byte) []byte { defaultValue_alias.data = (*C.char)(unsafe.Pointer(nil)) } defaultValue_alias.len = C.size_t(len(defaultValue)) - var _bytearray C.struct_miqt_string = C.QCborValueRef_toByteArray1(this.h, defaultValue_alias) + var _bytearray C.struct_miqt_string = C.QCborValueRef_toByteArrayWithDefaultValue(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 { +func (this *QCborValueRef) ToStringWithDefaultValue(defaultValue string) string { 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) + var _ms C.struct_miqt_string = C.QCborValueRef_toStringWithDefaultValue(this.h, defaultValue_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QCborValueRef) ToDateTime1(defaultValue *qt6.QDateTime) *qt6.QDateTime { - _goptr := qt6.UnsafeNewQDateTime(unsafe.Pointer(C.QCborValueRef_toDateTime1(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())))) +func (this *QCborValueRef) ToDateTimeWithDefaultValue(defaultValue *qt6.QDateTime) *qt6.QDateTime { + _goptr := qt6.UnsafeNewQDateTime(unsafe.Pointer(C.QCborValueRef_toDateTimeWithDefaultValue(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToUrl1(defaultValue *qt6.QUrl) *qt6.QUrl { - _goptr := qt6.UnsafeNewQUrl(unsafe.Pointer(C.QCborValueRef_toUrl1(this.h, (*C.QUrl)(defaultValue.UnsafePointer())))) +func (this *QCborValueRef) ToUrlWithDefaultValue(defaultValue *qt6.QUrl) *qt6.QUrl { + _goptr := qt6.UnsafeNewQUrl(unsafe.Pointer(C.QCborValueRef_toUrlWithDefaultValue(this.h, (*C.QUrl)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToRegularExpression1(defaultValue *qt6.QRegularExpression) *qt6.QRegularExpression { - _goptr := qt6.UnsafeNewQRegularExpression(unsafe.Pointer(C.QCborValueRef_toRegularExpression1(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())))) +func (this *QCborValueRef) ToRegularExpressionWithDefaultValue(defaultValue *qt6.QRegularExpression) *qt6.QRegularExpression { + _goptr := qt6.UnsafeNewQRegularExpression(unsafe.Pointer(C.QCborValueRef_toRegularExpressionWithDefaultValue(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToUuid1(defaultValue *qt6.QUuid) *qt6.QUuid { - _goptr := qt6.UnsafeNewQUuid(unsafe.Pointer(C.QCborValueRef_toUuid1(this.h, (*C.QUuid)(defaultValue.UnsafePointer())))) +func (this *QCborValueRef) ToUuidWithDefaultValue(defaultValue *qt6.QUuid) *qt6.QUuid { + _goptr := qt6.UnsafeNewQUuid(unsafe.Pointer(C.QCborValueRef_toUuidWithDefaultValue(this.h, (*C.QUuid)(defaultValue.UnsafePointer())))) _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)) +func (this *QCborValueRef) ToCborWithOpt(opt QCborValue__EncodingOption) []byte { + var _bytearray C.struct_miqt_string = C.QCborValueRef_toCborWithOpt(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 @@ -1498,8 +1498,8 @@ func (this *QCborValueRef) ToCbor2(writer *QCborStreamWriter, opt QCborValue__En C.QCborValueRef_toCbor2(this.h, writer.cPointer(), (C.int)(opt)) } -func (this *QCborValueRef) ToDiagnosticNotation1(opt QCborValue__DiagnosticNotationOption) string { - var _ms C.struct_miqt_string = C.QCborValueRef_toDiagnosticNotation1(this.h, (C.int)(opt)) +func (this *QCborValueRef) ToDiagnosticNotationWithOpt(opt QCborValue__DiagnosticNotationOption) string { + var _ms C.struct_miqt_string = C.QCborValueRef_toDiagnosticNotationWithOpt(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/qt6/cbor/gen_qcborvalue.h b/qt6/cbor/gen_qcborvalue.h index 4135c1b2..8ececccb 100644 --- a/qt6/cbor/gen_qcborvalue.h +++ b/qt6/cbor/gen_qcborvalue.h @@ -129,24 +129,24 @@ QCborValue* QCborValue_fromCbor3(const unsigned char* data, ptrdiff_t len); struct miqt_string QCborValue_toCbor(const QCborValue* self); void QCborValue_toCborWithWriter(const QCborValue* self, QCborStreamWriter* writer); 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); -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(struct miqt_string ba, QCborParserError* error); -QCborValue* QCborValue_fromCbor32(const char* data, ptrdiff_t len, QCborParserError* error); -QCborValue* QCborValue_fromCbor33(const unsigned char* data, ptrdiff_t len, QCborParserError* error); -struct miqt_string QCborValue_toCbor1(const QCborValue* self, int opt); +uint8_t QCborValue_toSimpleTypeWithDefaultValue(const QCborValue* self, uint8_t defaultValue); +long long QCborValue_toIntegerWithDefaultValue(const QCborValue* self, long long defaultValue); +bool QCborValue_toBoolWithDefaultValue(const QCborValue* self, bool defaultValue); +double QCborValue_toDoubleWithDefaultValue(const QCborValue* self, double defaultValue); +uint64_t QCborValue_tagWithDefaultValue(const QCborValue* self, uint64_t defaultValue); +QCborValue* QCborValue_taggedValueWithDefaultValue(const QCborValue* self, QCborValue* defaultValue); +struct miqt_string QCborValue_toByteArrayWithDefaultValue(const QCborValue* self, struct miqt_string defaultValue); +struct miqt_string QCborValue_toStringWithDefaultValue(const QCborValue* self, struct miqt_string defaultValue); +QDateTime* QCborValue_toDateTimeWithDefaultValue(const QCborValue* self, QDateTime* defaultValue); +QUrl* QCborValue_toUrlWithDefaultValue(const QCborValue* self, QUrl* defaultValue); +QRegularExpression* QCborValue_toRegularExpressionWithDefaultValue(const QCborValue* self, QRegularExpression* defaultValue); +QUuid* QCborValue_toUuidWithDefaultValue(const QCborValue* self, QUuid* defaultValue); +QCborValue* QCborValue_fromCbor4(struct miqt_string ba, QCborParserError* error); +QCborValue* QCborValue_fromCbor5(const char* data, ptrdiff_t len, QCborParserError* error); +QCborValue* QCborValue_fromCbor6(const unsigned char* data, ptrdiff_t len, QCborParserError* error); +struct miqt_string QCborValue_toCborWithOpt(const QCborValue* self, int opt); void QCborValue_toCbor2(const QCborValue* self, QCborStreamWriter* writer, int opt); -struct miqt_string QCborValue_toDiagnosticNotation1(const QCborValue* self, int opts); +struct miqt_string QCborValue_toDiagnosticNotationWithOpts(const QCborValue* self, int opts); void QCborValue_delete(QCborValue* self); QCborValueConstRef* QCborValueConstRef_new(QCborValueConstRef* param1); @@ -199,21 +199,21 @@ QJsonValue* QCborValueConstRef_toJsonValue(const QCborValueConstRef* self); struct miqt_string QCborValueConstRef_toCbor(const QCborValueConstRef* self); void QCborValueConstRef_toCborWithWriter(const QCborValueConstRef* self, QCborStreamWriter* writer); struct miqt_string QCborValueConstRef_toDiagnosticNotation(const QCborValueConstRef* self); -uint8_t QCborValueConstRef_toSimpleType1(const QCborValueConstRef* self, uint8_t defaultValue); -uint64_t QCborValueConstRef_tag1(const QCborValueConstRef* self, uint64_t defaultValue); -QCborValue* QCborValueConstRef_taggedValue1(const QCborValueConstRef* self, QCborValue* defaultValue); -long long QCborValueConstRef_toInteger1(const QCborValueConstRef* self, long long defaultValue); -bool QCborValueConstRef_toBool1(const QCborValueConstRef* self, bool defaultValue); -double QCborValueConstRef_toDouble1(const QCborValueConstRef* self, double defaultValue); -struct miqt_string QCborValueConstRef_toByteArray1(const QCborValueConstRef* self, struct miqt_string defaultValue); -struct miqt_string QCborValueConstRef_toString1(const QCborValueConstRef* self, struct miqt_string defaultValue); -QDateTime* QCborValueConstRef_toDateTime1(const QCborValueConstRef* self, QDateTime* defaultValue); -QUrl* QCborValueConstRef_toUrl1(const QCborValueConstRef* self, QUrl* defaultValue); -QRegularExpression* QCborValueConstRef_toRegularExpression1(const QCborValueConstRef* self, QRegularExpression* defaultValue); -QUuid* QCborValueConstRef_toUuid1(const QCborValueConstRef* self, QUuid* defaultValue); -struct miqt_string QCborValueConstRef_toCbor1(const QCborValueConstRef* self, int opt); +uint8_t QCborValueConstRef_toSimpleTypeWithDefaultValue(const QCborValueConstRef* self, uint8_t defaultValue); +uint64_t QCborValueConstRef_tagWithDefaultValue(const QCborValueConstRef* self, uint64_t defaultValue); +QCborValue* QCborValueConstRef_taggedValueWithDefaultValue(const QCborValueConstRef* self, QCborValue* defaultValue); +long long QCborValueConstRef_toIntegerWithDefaultValue(const QCborValueConstRef* self, long long defaultValue); +bool QCborValueConstRef_toBoolWithDefaultValue(const QCborValueConstRef* self, bool defaultValue); +double QCborValueConstRef_toDoubleWithDefaultValue(const QCborValueConstRef* self, double defaultValue); +struct miqt_string QCborValueConstRef_toByteArrayWithDefaultValue(const QCborValueConstRef* self, struct miqt_string defaultValue); +struct miqt_string QCborValueConstRef_toStringWithDefaultValue(const QCborValueConstRef* self, struct miqt_string defaultValue); +QDateTime* QCborValueConstRef_toDateTimeWithDefaultValue(const QCborValueConstRef* self, QDateTime* defaultValue); +QUrl* QCborValueConstRef_toUrlWithDefaultValue(const QCborValueConstRef* self, QUrl* defaultValue); +QRegularExpression* QCborValueConstRef_toRegularExpressionWithDefaultValue(const QCborValueConstRef* self, QRegularExpression* defaultValue); +QUuid* QCborValueConstRef_toUuidWithDefaultValue(const QCborValueConstRef* self, QUuid* defaultValue); +struct miqt_string QCborValueConstRef_toCborWithOpt(const QCborValueConstRef* self, int opt); void QCborValueConstRef_toCbor2(const QCborValueConstRef* self, QCborStreamWriter* writer, int opt); -struct miqt_string QCborValueConstRef_toDiagnosticNotation1(const QCborValueConstRef* self, int opt); +struct miqt_string QCborValueConstRef_toDiagnosticNotationWithOpt(const QCborValueConstRef* self, int opt); void QCborValueConstRef_delete(QCborValueConstRef* self); QCborValueRef* QCborValueRef_new(QCborValueRef* param1); @@ -271,21 +271,21 @@ QJsonValue* QCborValueRef_toJsonValue(const QCborValueRef* self); struct miqt_string QCborValueRef_toCbor(QCborValueRef* self); void QCborValueRef_toCborWithWriter(QCborValueRef* self, QCborStreamWriter* writer); struct miqt_string QCborValueRef_toDiagnosticNotation(QCborValueRef* self); -uint8_t QCborValueRef_toSimpleType1(const QCborValueRef* self, uint8_t defaultValue); -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); -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); -struct miqt_string QCborValueRef_toCbor1(QCborValueRef* self, int opt); +uint8_t QCborValueRef_toSimpleTypeWithDefaultValue(const QCborValueRef* self, uint8_t defaultValue); +uint64_t QCborValueRef_tagWithDefaultValue(const QCborValueRef* self, uint64_t defaultValue); +QCborValue* QCborValueRef_taggedValueWithDefaultValue(const QCborValueRef* self, QCborValue* defaultValue); +long long QCborValueRef_toIntegerWithDefaultValue(const QCborValueRef* self, long long defaultValue); +bool QCborValueRef_toBoolWithDefaultValue(const QCborValueRef* self, bool defaultValue); +double QCborValueRef_toDoubleWithDefaultValue(const QCborValueRef* self, double defaultValue); +struct miqt_string QCborValueRef_toByteArrayWithDefaultValue(const QCborValueRef* self, struct miqt_string defaultValue); +struct miqt_string QCborValueRef_toStringWithDefaultValue(const QCborValueRef* self, struct miqt_string defaultValue); +QDateTime* QCborValueRef_toDateTimeWithDefaultValue(const QCborValueRef* self, QDateTime* defaultValue); +QUrl* QCborValueRef_toUrlWithDefaultValue(const QCborValueRef* self, QUrl* defaultValue); +QRegularExpression* QCborValueRef_toRegularExpressionWithDefaultValue(const QCborValueRef* self, QRegularExpression* defaultValue); +QUuid* QCborValueRef_toUuidWithDefaultValue(const QCborValueRef* self, QUuid* defaultValue); +struct miqt_string QCborValueRef_toCborWithOpt(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_toDiagnosticNotationWithOpt(QCborValueRef* self, int opt); void QCborValueRef_delete(QCborValueRef* self); #ifdef __cplusplus diff --git a/qt6/gen_qabstractanimation.cpp b/qt6/gen_qabstractanimation.cpp index 74c755b3..08680e99 100644 --- a/qt6/gen_qabstractanimation.cpp +++ b/qt6/gen_qabstractanimation.cpp @@ -443,7 +443,7 @@ struct miqt_string QAbstractAnimation_tr3(const char* s, const char* c, int n) { return _ms; } -void QAbstractAnimation_start1(QAbstractAnimation* self, int policy) { +void QAbstractAnimation_startWithPolicy(QAbstractAnimation* self, int policy) { self->start(static_cast(policy)); } diff --git a/qt6/gen_qabstractanimation.go b/qt6/gen_qabstractanimation.go index 0dc3022d..eb1b2ac5 100644 --- a/qt6/gen_qabstractanimation.go +++ b/qt6/gen_qabstractanimation.go @@ -272,8 +272,8 @@ func QAbstractAnimation_Tr3(s string, c string, n int) string { return _ret } -func (this *QAbstractAnimation) Start1(policy QAbstractAnimation__DeletionPolicy) { - C.QAbstractAnimation_start1(this.h, (C.int)(policy)) +func (this *QAbstractAnimation) StartWithPolicy(policy QAbstractAnimation__DeletionPolicy) { + C.QAbstractAnimation_startWithPolicy(this.h, (C.int)(policy)) } // Sender can only be called from a QAbstractAnimation that was directly constructed. diff --git a/qt6/gen_qabstractanimation.h b/qt6/gen_qabstractanimation.h index ddea3079..8b8bf0e0 100644 --- a/qt6/gen_qabstractanimation.h +++ b/qt6/gen_qabstractanimation.h @@ -73,7 +73,7 @@ void QAbstractAnimation_updateState(QAbstractAnimation* self, int newState, int void QAbstractAnimation_updateDirection(QAbstractAnimation* self, int direction); struct miqt_string QAbstractAnimation_tr2(const char* s, const char* c); struct miqt_string QAbstractAnimation_tr3(const char* s, const char* c, int n); -void QAbstractAnimation_start1(QAbstractAnimation* self, int policy); +void QAbstractAnimation_startWithPolicy(QAbstractAnimation* self, int policy); bool QAbstractAnimation_override_virtual_duration(void* self, intptr_t slot); int QAbstractAnimation_virtualbase_duration(const void* self); bool QAbstractAnimation_override_virtual_event(void* self, intptr_t slot); diff --git a/qt6/gen_qabstractbutton.cpp b/qt6/gen_qabstractbutton.cpp index 45daa6ba..cfe28a3a 100644 --- a/qt6/gen_qabstractbutton.cpp +++ b/qt6/gen_qabstractbutton.cpp @@ -49,7 +49,7 @@ void miqt_exec_callback_QAbstractButton_pressed(intptr_t); void miqt_exec_callback_QAbstractButton_released(intptr_t); void miqt_exec_callback_QAbstractButton_clicked(intptr_t); void miqt_exec_callback_QAbstractButton_toggled(intptr_t, bool); -void miqt_exec_callback_QAbstractButton_clicked1(intptr_t, bool); +void miqt_exec_callback_QAbstractButton_clickedWithChecked(intptr_t, bool); void miqt_exec_callback_QAbstractButton_paintEvent(QAbstractButton*, intptr_t, QPaintEvent*); bool miqt_exec_callback_QAbstractButton_hitButton(const QAbstractButton*, intptr_t, QPoint*); void miqt_exec_callback_QAbstractButton_checkStateSet(QAbstractButton*, intptr_t); @@ -1271,14 +1271,14 @@ struct miqt_string QAbstractButton_tr3(const char* s, const char* c, int n) { return _ms; } -void QAbstractButton_clicked1(QAbstractButton* self, bool checked) { +void QAbstractButton_clickedWithChecked(QAbstractButton* self, bool checked) { self->clicked(checked); } -void QAbstractButton_connect_clicked1(QAbstractButton* self, intptr_t slot) { +void QAbstractButton_connect_clickedWithChecked(QAbstractButton* self, intptr_t slot) { MiqtVirtualQAbstractButton::connect(self, static_cast(&QAbstractButton::clicked), self, [=](bool checked) { bool sigval1 = checked; - miqt_exec_callback_QAbstractButton_clicked1(slot, sigval1); + miqt_exec_callback_QAbstractButton_clickedWithChecked(slot, sigval1); }); } diff --git a/qt6/gen_qabstractbutton.go b/qt6/gen_qabstractbutton.go index 601efe44..f87d8398 100644 --- a/qt6/gen_qabstractbutton.go +++ b/qt6/gen_qabstractbutton.go @@ -291,15 +291,15 @@ func QAbstractButton_Tr3(s string, c string, n int) string { return _ret } -func (this *QAbstractButton) Clicked1(checked bool) { - C.QAbstractButton_clicked1(this.h, (C.bool)(checked)) +func (this *QAbstractButton) ClickedWithChecked(checked bool) { + C.QAbstractButton_clickedWithChecked(this.h, (C.bool)(checked)) } -func (this *QAbstractButton) OnClicked1(slot func(checked bool)) { - C.QAbstractButton_connect_clicked1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QAbstractButton) OnClickedWithChecked(slot func(checked bool)) { + C.QAbstractButton_connect_clickedWithChecked(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QAbstractButton_clicked1 -func miqt_exec_callback_QAbstractButton_clicked1(cb C.intptr_t, checked C.bool) { +//export miqt_exec_callback_QAbstractButton_clickedWithChecked +func miqt_exec_callback_QAbstractButton_clickedWithChecked(cb C.intptr_t, checked C.bool) { gofunc, ok := cgo.Handle(cb).Value().(func(checked bool)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/gen_qabstractbutton.h b/qt6/gen_qabstractbutton.h index b51d6afb..5b0b4375 100644 --- a/qt6/gen_qabstractbutton.h +++ b/qt6/gen_qabstractbutton.h @@ -146,8 +146,8 @@ void QAbstractButton_changeEvent(QAbstractButton* self, QEvent* e); void QAbstractButton_timerEvent(QAbstractButton* self, QTimerEvent* e); struct miqt_string QAbstractButton_tr2(const char* s, const char* c); struct miqt_string QAbstractButton_tr3(const char* s, const char* c, int n); -void QAbstractButton_clicked1(QAbstractButton* self, bool checked); -void QAbstractButton_connect_clicked1(QAbstractButton* self, intptr_t slot); +void QAbstractButton_clickedWithChecked(QAbstractButton* self, bool checked); +void QAbstractButton_connect_clickedWithChecked(QAbstractButton* self, intptr_t slot); bool QAbstractButton_override_virtual_paintEvent(void* self, intptr_t slot); void QAbstractButton_virtualbase_paintEvent(void* self, QPaintEvent* e); bool QAbstractButton_override_virtual_hitButton(void* self, intptr_t slot); diff --git a/qt6/gen_qabstracteventdispatcher.cpp b/qt6/gen_qabstracteventdispatcher.cpp index 1a3e20d6..88981664 100644 --- a/qt6/gen_qabstracteventdispatcher.cpp +++ b/qt6/gen_qabstracteventdispatcher.cpp @@ -167,7 +167,7 @@ struct miqt_string QAbstractEventDispatcher_tr3(const char* s, const char* c, in return _ms; } -QAbstractEventDispatcher* QAbstractEventDispatcher_instance1(QThread* thread) { +QAbstractEventDispatcher* QAbstractEventDispatcher_instanceWithThread(QThread* thread) { return QAbstractEventDispatcher::instance(thread); } diff --git a/qt6/gen_qabstracteventdispatcher.go b/qt6/gen_qabstracteventdispatcher.go index 1d2865ff..ac7013eb 100644 --- a/qt6/gen_qabstracteventdispatcher.go +++ b/qt6/gen_qabstracteventdispatcher.go @@ -208,8 +208,8 @@ func QAbstractEventDispatcher_Tr3(s string, c string, n int) string { return _ret } -func QAbstractEventDispatcher_Instance1(thread *QThread) *QAbstractEventDispatcher { - return newQAbstractEventDispatcher(C.QAbstractEventDispatcher_instance1(thread.cPointer())) +func QAbstractEventDispatcher_InstanceWithThread(thread *QThread) *QAbstractEventDispatcher { + return newQAbstractEventDispatcher(C.QAbstractEventDispatcher_instanceWithThread(thread.cPointer())) } // Delete this object from C++ memory. diff --git a/qt6/gen_qabstracteventdispatcher.h b/qt6/gen_qabstracteventdispatcher.h index 5b6aa3a1..73985876 100644 --- a/qt6/gen_qabstracteventdispatcher.h +++ b/qt6/gen_qabstracteventdispatcher.h @@ -65,7 +65,7 @@ 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); -QAbstractEventDispatcher* QAbstractEventDispatcher_instance1(QThread* thread); +QAbstractEventDispatcher* QAbstractEventDispatcher_instanceWithThread(QThread* thread); void QAbstractEventDispatcher_delete(QAbstractEventDispatcher* self); QAbstractEventDispatcher__TimerInfo* QAbstractEventDispatcher__TimerInfo_new(int id, int i, int t); diff --git a/qt6/gen_qabstractitemmodel.cpp b/qt6/gen_qabstractitemmodel.cpp index 33746b20..377b0da7 100644 --- a/qt6/gen_qabstractitemmodel.cpp +++ b/qt6/gen_qabstractitemmodel.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -32,10 +33,10 @@ void miqt_exec_callback_QAbstractItemModel_dataChanged(intptr_t, QModelIndex*, Q void miqt_exec_callback_QAbstractItemModel_headerDataChanged(intptr_t, int, int, int); void miqt_exec_callback_QAbstractItemModel_layoutChanged(intptr_t); void miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChanged(intptr_t); -void miqt_exec_callback_QAbstractItemModel_dataChanged3(intptr_t, QModelIndex*, QModelIndex*, struct miqt_array /* of int */ ); -void miqt_exec_callback_QAbstractItemModel_layoutChanged1(intptr_t, struct miqt_array /* of QPersistentModelIndex* */ ); +void miqt_exec_callback_QAbstractItemModel_dataChanged2(intptr_t, QModelIndex*, QModelIndex*, struct miqt_array /* of int */ ); +void miqt_exec_callback_QAbstractItemModel_layoutChangedWithParents(intptr_t, struct miqt_array /* of QPersistentModelIndex* */ ); void miqt_exec_callback_QAbstractItemModel_layoutChanged2(intptr_t, struct miqt_array /* of QPersistentModelIndex* */ , int); -void miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChanged1(intptr_t, struct miqt_array /* of QPersistentModelIndex* */ ); +void miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChangedWithParents(intptr_t, struct miqt_array /* of QPersistentModelIndex* */ ); void miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChanged2(intptr_t, struct miqt_array /* of QPersistentModelIndex* */ , int); QModelIndex* miqt_exec_callback_QAbstractItemModel_index(const QAbstractItemModel*, intptr_t, int, int, QModelIndex*); QModelIndex* miqt_exec_callback_QAbstractItemModel_parent(const QAbstractItemModel*, intptr_t, QModelIndex*); @@ -334,7 +335,7 @@ bool QModelIndex_operatorLesser(const QModelIndex* self, QModelIndex* other) { return (*self < *other); } -QVariant* QModelIndex_data1(const QModelIndex* self, int role) { +QVariant* QModelIndex_dataWithRole(const QModelIndex* self, int role) { return new QVariant(self->data(static_cast(role))); } @@ -440,7 +441,7 @@ bool QPersistentModelIndex_isValid(const QPersistentModelIndex* self) { return self->isValid(); } -QVariant* QPersistentModelIndex_data1(const QPersistentModelIndex* self, int role) { +QVariant* QPersistentModelIndex_dataWithRole(const QPersistentModelIndex* self, int role) { return new QVariant(self->data(static_cast(role))); } @@ -1788,7 +1789,7 @@ struct miqt_string QAbstractItemModel_tr3(const char* s, const char* c, int n) { return _ms; } -bool QAbstractItemModel_hasIndex3(const QAbstractItemModel* self, int row, int column, QModelIndex* parent) { +bool QAbstractItemModel_hasIndex2(const QAbstractItemModel* self, int row, int column, QModelIndex* parent) { return self->hasIndex(static_cast(row), static_cast(column), *parent); } @@ -1812,7 +1813,7 @@ bool QAbstractItemModel_checkIndex2(const QAbstractItemModel* self, QModelIndex* return self->checkIndex(*index, static_cast(options)); } -void QAbstractItemModel_dataChanged3(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight, struct miqt_array /* of int */ roles) { +void QAbstractItemModel_dataChanged2(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight, struct miqt_array /* of int */ roles) { QList roles_QList; roles_QList.reserve(roles.len); int* roles_arr = static_cast(roles.data); @@ -1822,7 +1823,7 @@ void QAbstractItemModel_dataChanged3(QAbstractItemModel* self, QModelIndex* topL self->dataChanged(*topLeft, *bottomRight, roles_QList); } -void QAbstractItemModel_connect_dataChanged3(QAbstractItemModel* self, intptr_t slot) { +void QAbstractItemModel_connect_dataChanged2(QAbstractItemModel* self, intptr_t slot) { MiqtVirtualQAbstractItemModel::connect(self, static_cast&)>(&QAbstractItemModel::dataChanged), self, [=](const QModelIndex& topLeft, const QModelIndex& bottomRight, const QList& roles) { const QModelIndex& topLeft_ret = topLeft; // Cast returned reference into pointer @@ -1840,11 +1841,11 @@ void QAbstractItemModel_connect_dataChanged3(QAbstractItemModel* self, intptr_t roles_out.len = roles_ret.length(); roles_out.data = static_cast(roles_arr); struct miqt_array /* of int */ sigval3 = roles_out; - miqt_exec_callback_QAbstractItemModel_dataChanged3(slot, sigval1, sigval2, sigval3); + miqt_exec_callback_QAbstractItemModel_dataChanged2(slot, sigval1, sigval2, sigval3); }); } -void QAbstractItemModel_layoutChanged1(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents) { +void QAbstractItemModel_layoutChangedWithParents(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents) { QList parents_QList; parents_QList.reserve(parents.len); QPersistentModelIndex** parents_arr = static_cast(parents.data); @@ -1854,7 +1855,7 @@ void QAbstractItemModel_layoutChanged1(QAbstractItemModel* self, struct miqt_arr self->layoutChanged(parents_QList); } -void QAbstractItemModel_connect_layoutChanged1(QAbstractItemModel* self, intptr_t slot) { +void QAbstractItemModel_connect_layoutChangedWithParents(QAbstractItemModel* self, intptr_t slot) { MiqtVirtualQAbstractItemModel::connect(self, static_cast&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutChanged), self, [=](const QList& parents) { const QList& parents_ret = parents; // Convert QList<> from C++ memory to manually-managed C memory @@ -1866,7 +1867,7 @@ void QAbstractItemModel_connect_layoutChanged1(QAbstractItemModel* self, intptr_ parents_out.len = parents_ret.length(); parents_out.data = static_cast(parents_arr); struct miqt_array /* of QPersistentModelIndex* */ sigval1 = parents_out; - miqt_exec_callback_QAbstractItemModel_layoutChanged1(slot, sigval1); + miqt_exec_callback_QAbstractItemModel_layoutChangedWithParents(slot, sigval1); }); } @@ -1898,7 +1899,7 @@ void QAbstractItemModel_connect_layoutChanged2(QAbstractItemModel* self, intptr_ }); } -void QAbstractItemModel_layoutAboutToBeChanged1(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents) { +void QAbstractItemModel_layoutAboutToBeChangedWithParents(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents) { QList parents_QList; parents_QList.reserve(parents.len); QPersistentModelIndex** parents_arr = static_cast(parents.data); @@ -1908,7 +1909,7 @@ void QAbstractItemModel_layoutAboutToBeChanged1(QAbstractItemModel* self, struct self->layoutAboutToBeChanged(parents_QList); } -void QAbstractItemModel_connect_layoutAboutToBeChanged1(QAbstractItemModel* self, intptr_t slot) { +void QAbstractItemModel_connect_layoutAboutToBeChangedWithParents(QAbstractItemModel* self, intptr_t slot) { MiqtVirtualQAbstractItemModel::connect(self, static_cast&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutAboutToBeChanged), self, [=](const QList& parents) { const QList& parents_ret = parents; // Convert QList<> from C++ memory to manually-managed C memory @@ -1920,7 +1921,7 @@ void QAbstractItemModel_connect_layoutAboutToBeChanged1(QAbstractItemModel* self parents_out.len = parents_ret.length(); parents_out.data = static_cast(parents_arr); struct miqt_array /* of QPersistentModelIndex* */ sigval1 = parents_out; - miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChanged1(slot, sigval1); + miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChangedWithParents(slot, sigval1); }); } diff --git a/qt6/gen_qabstractitemmodel.go b/qt6/gen_qabstractitemmodel.go index 8490854a..fc07bc56 100644 --- a/qt6/gen_qabstractitemmodel.go +++ b/qt6/gen_qabstractitemmodel.go @@ -329,8 +329,8 @@ func (this *QModelIndex) OperatorLesser(other *QModelIndex) bool { return (bool)(C.QModelIndex_operatorLesser(this.h, other.cPointer())) } -func (this *QModelIndex) Data1(role int) *QVariant { - _goptr := newQVariant(C.QModelIndex_data1(this.h, (C.int)(role))) +func (this *QModelIndex) DataWithRole(role int) *QVariant { + _goptr := newQVariant(C.QModelIndex_dataWithRole(this.h, (C.int)(role))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -491,8 +491,8 @@ func (this *QPersistentModelIndex) IsValid() bool { return (bool)(C.QPersistentModelIndex_isValid(this.h)) } -func (this *QPersistentModelIndex) Data1(role int) *QVariant { - _goptr := newQVariant(C.QPersistentModelIndex_data1(this.h, (C.int)(role))) +func (this *QPersistentModelIndex) DataWithRole(role int) *QVariant { + _goptr := newQVariant(C.QPersistentModelIndex_dataWithRole(this.h, (C.int)(role))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -934,8 +934,8 @@ func QAbstractItemModel_Tr3(s string, c string, n int) string { return _ret } -func (this *QAbstractItemModel) HasIndex3(row int, column int, parent *QModelIndex) bool { - return (bool)(C.QAbstractItemModel_hasIndex3(this.h, (C.int)(row), (C.int)(column), parent.cPointer())) +func (this *QAbstractItemModel) HasIndex2(row int, column int, parent *QModelIndex) bool { + return (bool)(C.QAbstractItemModel_hasIndex2(this.h, (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QAbstractItemModel) InsertRow2(row int, parent *QModelIndex) bool { @@ -958,21 +958,21 @@ func (this *QAbstractItemModel) CheckIndex2(index *QModelIndex, options QAbstrac return (bool)(C.QAbstractItemModel_checkIndex2(this.h, index.cPointer(), (C.int)(options))) } -func (this *QAbstractItemModel) DataChanged3(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int) { +func (this *QAbstractItemModel) DataChanged2(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int) { roles_CArray := (*[0xffff]C.int)(C.malloc(C.size_t(8 * len(roles)))) defer C.free(unsafe.Pointer(roles_CArray)) for i := range roles { roles_CArray[i] = (C.int)(roles[i]) } roles_ma := C.struct_miqt_array{len: C.size_t(len(roles)), data: unsafe.Pointer(roles_CArray)} - C.QAbstractItemModel_dataChanged3(this.h, topLeft.cPointer(), bottomRight.cPointer(), roles_ma) + C.QAbstractItemModel_dataChanged2(this.h, topLeft.cPointer(), bottomRight.cPointer(), roles_ma) } -func (this *QAbstractItemModel) OnDataChanged3(slot func(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int)) { - C.QAbstractItemModel_connect_dataChanged3(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QAbstractItemModel) OnDataChanged2(slot func(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int)) { + C.QAbstractItemModel_connect_dataChanged2(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QAbstractItemModel_dataChanged3 -func miqt_exec_callback_QAbstractItemModel_dataChanged3(cb C.intptr_t, topLeft *C.QModelIndex, bottomRight *C.QModelIndex, roles C.struct_miqt_array) { +//export miqt_exec_callback_QAbstractItemModel_dataChanged2 +func miqt_exec_callback_QAbstractItemModel_dataChanged2(cb C.intptr_t, topLeft *C.QModelIndex, bottomRight *C.QModelIndex, roles C.struct_miqt_array) { gofunc, ok := cgo.Handle(cb).Value().(func(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -994,21 +994,21 @@ func miqt_exec_callback_QAbstractItemModel_dataChanged3(cb C.intptr_t, topLeft * gofunc(slotval1, slotval2, slotval3) } -func (this *QAbstractItemModel) LayoutChanged1(parents []QPersistentModelIndex) { +func (this *QAbstractItemModel) LayoutChangedWithParents(parents []QPersistentModelIndex) { parents_CArray := (*[0xffff]*C.QPersistentModelIndex)(C.malloc(C.size_t(8 * len(parents)))) defer C.free(unsafe.Pointer(parents_CArray)) for i := range parents { parents_CArray[i] = parents[i].cPointer() } parents_ma := C.struct_miqt_array{len: C.size_t(len(parents)), data: unsafe.Pointer(parents_CArray)} - C.QAbstractItemModel_layoutChanged1(this.h, parents_ma) + C.QAbstractItemModel_layoutChangedWithParents(this.h, parents_ma) } -func (this *QAbstractItemModel) OnLayoutChanged1(slot func(parents []QPersistentModelIndex)) { - C.QAbstractItemModel_connect_layoutChanged1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QAbstractItemModel) OnLayoutChangedWithParents(slot func(parents []QPersistentModelIndex)) { + C.QAbstractItemModel_connect_layoutChangedWithParents(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QAbstractItemModel_layoutChanged1 -func miqt_exec_callback_QAbstractItemModel_layoutChanged1(cb C.intptr_t, parents C.struct_miqt_array) { +//export miqt_exec_callback_QAbstractItemModel_layoutChangedWithParents +func miqt_exec_callback_QAbstractItemModel_layoutChangedWithParents(cb C.intptr_t, parents C.struct_miqt_array) { gofunc, ok := cgo.Handle(cb).Value().(func(parents []QPersistentModelIndex)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -1064,21 +1064,21 @@ func miqt_exec_callback_QAbstractItemModel_layoutChanged2(cb C.intptr_t, parents gofunc(slotval1, slotval2) } -func (this *QAbstractItemModel) LayoutAboutToBeChanged1(parents []QPersistentModelIndex) { +func (this *QAbstractItemModel) LayoutAboutToBeChangedWithParents(parents []QPersistentModelIndex) { parents_CArray := (*[0xffff]*C.QPersistentModelIndex)(C.malloc(C.size_t(8 * len(parents)))) defer C.free(unsafe.Pointer(parents_CArray)) for i := range parents { parents_CArray[i] = parents[i].cPointer() } parents_ma := C.struct_miqt_array{len: C.size_t(len(parents)), data: unsafe.Pointer(parents_CArray)} - C.QAbstractItemModel_layoutAboutToBeChanged1(this.h, parents_ma) + C.QAbstractItemModel_layoutAboutToBeChangedWithParents(this.h, parents_ma) } -func (this *QAbstractItemModel) OnLayoutAboutToBeChanged1(slot func(parents []QPersistentModelIndex)) { - C.QAbstractItemModel_connect_layoutAboutToBeChanged1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QAbstractItemModel) OnLayoutAboutToBeChangedWithParents(slot func(parents []QPersistentModelIndex)) { + C.QAbstractItemModel_connect_layoutAboutToBeChangedWithParents(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChanged1 -func miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChanged1(cb C.intptr_t, parents C.struct_miqt_array) { +//export miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChangedWithParents +func miqt_exec_callback_QAbstractItemModel_layoutAboutToBeChangedWithParents(cb C.intptr_t, parents C.struct_miqt_array) { gofunc, ok := cgo.Handle(cb).Value().(func(parents []QPersistentModelIndex)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/gen_qabstractitemmodel.h b/qt6/gen_qabstractitemmodel.h index 22d32770..56ba3493 100644 --- a/qt6/gen_qabstractitemmodel.h +++ b/qt6/gen_qabstractitemmodel.h @@ -93,7 +93,7 @@ bool QModelIndex_isValid(const QModelIndex* self); bool QModelIndex_operatorEqual(const QModelIndex* self, QModelIndex* other); bool QModelIndex_operatorNotEqual(const QModelIndex* self, QModelIndex* other); bool QModelIndex_operatorLesser(const QModelIndex* self, QModelIndex* other); -QVariant* QModelIndex_data1(const QModelIndex* self, int role); +QVariant* QModelIndex_dataWithRole(const QModelIndex* self, int role); void QModelIndex_delete(QModelIndex* self); QPersistentModelIndex* QPersistentModelIndex_new(); @@ -120,7 +120,7 @@ void QPersistentModelIndex_multiData(const QPersistentModelIndex* self, QModelRo int QPersistentModelIndex_flags(const QPersistentModelIndex* self); QAbstractItemModel* QPersistentModelIndex_model(const QPersistentModelIndex* self); bool QPersistentModelIndex_isValid(const QPersistentModelIndex* self); -QVariant* QPersistentModelIndex_data1(const QPersistentModelIndex* self, int role); +QVariant* QPersistentModelIndex_dataWithRole(const QPersistentModelIndex* self, int role); void QPersistentModelIndex_delete(QPersistentModelIndex* self); QAbstractItemModel* QAbstractItemModel_new(); @@ -184,20 +184,20 @@ void QAbstractItemModel_revert(QAbstractItemModel* self); void QAbstractItemModel_resetInternalData(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); -bool QAbstractItemModel_hasIndex3(const QAbstractItemModel* self, int row, int column, QModelIndex* parent); +bool QAbstractItemModel_hasIndex2(const QAbstractItemModel* self, int row, int column, QModelIndex* parent); bool QAbstractItemModel_insertRow2(QAbstractItemModel* self, int row, QModelIndex* parent); bool QAbstractItemModel_insertColumn2(QAbstractItemModel* self, int column, QModelIndex* parent); bool QAbstractItemModel_removeRow2(QAbstractItemModel* self, int row, QModelIndex* parent); bool QAbstractItemModel_removeColumn2(QAbstractItemModel* self, int column, QModelIndex* parent); bool QAbstractItemModel_checkIndex2(const QAbstractItemModel* self, QModelIndex* index, int options); -void QAbstractItemModel_dataChanged3(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight, struct miqt_array /* of int */ roles); -void QAbstractItemModel_connect_dataChanged3(QAbstractItemModel* self, intptr_t slot); -void QAbstractItemModel_layoutChanged1(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents); -void QAbstractItemModel_connect_layoutChanged1(QAbstractItemModel* self, intptr_t slot); +void QAbstractItemModel_dataChanged2(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight, struct miqt_array /* of int */ roles); +void QAbstractItemModel_connect_dataChanged2(QAbstractItemModel* self, intptr_t slot); +void QAbstractItemModel_layoutChangedWithParents(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents); +void QAbstractItemModel_connect_layoutChangedWithParents(QAbstractItemModel* self, intptr_t slot); void QAbstractItemModel_layoutChanged2(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents, int hint); void QAbstractItemModel_connect_layoutChanged2(QAbstractItemModel* self, intptr_t slot); -void QAbstractItemModel_layoutAboutToBeChanged1(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents); -void QAbstractItemModel_connect_layoutAboutToBeChanged1(QAbstractItemModel* self, intptr_t slot); +void QAbstractItemModel_layoutAboutToBeChangedWithParents(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents); +void QAbstractItemModel_connect_layoutAboutToBeChangedWithParents(QAbstractItemModel* self, intptr_t slot); void QAbstractItemModel_layoutAboutToBeChanged2(QAbstractItemModel* self, struct miqt_array /* of QPersistentModelIndex* */ parents, int hint); void QAbstractItemModel_connect_layoutAboutToBeChanged2(QAbstractItemModel* self, intptr_t slot); bool QAbstractItemModel_override_virtual_index(void* self, intptr_t slot); diff --git a/qt6/gen_qabstractproxymodel.cpp b/qt6/gen_qabstractproxymodel.cpp index a4c153d3..4e668ce7 100644 --- a/qt6/gen_qabstractproxymodel.cpp +++ b/qt6/gen_qabstractproxymodel.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qt6/gen_qabstracttextdocumentlayout.cpp b/qt6/gen_qabstracttextdocumentlayout.cpp index f5afc5c9..c2f915e6 100644 --- a/qt6/gen_qabstracttextdocumentlayout.cpp +++ b/qt6/gen_qabstracttextdocumentlayout.cpp @@ -33,7 +33,7 @@ void miqt_exec_callback_QAbstractTextDocumentLayout_update(intptr_t); void miqt_exec_callback_QAbstractTextDocumentLayout_updateBlock(intptr_t, QTextBlock*); void miqt_exec_callback_QAbstractTextDocumentLayout_documentSizeChanged(intptr_t, QSizeF*); void miqt_exec_callback_QAbstractTextDocumentLayout_pageCountChanged(intptr_t, int); -void miqt_exec_callback_QAbstractTextDocumentLayout_update1(intptr_t, QRectF*); +void miqt_exec_callback_QAbstractTextDocumentLayout_updateWithQRectF(intptr_t, QRectF*); void miqt_exec_callback_QAbstractTextDocumentLayout_draw(QAbstractTextDocumentLayout*, intptr_t, QPainter*, QAbstractTextDocumentLayout__PaintContext*); int miqt_exec_callback_QAbstractTextDocumentLayout_hitTest(const QAbstractTextDocumentLayout*, intptr_t, QPointF*, int); int miqt_exec_callback_QAbstractTextDocumentLayout_pageCount(const QAbstractTextDocumentLayout*, intptr_t); @@ -579,16 +579,16 @@ void QAbstractTextDocumentLayout_unregisterHandler2(QAbstractTextDocumentLayout* self->unregisterHandler(static_cast(objectType), component); } -void QAbstractTextDocumentLayout_update1(QAbstractTextDocumentLayout* self, QRectF* param1) { +void QAbstractTextDocumentLayout_updateWithQRectF(QAbstractTextDocumentLayout* self, QRectF* param1) { self->update(*param1); } -void QAbstractTextDocumentLayout_connect_update1(QAbstractTextDocumentLayout* self, intptr_t slot) { +void QAbstractTextDocumentLayout_connect_updateWithQRectF(QAbstractTextDocumentLayout* self, intptr_t slot) { MiqtVirtualQAbstractTextDocumentLayout::connect(self, static_cast(&QAbstractTextDocumentLayout::update), self, [=](const QRectF& param1) { const QRectF& param1_ret = param1; // Cast returned reference into pointer QRectF* sigval1 = const_cast(¶m1_ret); - miqt_exec_callback_QAbstractTextDocumentLayout_update1(slot, sigval1); + miqt_exec_callback_QAbstractTextDocumentLayout_updateWithQRectF(slot, sigval1); }); } diff --git a/qt6/gen_qabstracttextdocumentlayout.go b/qt6/gen_qabstracttextdocumentlayout.go index f1fa2b34..67e54027 100644 --- a/qt6/gen_qabstracttextdocumentlayout.go +++ b/qt6/gen_qabstracttextdocumentlayout.go @@ -258,15 +258,15 @@ func (this *QAbstractTextDocumentLayout) UnregisterHandler2(objectType int, comp C.QAbstractTextDocumentLayout_unregisterHandler2(this.h, (C.int)(objectType), component.cPointer()) } -func (this *QAbstractTextDocumentLayout) Update1(param1 *QRectF) { - C.QAbstractTextDocumentLayout_update1(this.h, param1.cPointer()) +func (this *QAbstractTextDocumentLayout) UpdateWithQRectF(param1 *QRectF) { + C.QAbstractTextDocumentLayout_updateWithQRectF(this.h, param1.cPointer()) } -func (this *QAbstractTextDocumentLayout) OnUpdate1(slot func(param1 *QRectF)) { - C.QAbstractTextDocumentLayout_connect_update1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QAbstractTextDocumentLayout) OnUpdateWithQRectF(slot func(param1 *QRectF)) { + C.QAbstractTextDocumentLayout_connect_updateWithQRectF(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QAbstractTextDocumentLayout_update1 -func miqt_exec_callback_QAbstractTextDocumentLayout_update1(cb C.intptr_t, param1 *C.QRectF) { +//export miqt_exec_callback_QAbstractTextDocumentLayout_updateWithQRectF +func miqt_exec_callback_QAbstractTextDocumentLayout_updateWithQRectF(cb C.intptr_t, param1 *C.QRectF) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 *QRectF)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/gen_qabstracttextdocumentlayout.h b/qt6/gen_qabstracttextdocumentlayout.h index e1e3628f..51de0f42 100644 --- a/qt6/gen_qabstracttextdocumentlayout.h +++ b/qt6/gen_qabstracttextdocumentlayout.h @@ -104,8 +104,8 @@ void QAbstractTextDocumentLayout_drawInlineObject(QAbstractTextDocumentLayout* s struct miqt_string QAbstractTextDocumentLayout_tr2(const char* s, const char* c); struct miqt_string QAbstractTextDocumentLayout_tr3(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); +void QAbstractTextDocumentLayout_updateWithQRectF(QAbstractTextDocumentLayout* self, QRectF* param1); +void QAbstractTextDocumentLayout_connect_updateWithQRectF(QAbstractTextDocumentLayout* self, intptr_t slot); bool QAbstractTextDocumentLayout_override_virtual_draw(void* self, intptr_t slot); void QAbstractTextDocumentLayout_virtualbase_draw(void* self, QPainter* painter, QAbstractTextDocumentLayout__PaintContext* context); bool QAbstractTextDocumentLayout_override_virtual_hitTest(void* self, intptr_t slot); diff --git a/qt6/gen_qaction.cpp b/qt6/gen_qaction.cpp index 494603cd..b512a3b6 100644 --- a/qt6/gen_qaction.cpp +++ b/qt6/gen_qaction.cpp @@ -28,7 +28,7 @@ void miqt_exec_callback_QAction_visibleChanged(intptr_t); void miqt_exec_callback_QAction_triggered(intptr_t); void miqt_exec_callback_QAction_hovered(intptr_t); void miqt_exec_callback_QAction_toggled(intptr_t, bool); -void miqt_exec_callback_QAction_triggered1(intptr_t, bool); +void miqt_exec_callback_QAction_triggeredWithChecked(intptr_t, bool); bool miqt_exec_callback_QAction_event(QAction*, intptr_t, QEvent*); bool miqt_exec_callback_QAction_eventFilter(QAction*, intptr_t, QObject*, QEvent*); void miqt_exec_callback_QAction_timerEvent(QAction*, intptr_t, QTimerEvent*); @@ -620,18 +620,18 @@ struct miqt_string QAction_tr3(const char* s, const char* c, int n) { return _ms; } -bool QAction_showStatusText1(QAction* self, QObject* object) { +bool QAction_showStatusTextWithObject(QAction* self, QObject* object) { return self->showStatusText(object); } -void QAction_triggered1(QAction* self, bool checked) { +void QAction_triggeredWithChecked(QAction* self, bool checked) { self->triggered(checked); } -void QAction_connect_triggered1(QAction* self, intptr_t slot) { +void QAction_connect_triggeredWithChecked(QAction* self, intptr_t slot) { MiqtVirtualQAction::connect(self, static_cast(&QAction::triggered), self, [=](bool checked) { bool sigval1 = checked; - miqt_exec_callback_QAction_triggered1(slot, sigval1); + miqt_exec_callback_QAction_triggeredWithChecked(slot, sigval1); }); } diff --git a/qt6/gen_qaction.go b/qt6/gen_qaction.go index d54bcd2e..d51f2aac 100644 --- a/qt6/gen_qaction.go +++ b/qt6/gen_qaction.go @@ -573,19 +573,19 @@ func QAction_Tr3(s string, c string, n int) string { return _ret } -func (this *QAction) ShowStatusText1(object *QObject) bool { - return (bool)(C.QAction_showStatusText1(this.h, object.cPointer())) +func (this *QAction) ShowStatusTextWithObject(object *QObject) bool { + return (bool)(C.QAction_showStatusTextWithObject(this.h, object.cPointer())) } -func (this *QAction) Triggered1(checked bool) { - C.QAction_triggered1(this.h, (C.bool)(checked)) +func (this *QAction) TriggeredWithChecked(checked bool) { + C.QAction_triggeredWithChecked(this.h, (C.bool)(checked)) } -func (this *QAction) OnTriggered1(slot func(checked bool)) { - C.QAction_connect_triggered1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QAction) OnTriggeredWithChecked(slot func(checked bool)) { + C.QAction_connect_triggeredWithChecked(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QAction_triggered1 -func miqt_exec_callback_QAction_triggered1(cb C.intptr_t, checked C.bool) { +//export miqt_exec_callback_QAction_triggeredWithChecked +func miqt_exec_callback_QAction_triggeredWithChecked(cb C.intptr_t, checked C.bool) { gofunc, ok := cgo.Handle(cb).Value().(func(checked bool)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/gen_qaction.h b/qt6/gen_qaction.h index 571d5a22..2dbf56ec 100644 --- a/qt6/gen_qaction.h +++ b/qt6/gen_qaction.h @@ -122,9 +122,9 @@ 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); -bool QAction_showStatusText1(QAction* self, QObject* object); -void QAction_triggered1(QAction* self, bool checked); -void QAction_connect_triggered1(QAction* self, intptr_t slot); +bool QAction_showStatusTextWithObject(QAction* self, QObject* object); +void QAction_triggeredWithChecked(QAction* self, bool checked); +void QAction_connect_triggeredWithChecked(QAction* self, intptr_t slot); bool QAction_override_virtual_event(void* self, intptr_t slot); bool QAction_virtualbase_event(void* self, QEvent* param1); bool QAction_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt6/gen_qanystringview.cpp b/qt6/gen_qanystringview.cpp index 18a2717a..a2673a20 100644 --- a/qt6/gen_qanystringview.cpp +++ b/qt6/gen_qanystringview.cpp @@ -95,7 +95,7 @@ ptrdiff_t QAnyStringView_length(const QAnyStringView* self) { return static_cast(_ret); } -int QAnyStringView_compare3(QAnyStringView* lhs, QAnyStringView* rhs, int cs) { +int QAnyStringView_compare2(QAnyStringView* lhs, QAnyStringView* rhs, int cs) { return QAnyStringView::compare(*lhs, *rhs, static_cast(cs)); } diff --git a/qt6/gen_qanystringview.go b/qt6/gen_qanystringview.go index 6e7003e1..a081ac83 100644 --- a/qt6/gen_qanystringview.go +++ b/qt6/gen_qanystringview.go @@ -141,8 +141,8 @@ func (this *QAnyStringView) Length() int64 { return (int64)(C.QAnyStringView_length(this.h)) } -func QAnyStringView_Compare3(lhs QAnyStringView, rhs QAnyStringView, cs CaseSensitivity) int { - return (int)(C.QAnyStringView_compare3(lhs.cPointer(), rhs.cPointer(), (C.int)(cs))) +func QAnyStringView_Compare2(lhs QAnyStringView, rhs QAnyStringView, cs CaseSensitivity) int { + return (int)(C.QAnyStringView_compare2(lhs.cPointer(), rhs.cPointer(), (C.int)(cs))) } // Delete this object from C++ memory. diff --git a/qt6/gen_qanystringview.h b/qt6/gen_qanystringview.h index c241f253..e05bde8c 100644 --- a/qt6/gen_qanystringview.h +++ b/qt6/gen_qanystringview.h @@ -39,7 +39,7 @@ ptrdiff_t QAnyStringView_sizeBytes(const QAnyStringView* self); bool QAnyStringView_isNull(const QAnyStringView* self); bool QAnyStringView_isEmpty(const QAnyStringView* self); ptrdiff_t QAnyStringView_length(const QAnyStringView* self); -int QAnyStringView_compare3(QAnyStringView* lhs, QAnyStringView* rhs, int cs); +int QAnyStringView_compare2(QAnyStringView* lhs, QAnyStringView* rhs, int cs); void QAnyStringView_delete(QAnyStringView* self); #ifdef __cplusplus diff --git a/qt6/gen_qbitarray.cpp b/qt6/gen_qbitarray.cpp index 39370d6e..0f1243d3 100644 --- a/qt6/gen_qbitarray.cpp +++ b/qt6/gen_qbitarray.cpp @@ -151,7 +151,7 @@ unsigned int QBitArray_toUInt32(const QBitArray* self, int endianness) { return static_cast(_ret); } -bool QBitArray_fill22(QBitArray* self, bool val, ptrdiff_t size) { +bool QBitArray_fill3(QBitArray* self, bool val, ptrdiff_t size) { return self->fill(val, (qsizetype)(size)); } diff --git a/qt6/gen_qbitarray.go b/qt6/gen_qbitarray.go index ede8e60e..515de87b 100644 --- a/qt6/gen_qbitarray.go +++ b/qt6/gen_qbitarray.go @@ -196,8 +196,8 @@ func (this *QBitArray) ToUInt32(endianness QSysInfo__Endian) uint { return (uint)(C.QBitArray_toUInt32(this.h, (C.int)(endianness))) } -func (this *QBitArray) Fill22(val bool, size int64) bool { - return (bool)(C.QBitArray_fill22(this.h, (C.bool)(val), (C.ptrdiff_t)(size))) +func (this *QBitArray) Fill3(val bool, size int64) bool { + return (bool)(C.QBitArray_fill3(this.h, (C.bool)(val), (C.ptrdiff_t)(size))) } func (this *QBitArray) ToUInt322(endianness QSysInfo__Endian, ok *bool) uint { diff --git a/qt6/gen_qbitarray.h b/qt6/gen_qbitarray.h index 11a0b1ee..745c0c06 100644 --- a/qt6/gen_qbitarray.h +++ b/qt6/gen_qbitarray.h @@ -56,7 +56,7 @@ void QBitArray_truncate(QBitArray* self, ptrdiff_t pos); const char* QBitArray_bits(const QBitArray* self); QBitArray* QBitArray_fromBits(const char* data, ptrdiff_t len); unsigned int QBitArray_toUInt32(const QBitArray* self, int endianness); -bool QBitArray_fill22(QBitArray* self, bool val, ptrdiff_t size); +bool QBitArray_fill3(QBitArray* self, bool val, ptrdiff_t size); unsigned int QBitArray_toUInt322(const QBitArray* self, int endianness, bool* ok); void QBitArray_delete(QBitArray* self); diff --git a/qt6/gen_qbitmap.cpp b/qt6/gen_qbitmap.cpp index 28b7b35c..978d9c44 100644 --- a/qt6/gen_qbitmap.cpp +++ b/qt6/gen_qbitmap.cpp @@ -224,7 +224,7 @@ QBitmap* QBitmap_fromImage2(QImage* image, int flags) { return new QBitmap(QBitmap::fromImage(*image, static_cast(flags))); } -QBitmap* QBitmap_fromData3(QSize* size, const unsigned char* bits, int monoFormat) { +QBitmap* QBitmap_fromData2(QSize* size, const unsigned char* bits, int monoFormat) { return new QBitmap(QBitmap::fromData(*size, static_cast(bits), static_cast(monoFormat))); } diff --git a/qt6/gen_qbitmap.go b/qt6/gen_qbitmap.go index 28dceb56..28df24b1 100644 --- a/qt6/gen_qbitmap.go +++ b/qt6/gen_qbitmap.go @@ -154,8 +154,8 @@ func QBitmap_FromImage2(image *QImage, flags ImageConversionFlag) *QBitmap { return _goptr } -func QBitmap_FromData3(size *QSize, bits *byte, monoFormat QImage__Format) *QBitmap { - _goptr := newQBitmap(C.QBitmap_fromData3(size.cPointer(), (*C.uchar)(unsafe.Pointer(bits)), (C.int)(monoFormat))) +func QBitmap_FromData2(size *QSize, bits *byte, monoFormat QImage__Format) *QBitmap { + _goptr := newQBitmap(C.QBitmap_fromData2(size.cPointer(), (*C.uchar)(unsafe.Pointer(bits)), (C.int)(monoFormat))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qbitmap.h b/qt6/gen_qbitmap.h index 9f3c7399..18ad0dd7 100644 --- a/qt6/gen_qbitmap.h +++ b/qt6/gen_qbitmap.h @@ -56,7 +56,7 @@ QBitmap* QBitmap_fromPixmap(QPixmap* pixmap); QBitmap* QBitmap_transformed(const QBitmap* self, QTransform* matrix); void QBitmap_operatorAssignWithQBitmap(QBitmap* self, QBitmap* param1); QBitmap* QBitmap_fromImage2(QImage* image, int flags); -QBitmap* QBitmap_fromData3(QSize* size, const unsigned char* bits, int monoFormat); +QBitmap* QBitmap_fromData2(QSize* size, const unsigned char* bits, int monoFormat); bool QBitmap_override_virtual_devType(void* self, intptr_t slot); int QBitmap_virtualbase_devType(const void* self); bool QBitmap_override_virtual_paintEngine(void* self, intptr_t slot); diff --git a/qt6/gen_qboxlayout.cpp b/qt6/gen_qboxlayout.cpp index af4615a9..0e98a399 100644 --- a/qt6/gen_qboxlayout.cpp +++ b/qt6/gen_qboxlayout.cpp @@ -869,7 +869,7 @@ struct miqt_string QBoxLayout_tr3(const char* s, const char* c, int n) { return _ms; } -void QBoxLayout_addStretch1(QBoxLayout* self, int stretch) { +void QBoxLayout_addStretchWithStretch(QBoxLayout* self, int stretch) { self->addStretch(static_cast(stretch)); } @@ -889,15 +889,15 @@ void QBoxLayout_insertStretch2(QBoxLayout* self, int index, int stretch) { self->insertStretch(static_cast(index), static_cast(stretch)); } -void QBoxLayout_insertWidget3(QBoxLayout* self, int index, QWidget* widget, int stretch) { +void QBoxLayout_insertWidget2(QBoxLayout* self, int index, QWidget* widget, int stretch) { self->insertWidget(static_cast(index), widget, static_cast(stretch)); } -void QBoxLayout_insertWidget4(QBoxLayout* self, int index, QWidget* widget, int stretch, int alignment) { +void QBoxLayout_insertWidget3(QBoxLayout* self, int index, QWidget* widget, int stretch, int alignment) { self->insertWidget(static_cast(index), widget, static_cast(stretch), static_cast(alignment)); } -void QBoxLayout_insertLayout3(QBoxLayout* self, int index, QLayout* layout, int stretch) { +void QBoxLayout_insertLayout2(QBoxLayout* self, int index, QLayout* layout, int stretch) { self->insertLayout(static_cast(index), layout, static_cast(stretch)); } diff --git a/qt6/gen_qboxlayout.go b/qt6/gen_qboxlayout.go index 0eccf7bd..3a0e8310 100644 --- a/qt6/gen_qboxlayout.go +++ b/qt6/gen_qboxlayout.go @@ -252,8 +252,8 @@ func QBoxLayout_Tr3(s string, c string, n int) string { return _ret } -func (this *QBoxLayout) AddStretch1(stretch int) { - C.QBoxLayout_addStretch1(this.h, (C.int)(stretch)) +func (this *QBoxLayout) AddStretchWithStretch(stretch int) { + C.QBoxLayout_addStretchWithStretch(this.h, (C.int)(stretch)) } func (this *QBoxLayout) AddWidget2(param1 *QWidget, stretch int) { @@ -272,16 +272,16 @@ func (this *QBoxLayout) InsertStretch2(index int, stretch int) { C.QBoxLayout_insertStretch2(this.h, (C.int)(index), (C.int)(stretch)) } -func (this *QBoxLayout) InsertWidget3(index int, widget *QWidget, stretch int) { - C.QBoxLayout_insertWidget3(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch)) +func (this *QBoxLayout) InsertWidget2(index int, widget *QWidget, stretch int) { + C.QBoxLayout_insertWidget2(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch)) } -func (this *QBoxLayout) InsertWidget4(index int, widget *QWidget, stretch int, alignment AlignmentFlag) { - C.QBoxLayout_insertWidget4(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch), (C.int)(alignment)) +func (this *QBoxLayout) InsertWidget3(index int, widget *QWidget, stretch int, alignment AlignmentFlag) { + C.QBoxLayout_insertWidget3(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch), (C.int)(alignment)) } -func (this *QBoxLayout) InsertLayout3(index int, layout *QLayout, stretch int) { - C.QBoxLayout_insertLayout3(this.h, (C.int)(index), layout.cPointer(), (C.int)(stretch)) +func (this *QBoxLayout) InsertLayout2(index int, layout *QLayout, stretch int) { + C.QBoxLayout_insertLayout2(this.h, (C.int)(index), layout.cPointer(), (C.int)(stretch)) } // WidgetEvent can only be called from a QBoxLayout that was directly constructed. diff --git a/qt6/gen_qboxlayout.h b/qt6/gen_qboxlayout.h index 11b63f2d..2da64ab6 100644 --- a/qt6/gen_qboxlayout.h +++ b/qt6/gen_qboxlayout.h @@ -89,14 +89,14 @@ 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); -void QBoxLayout_addStretch1(QBoxLayout* self, int stretch); +void QBoxLayout_addStretchWithStretch(QBoxLayout* self, int stretch); void QBoxLayout_addWidget2(QBoxLayout* self, QWidget* param1, int stretch); void QBoxLayout_addWidget3(QBoxLayout* self, QWidget* param1, int stretch, int alignment); void QBoxLayout_addLayout2(QBoxLayout* self, QLayout* layout, int stretch); void QBoxLayout_insertStretch2(QBoxLayout* self, int index, int stretch); -void QBoxLayout_insertWidget3(QBoxLayout* self, int index, QWidget* widget, int stretch); -void QBoxLayout_insertWidget4(QBoxLayout* self, int index, QWidget* widget, int stretch, int alignment); -void QBoxLayout_insertLayout3(QBoxLayout* self, int index, QLayout* layout, int stretch); +void QBoxLayout_insertWidget2(QBoxLayout* self, int index, QWidget* widget, int stretch); +void QBoxLayout_insertWidget3(QBoxLayout* self, int index, QWidget* widget, int stretch, int alignment); +void QBoxLayout_insertLayout2(QBoxLayout* self, int index, QLayout* layout, int stretch); bool QBoxLayout_override_virtual_addItem(void* self, intptr_t slot); void QBoxLayout_virtualbase_addItem(void* self, QLayoutItem* param1); bool QBoxLayout_override_virtual_spacing(void* self, intptr_t slot); diff --git a/qt6/gen_qbytearraymatcher.cpp b/qt6/gen_qbytearraymatcher.cpp index b509419d..1d354a1f 100644 --- a/qt6/gen_qbytearraymatcher.cpp +++ b/qt6/gen_qbytearraymatcher.cpp @@ -66,12 +66,12 @@ struct miqt_string QByteArrayMatcher_pattern(const QByteArrayMatcher* self) { return _ms; } -ptrdiff_t QByteArrayMatcher_indexIn3(const QByteArrayMatcher* self, const char* str, ptrdiff_t len, ptrdiff_t from) { +ptrdiff_t QByteArrayMatcher_indexIn2(const QByteArrayMatcher* self, const char* str, ptrdiff_t len, ptrdiff_t from) { qsizetype _ret = self->indexIn(str, (qsizetype)(len), (qsizetype)(from)); return static_cast(_ret); } -ptrdiff_t QByteArrayMatcher_indexIn2(const QByteArrayMatcher* self, QByteArrayView* data, ptrdiff_t from) { +ptrdiff_t QByteArrayMatcher_indexIn3(const QByteArrayMatcher* self, QByteArrayView* data, ptrdiff_t from) { qsizetype _ret = self->indexIn(*data, (qsizetype)(from)); return static_cast(_ret); } diff --git a/qt6/gen_qbytearraymatcher.go b/qt6/gen_qbytearraymatcher.go index e94275df..36c7cb2b 100644 --- a/qt6/gen_qbytearraymatcher.go +++ b/qt6/gen_qbytearraymatcher.go @@ -124,14 +124,14 @@ func (this *QByteArrayMatcher) Pattern() []byte { return _ret } -func (this *QByteArrayMatcher) IndexIn3(str string, lenVal int64, from int64) int64 { +func (this *QByteArrayMatcher) IndexIn2(str string, lenVal int64, from int64) int64 { str_Cstring := C.CString(str) defer C.free(unsafe.Pointer(str_Cstring)) - return (int64)(C.QByteArrayMatcher_indexIn3(this.h, str_Cstring, (C.ptrdiff_t)(lenVal), (C.ptrdiff_t)(from))) + return (int64)(C.QByteArrayMatcher_indexIn2(this.h, str_Cstring, (C.ptrdiff_t)(lenVal), (C.ptrdiff_t)(from))) } -func (this *QByteArrayMatcher) IndexIn2(data QByteArrayView, from int64) int64 { - return (int64)(C.QByteArrayMatcher_indexIn2(this.h, data.cPointer(), (C.ptrdiff_t)(from))) +func (this *QByteArrayMatcher) IndexIn3(data QByteArrayView, from int64) int64 { + return (int64)(C.QByteArrayMatcher_indexIn3(this.h, data.cPointer(), (C.ptrdiff_t)(from))) } // Delete this object from C++ memory. diff --git a/qt6/gen_qbytearraymatcher.h b/qt6/gen_qbytearraymatcher.h index 2d915470..62d99353 100644 --- a/qt6/gen_qbytearraymatcher.h +++ b/qt6/gen_qbytearraymatcher.h @@ -35,8 +35,8 @@ void QByteArrayMatcher_setPattern(QByteArrayMatcher* self, struct miqt_string pa ptrdiff_t QByteArrayMatcher_indexIn(const QByteArrayMatcher* self, const char* str, ptrdiff_t len); ptrdiff_t QByteArrayMatcher_indexInWithData(const QByteArrayMatcher* self, QByteArrayView* data); struct miqt_string QByteArrayMatcher_pattern(const QByteArrayMatcher* self); -ptrdiff_t QByteArrayMatcher_indexIn3(const QByteArrayMatcher* self, const char* str, ptrdiff_t len, ptrdiff_t from); -ptrdiff_t QByteArrayMatcher_indexIn2(const QByteArrayMatcher* self, QByteArrayView* data, ptrdiff_t from); +ptrdiff_t QByteArrayMatcher_indexIn2(const QByteArrayMatcher* self, const char* str, ptrdiff_t len, ptrdiff_t from); +ptrdiff_t QByteArrayMatcher_indexIn3(const QByteArrayMatcher* self, QByteArrayView* data, ptrdiff_t from); void QByteArrayMatcher_delete(QByteArrayMatcher* self); diff --git a/qt6/gen_qbytearrayview.cpp b/qt6/gen_qbytearrayview.cpp index 0c0ee6ed..92654a9e 100644 --- a/qt6/gen_qbytearrayview.cpp +++ b/qt6/gen_qbytearrayview.cpp @@ -83,13 +83,13 @@ QByteArrayView* QByteArrayView_trimmed(const QByteArrayView* self) { return new QByteArrayView(self->trimmed()); } -int16_t QByteArrayView_toShort(const QByteArrayView* self) { +short QByteArrayView_toShort(const QByteArrayView* self) { return self->toShort(); } -uint16_t QByteArrayView_toUShort(const QByteArrayView* self) { +unsigned short QByteArrayView_toUShort(const QByteArrayView* self) { ushort _ret = self->toUShort(); - return static_cast(_ret); + return static_cast(_ret); } int QByteArrayView_toInt(const QByteArrayView* self) { @@ -248,25 +248,25 @@ char QByteArrayView_last2(const QByteArrayView* self) { return self->last(); } -int16_t QByteArrayView_toShort1(const QByteArrayView* self, bool* ok) { +short QByteArrayView_toShortWithOk(const QByteArrayView* self, bool* ok) { return self->toShort(ok); } -int16_t QByteArrayView_toShort2(const QByteArrayView* self, bool* ok, int base) { +short QByteArrayView_toShort2(const QByteArrayView* self, bool* ok, int base) { return self->toShort(ok, static_cast(base)); } -uint16_t QByteArrayView_toUShort1(const QByteArrayView* self, bool* ok) { +unsigned short QByteArrayView_toUShortWithOk(const QByteArrayView* self, bool* ok) { ushort _ret = self->toUShort(ok); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QByteArrayView_toUShort2(const QByteArrayView* self, bool* ok, int base) { +unsigned short QByteArrayView_toUShort2(const QByteArrayView* self, bool* ok, int base) { ushort _ret = self->toUShort(ok, static_cast(base)); - return static_cast(_ret); + return static_cast(_ret); } -int QByteArrayView_toInt1(const QByteArrayView* self, bool* ok) { +int QByteArrayView_toIntWithOk(const QByteArrayView* self, bool* ok) { return self->toInt(ok); } @@ -274,7 +274,7 @@ int QByteArrayView_toInt2(const QByteArrayView* self, bool* ok, int base) { return self->toInt(ok, static_cast(base)); } -unsigned int QByteArrayView_toUInt1(const QByteArrayView* self, bool* ok) { +unsigned int QByteArrayView_toUIntWithOk(const QByteArrayView* self, bool* ok) { uint _ret = self->toUInt(ok); return static_cast(_ret); } @@ -284,7 +284,7 @@ unsigned int QByteArrayView_toUInt2(const QByteArrayView* self, bool* ok, int ba return static_cast(_ret); } -long QByteArrayView_toLong1(const QByteArrayView* self, bool* ok) { +long QByteArrayView_toLongWithOk(const QByteArrayView* self, bool* ok) { return self->toLong(ok); } @@ -292,7 +292,7 @@ long QByteArrayView_toLong2(const QByteArrayView* self, bool* ok, int base) { return self->toLong(ok, static_cast(base)); } -unsigned long QByteArrayView_toULong1(const QByteArrayView* self, bool* ok) { +unsigned long QByteArrayView_toULongWithOk(const QByteArrayView* self, bool* ok) { ulong _ret = self->toULong(ok); return static_cast(_ret); } @@ -302,7 +302,7 @@ unsigned long QByteArrayView_toULong2(const QByteArrayView* self, bool* ok, int return static_cast(_ret); } -long long QByteArrayView_toLongLong1(const QByteArrayView* self, bool* ok) { +long long QByteArrayView_toLongLongWithOk(const QByteArrayView* self, bool* ok) { qlonglong _ret = self->toLongLong(ok); return static_cast(_ret); } @@ -312,7 +312,7 @@ long long QByteArrayView_toLongLong2(const QByteArrayView* self, bool* ok, int b return static_cast(_ret); } -unsigned long long QByteArrayView_toULongLong1(const QByteArrayView* self, bool* ok) { +unsigned long long QByteArrayView_toULongLongWithOk(const QByteArrayView* self, bool* ok) { qulonglong _ret = self->toULongLong(ok); return static_cast(_ret); } @@ -322,11 +322,11 @@ unsigned long long QByteArrayView_toULongLong2(const QByteArrayView* self, bool* return static_cast(_ret); } -float QByteArrayView_toFloat1(const QByteArrayView* self, bool* ok) { +float QByteArrayView_toFloatWithOk(const QByteArrayView* self, bool* ok) { return self->toFloat(ok); } -double QByteArrayView_toDouble1(const QByteArrayView* self, bool* ok) { +double QByteArrayView_toDoubleWithOk(const QByteArrayView* self, bool* ok) { return self->toDouble(ok); } @@ -335,12 +335,12 @@ ptrdiff_t QByteArrayView_indexOf2(const QByteArrayView* self, QByteArrayView* a, return static_cast(_ret); } -ptrdiff_t QByteArrayView_indexOf22(const QByteArrayView* self, char ch, ptrdiff_t from) { +ptrdiff_t QByteArrayView_indexOf3(const QByteArrayView* self, char ch, ptrdiff_t from) { qsizetype _ret = self->indexOf(static_cast(ch), (qsizetype)(from)); return static_cast(_ret); } -ptrdiff_t QByteArrayView_lastIndexOf22(const QByteArrayView* self, char ch, ptrdiff_t from) { +ptrdiff_t QByteArrayView_lastIndexOf3(const QByteArrayView* self, char ch, ptrdiff_t from) { qsizetype _ret = self->lastIndexOf(static_cast(ch), (qsizetype)(from)); return static_cast(_ret); } diff --git a/qt6/gen_qbytearrayview.go b/qt6/gen_qbytearrayview.go index 5bae8ae2..282cb1c1 100644 --- a/qt6/gen_qbytearrayview.go +++ b/qt6/gen_qbytearrayview.go @@ -282,88 +282,88 @@ func (this *QByteArrayView) Last2() int8 { return (int8)(C.QByteArrayView_last2(this.h)) } -func (this *QByteArrayView) ToShort1(ok *bool) int16 { - return (int16)(C.QByteArrayView_toShort1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QByteArrayView) ToShortWithOk(ok *bool) int16 { + return (int16)(C.QByteArrayView_toShortWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QByteArrayView) ToShort2(ok *bool, base int) int16 { return (int16)(C.QByteArrayView_toShort2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QByteArrayView) ToUShort1(ok *bool) uint16 { - return (uint16)(C.QByteArrayView_toUShort1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QByteArrayView) ToUShortWithOk(ok *bool) uint16 { + return (uint16)(C.QByteArrayView_toUShortWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QByteArrayView) ToUShort2(ok *bool, base int) uint16 { return (uint16)(C.QByteArrayView_toUShort2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QByteArrayView) ToInt1(ok *bool) int { - return (int)(C.QByteArrayView_toInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QByteArrayView) ToIntWithOk(ok *bool) int { + return (int)(C.QByteArrayView_toIntWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QByteArrayView) ToInt2(ok *bool, base int) int { return (int)(C.QByteArrayView_toInt2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QByteArrayView) ToUInt1(ok *bool) uint { - return (uint)(C.QByteArrayView_toUInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QByteArrayView) ToUIntWithOk(ok *bool) uint { + return (uint)(C.QByteArrayView_toUIntWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QByteArrayView) ToUInt2(ok *bool, base int) uint { return (uint)(C.QByteArrayView_toUInt2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QByteArrayView) ToLong1(ok *bool) int64 { - return (int64)(C.QByteArrayView_toLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QByteArrayView) ToLongWithOk(ok *bool) int64 { + return (int64)(C.QByteArrayView_toLongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QByteArrayView) ToLong2(ok *bool, base int) int64 { return (int64)(C.QByteArrayView_toLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QByteArrayView) ToULong1(ok *bool) uint64 { - return (uint64)(C.QByteArrayView_toULong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QByteArrayView) ToULongWithOk(ok *bool) uint64 { + return (uint64)(C.QByteArrayView_toULongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QByteArrayView) ToULong2(ok *bool, base int) uint64 { return (uint64)(C.QByteArrayView_toULong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QByteArrayView) ToLongLong1(ok *bool) int64 { - return (int64)(C.QByteArrayView_toLongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QByteArrayView) ToLongLongWithOk(ok *bool) int64 { + return (int64)(C.QByteArrayView_toLongLongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QByteArrayView) ToLongLong2(ok *bool, base int) int64 { return (int64)(C.QByteArrayView_toLongLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QByteArrayView) ToULongLong1(ok *bool) uint64 { - return (uint64)(C.QByteArrayView_toULongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QByteArrayView) ToULongLongWithOk(ok *bool) uint64 { + return (uint64)(C.QByteArrayView_toULongLongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QByteArrayView) ToULongLong2(ok *bool, base int) uint64 { return (uint64)(C.QByteArrayView_toULongLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QByteArrayView) ToFloat1(ok *bool) float32 { - return (float32)(C.QByteArrayView_toFloat1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QByteArrayView) ToFloatWithOk(ok *bool) float32 { + return (float32)(C.QByteArrayView_toFloatWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QByteArrayView) ToDouble1(ok *bool) float64 { - return (float64)(C.QByteArrayView_toDouble1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QByteArrayView) ToDoubleWithOk(ok *bool) float64 { + return (float64)(C.QByteArrayView_toDoubleWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QByteArrayView) IndexOf2(a QByteArrayView, from int64) int64 { return (int64)(C.QByteArrayView_indexOf2(this.h, a.cPointer(), (C.ptrdiff_t)(from))) } -func (this *QByteArrayView) IndexOf22(ch int8, from int64) int64 { - return (int64)(C.QByteArrayView_indexOf22(this.h, (C.char)(ch), (C.ptrdiff_t)(from))) +func (this *QByteArrayView) IndexOf3(ch int8, from int64) int64 { + return (int64)(C.QByteArrayView_indexOf3(this.h, (C.char)(ch), (C.ptrdiff_t)(from))) } -func (this *QByteArrayView) LastIndexOf22(ch int8, from int64) int64 { - return (int64)(C.QByteArrayView_lastIndexOf22(this.h, (C.char)(ch), (C.ptrdiff_t)(from))) +func (this *QByteArrayView) LastIndexOf3(ch int8, from int64) int64 { + return (int64)(C.QByteArrayView_lastIndexOf3(this.h, (C.char)(ch), (C.ptrdiff_t)(from))) } func (this *QByteArrayView) Compare2(a QByteArrayView, cs CaseSensitivity) int { diff --git a/qt6/gen_qbytearrayview.h b/qt6/gen_qbytearrayview.h index c1daeac9..1f2e5903 100644 --- a/qt6/gen_qbytearrayview.h +++ b/qt6/gen_qbytearrayview.h @@ -36,8 +36,8 @@ QByteArrayView* QByteArrayView_chopped(const QByteArrayView* self, ptrdiff_t len void QByteArrayView_truncate(QByteArrayView* self, ptrdiff_t n); void QByteArrayView_chop(QByteArrayView* self, ptrdiff_t n); QByteArrayView* QByteArrayView_trimmed(const QByteArrayView* self); -int16_t QByteArrayView_toShort(const QByteArrayView* self); -uint16_t QByteArrayView_toUShort(const QByteArrayView* self); +short QByteArrayView_toShort(const QByteArrayView* self); +unsigned short QByteArrayView_toUShort(const QByteArrayView* self); int QByteArrayView_toInt(const QByteArrayView* self); unsigned int QByteArrayView_toUInt(const QByteArrayView* self); long QByteArrayView_toLong(const QByteArrayView* self); @@ -73,27 +73,27 @@ bool QByteArrayView_isEmpty(const QByteArrayView* self); ptrdiff_t QByteArrayView_length(const QByteArrayView* self); char QByteArrayView_first2(const QByteArrayView* self); char QByteArrayView_last2(const QByteArrayView* self); -int16_t QByteArrayView_toShort1(const QByteArrayView* self, bool* ok); -int16_t QByteArrayView_toShort2(const QByteArrayView* self, bool* ok, int base); -uint16_t QByteArrayView_toUShort1(const QByteArrayView* self, bool* ok); -uint16_t QByteArrayView_toUShort2(const QByteArrayView* self, bool* ok, int base); -int QByteArrayView_toInt1(const QByteArrayView* self, bool* ok); +short QByteArrayView_toShortWithOk(const QByteArrayView* self, bool* ok); +short QByteArrayView_toShort2(const QByteArrayView* self, bool* ok, int base); +unsigned short QByteArrayView_toUShortWithOk(const QByteArrayView* self, bool* ok); +unsigned short QByteArrayView_toUShort2(const QByteArrayView* self, bool* ok, int base); +int QByteArrayView_toIntWithOk(const QByteArrayView* self, bool* ok); int QByteArrayView_toInt2(const QByteArrayView* self, bool* ok, int base); -unsigned int QByteArrayView_toUInt1(const QByteArrayView* self, bool* ok); +unsigned int QByteArrayView_toUIntWithOk(const QByteArrayView* self, bool* ok); unsigned int QByteArrayView_toUInt2(const QByteArrayView* self, bool* ok, int base); -long QByteArrayView_toLong1(const QByteArrayView* self, bool* ok); +long QByteArrayView_toLongWithOk(const QByteArrayView* self, bool* ok); long QByteArrayView_toLong2(const QByteArrayView* self, bool* ok, int base); -unsigned long QByteArrayView_toULong1(const QByteArrayView* self, bool* ok); +unsigned long QByteArrayView_toULongWithOk(const QByteArrayView* self, bool* ok); unsigned long QByteArrayView_toULong2(const QByteArrayView* self, bool* ok, int base); -long long QByteArrayView_toLongLong1(const QByteArrayView* self, bool* ok); +long long QByteArrayView_toLongLongWithOk(const QByteArrayView* self, bool* ok); long long QByteArrayView_toLongLong2(const QByteArrayView* self, bool* ok, int base); -unsigned long long QByteArrayView_toULongLong1(const QByteArrayView* self, bool* ok); +unsigned long long QByteArrayView_toULongLongWithOk(const QByteArrayView* self, bool* ok); unsigned long long QByteArrayView_toULongLong2(const QByteArrayView* self, bool* ok, int base); -float QByteArrayView_toFloat1(const QByteArrayView* self, bool* ok); -double QByteArrayView_toDouble1(const QByteArrayView* self, bool* ok); +float QByteArrayView_toFloatWithOk(const QByteArrayView* self, bool* ok); +double QByteArrayView_toDoubleWithOk(const QByteArrayView* self, bool* ok); ptrdiff_t QByteArrayView_indexOf2(const QByteArrayView* self, QByteArrayView* a, ptrdiff_t from); -ptrdiff_t QByteArrayView_indexOf22(const QByteArrayView* self, char ch, ptrdiff_t from); -ptrdiff_t QByteArrayView_lastIndexOf22(const QByteArrayView* self, char ch, ptrdiff_t from); +ptrdiff_t QByteArrayView_indexOf3(const QByteArrayView* self, char ch, ptrdiff_t from); +ptrdiff_t QByteArrayView_lastIndexOf3(const QByteArrayView* self, char ch, ptrdiff_t from); int QByteArrayView_compare2(const QByteArrayView* self, QByteArrayView* a, int cs); void QByteArrayView_delete(QByteArrayView* self); diff --git a/qt6/gen_qcalendar.cpp b/qt6/gen_qcalendar.cpp index 1e01ae8b..a0380840 100644 --- a/qt6/gen_qcalendar.cpp +++ b/qt6/gen_qcalendar.cpp @@ -190,7 +190,7 @@ 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_monthName2(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(); @@ -201,7 +201,7 @@ struct miqt_string QCalendar_monthName3(const QCalendar* self, QLocale* locale, return _ms; } -struct miqt_string QCalendar_monthName4(const QCalendar* self, QLocale* locale, int month, int year, int format) { +struct miqt_string QCalendar_monthName3(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(); @@ -212,7 +212,7 @@ struct miqt_string QCalendar_monthName4(const QCalendar* self, QLocale* locale, return _ms; } -struct miqt_string QCalendar_standaloneMonthName3(const QCalendar* self, QLocale* locale, int month, int year) { +struct miqt_string QCalendar_standaloneMonthName2(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(); @@ -223,7 +223,7 @@ struct miqt_string QCalendar_standaloneMonthName3(const QCalendar* self, QLocale return _ms; } -struct miqt_string QCalendar_standaloneMonthName4(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, 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(); @@ -234,7 +234,7 @@ struct miqt_string QCalendar_standaloneMonthName4(const QCalendar* self, QLocale return _ms; } -struct miqt_string QCalendar_weekDayName3(const QCalendar* self, QLocale* locale, int day, int format) { +struct miqt_string QCalendar_weekDayName2(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(); @@ -245,7 +245,7 @@ struct miqt_string QCalendar_weekDayName3(const QCalendar* self, QLocale* locale return _ms; } -struct miqt_string QCalendar_standaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, int format) { +struct miqt_string QCalendar_standaloneWeekDayName2(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(); diff --git a/qt6/gen_qcalendar.go b/qt6/gen_qcalendar.go index 80f6a29a..c794ff1a 100644 --- a/qt6/gen_qcalendar.go +++ b/qt6/gen_qcalendar.go @@ -221,43 +221,43 @@ func (this *QCalendar) DaysInMonth2(month int, year int) int { return (int)(C.QCalendar_daysInMonth2(this.h, (C.int)(month), (C.int)(year))) } -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)) +func (this *QCalendar) MonthName2(locale *QLocale, month int, year int) string { + var _ms C.struct_miqt_string = C.QCalendar_monthName2(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)) +func (this *QCalendar) MonthName3(locale *QLocale, month int, year int, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QCalendar_monthName3(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)) +func (this *QCalendar) StandaloneMonthName2(locale *QLocale, month int, year int) string { + var _ms C.struct_miqt_string = C.QCalendar_standaloneMonthName2(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)) +func (this *QCalendar) StandaloneMonthName3(locale *QLocale, month int, year int, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QCalendar_standaloneMonthName3(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)) +func (this *QCalendar) WeekDayName2(locale *QLocale, day int, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QCalendar_weekDayName2(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)) +func (this *QCalendar) StandaloneWeekDayName2(locale *QLocale, day int, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QCalendar_standaloneWeekDayName2(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/qt6/gen_qcalendar.h b/qt6/gen_qcalendar.h index e14fdc2f..fe358c6b 100644 --- a/qt6/gen_qcalendar.h +++ b/qt6/gen_qcalendar.h @@ -68,12 +68,12 @@ struct miqt_string QCalendar_weekDayName(const QCalendar* self, QLocale* locale, struct miqt_string QCalendar_standaloneWeekDayName(const QCalendar* self, QLocale* locale, int day); struct miqt_array /* of struct miqt_string */ 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_monthName2(const QCalendar* self, QLocale* locale, int month, int year); +struct miqt_string QCalendar_monthName3(const QCalendar* self, QLocale* locale, int month, int year, int format); +struct miqt_string QCalendar_standaloneMonthName2(const QCalendar* self, QLocale* locale, int month, int year); +struct miqt_string QCalendar_standaloneMonthName3(const QCalendar* self, QLocale* locale, int month, int year, int format); +struct miqt_string QCalendar_weekDayName2(const QCalendar* self, QLocale* locale, int day, int format); +struct miqt_string QCalendar_standaloneWeekDayName2(const QCalendar* self, QLocale* locale, int day, int format); void QCalendar_delete(QCalendar* self); QCalendar__YearMonthDay* QCalendar__YearMonthDay_new(); diff --git a/qt6/gen_qchar.cpp b/qt6/gen_qchar.cpp index d10ac88c..2f531fd7 100644 --- a/qt6/gen_qchar.cpp +++ b/qt6/gen_qchar.cpp @@ -34,7 +34,7 @@ QChar* QChar_new() { return new QChar(); } -QChar* QChar_new2(uint16_t rc) { +QChar* QChar_new2(unsigned short rc) { return new QChar(static_cast(rc)); } @@ -42,7 +42,7 @@ QChar* QChar_new3(unsigned char c, unsigned char r) { return new QChar(static_cast(c), static_cast(r)); } -QChar* QChar_new4(int16_t rc) { +QChar* QChar_new4(short rc) { return new QChar(static_cast(rc)); } diff --git a/qt6/gen_qchar.go b/qt6/gen_qchar.go index 9b72dff3..b946ac7e 100644 --- a/qt6/gen_qchar.go +++ b/qt6/gen_qchar.go @@ -456,7 +456,7 @@ func NewQChar() *QChar { // NewQChar2 constructs a new QChar object. func NewQChar2(rc uint16) *QChar { - return newQChar(C.QChar_new2((C.uint16_t)(rc))) + return newQChar(C.QChar_new2((C.ushort)(rc))) } // NewQChar3 constructs a new QChar object. @@ -468,7 +468,7 @@ func NewQChar3(c byte, r byte) *QChar { // NewQChar4 constructs a new QChar object. func NewQChar4(rc int16) *QChar { - return newQChar(C.QChar_new4((C.int16_t)(rc))) + return newQChar(C.QChar_new4((C.short)(rc))) } // NewQChar5 constructs a new QChar object. diff --git a/qt6/gen_qchar.h b/qt6/gen_qchar.h index 38022f66..ed1ffc23 100644 --- a/qt6/gen_qchar.h +++ b/qt6/gen_qchar.h @@ -28,9 +28,9 @@ char QLatin1Char_toLatin1(const QLatin1Char* self); void QLatin1Char_delete(QLatin1Char* self); QChar* QChar_new(); -QChar* QChar_new2(uint16_t rc); +QChar* QChar_new2(unsigned short rc); QChar* QChar_new3(unsigned char c, unsigned char r); -QChar* QChar_new4(int16_t rc); +QChar* QChar_new4(short rc); QChar* QChar_new5(unsigned int rc); QChar* QChar_new6(int rc); QChar* QChar_new7(int s); diff --git a/qt6/gen_qcheckbox.cpp b/qt6/gen_qcheckbox.cpp index c204e178..3ccd3f33 100644 --- a/qt6/gen_qcheckbox.cpp +++ b/qt6/gen_qcheckbox.cpp @@ -1184,7 +1184,7 @@ struct miqt_string QCheckBox_tr3(const char* s, const char* c, int n) { return _ms; } -void QCheckBox_setTristate1(QCheckBox* self, bool y) { +void QCheckBox_setTristateWithBool(QCheckBox* self, bool y) { self->setTristate(y); } diff --git a/qt6/gen_qcheckbox.go b/qt6/gen_qcheckbox.go index a53d06ce..157b4493 100644 --- a/qt6/gen_qcheckbox.go +++ b/qt6/gen_qcheckbox.go @@ -171,8 +171,8 @@ func QCheckBox_Tr3(s string, c string, n int) string { return _ret } -func (this *QCheckBox) SetTristate1(y bool) { - C.QCheckBox_setTristate1(this.h, (C.bool)(y)) +func (this *QCheckBox) SetTristateWithBool(y bool) { + C.QCheckBox_setTristateWithBool(this.h, (C.bool)(y)) } // UpdateMicroFocus can only be called from a QCheckBox that was directly constructed. diff --git a/qt6/gen_qcheckbox.h b/qt6/gen_qcheckbox.h index 863f3f13..490beb54 100644 --- a/qt6/gen_qcheckbox.h +++ b/qt6/gen_qcheckbox.h @@ -113,7 +113,7 @@ void QCheckBox_mouseMoveEvent(QCheckBox* self, QMouseEvent* param1); void QCheckBox_initStyleOption(const QCheckBox* self, QStyleOptionButton* option); struct miqt_string QCheckBox_tr2(const char* s, const char* c); struct miqt_string QCheckBox_tr3(const char* s, const char* c, int n); -void QCheckBox_setTristate1(QCheckBox* self, bool y); +void QCheckBox_setTristateWithBool(QCheckBox* self, bool y); bool QCheckBox_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QCheckBox_virtualbase_sizeHint(const void* self); bool QCheckBox_override_virtual_minimumSizeHint(void* self, intptr_t slot); diff --git a/qt6/gen_qclipboard.cpp b/qt6/gen_qclipboard.cpp index 3387b3c7..4d7902de 100644 --- a/qt6/gen_qclipboard.cpp +++ b/qt6/gen_qclipboard.cpp @@ -186,11 +186,11 @@ struct miqt_string QClipboard_tr3(const char* s, const char* c, int n) { return _ms; } -void QClipboard_clear1(QClipboard* self, int mode) { +void QClipboard_clearWithMode(QClipboard* self, int mode) { self->clear(static_cast(mode)); } -struct miqt_string QClipboard_text1(const QClipboard* self, int mode) { +struct miqt_string QClipboard_textWithMode(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(); @@ -218,7 +218,7 @@ void QClipboard_setText2(QClipboard* self, struct miqt_string param1, int mode) self->setText(param1_QString, static_cast(mode)); } -QMimeData* QClipboard_mimeData1(const QClipboard* self, int mode) { +QMimeData* QClipboard_mimeDataWithMode(const QClipboard* self, int mode) { return (QMimeData*) self->mimeData(static_cast(mode)); } @@ -226,11 +226,11 @@ void QClipboard_setMimeData2(QClipboard* self, QMimeData* data, int mode) { self->setMimeData(data, static_cast(mode)); } -QImage* QClipboard_image1(const QClipboard* self, int mode) { +QImage* QClipboard_imageWithMode(const QClipboard* self, int mode) { return new QImage(self->image(static_cast(mode))); } -QPixmap* QClipboard_pixmap1(const QClipboard* self, int mode) { +QPixmap* QClipboard_pixmapWithMode(const QClipboard* self, int mode) { return new QPixmap(self->pixmap(static_cast(mode))); } diff --git a/qt6/gen_qclipboard.go b/qt6/gen_qclipboard.go index 56282ddd..3d728090 100644 --- a/qt6/gen_qclipboard.go +++ b/qt6/gen_qclipboard.go @@ -248,12 +248,12 @@ func QClipboard_Tr3(s string, c string, n int) string { return _ret } -func (this *QClipboard) Clear1(mode QClipboard__Mode) { - C.QClipboard_clear1(this.h, (C.int)(mode)) +func (this *QClipboard) ClearWithMode(mode QClipboard__Mode) { + C.QClipboard_clearWithMode(this.h, (C.int)(mode)) } -func (this *QClipboard) Text1(mode QClipboard__Mode) string { - var _ms C.struct_miqt_string = C.QClipboard_text1(this.h, (C.int)(mode)) +func (this *QClipboard) TextWithMode(mode QClipboard__Mode) string { + var _ms C.struct_miqt_string = C.QClipboard_textWithMode(this.h, (C.int)(mode)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -278,22 +278,22 @@ func (this *QClipboard) SetText2(param1 string, mode QClipboard__Mode) { C.QClipboard_setText2(this.h, param1_ms, (C.int)(mode)) } -func (this *QClipboard) MimeData1(mode QClipboard__Mode) *QMimeData { - return newQMimeData(C.QClipboard_mimeData1(this.h, (C.int)(mode))) +func (this *QClipboard) MimeDataWithMode(mode QClipboard__Mode) *QMimeData { + return newQMimeData(C.QClipboard_mimeDataWithMode(this.h, (C.int)(mode))) } func (this *QClipboard) SetMimeData2(data *QMimeData, mode QClipboard__Mode) { C.QClipboard_setMimeData2(this.h, data.cPointer(), (C.int)(mode)) } -func (this *QClipboard) Image1(mode QClipboard__Mode) *QImage { - _goptr := newQImage(C.QClipboard_image1(this.h, (C.int)(mode))) +func (this *QClipboard) ImageWithMode(mode QClipboard__Mode) *QImage { + _goptr := newQImage(C.QClipboard_imageWithMode(this.h, (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QClipboard) Pixmap1(mode QClipboard__Mode) *QPixmap { - _goptr := newQPixmap(C.QClipboard_pixmap1(this.h, (C.int)(mode))) +func (this *QClipboard) PixmapWithMode(mode QClipboard__Mode) *QPixmap { + _goptr := newQPixmap(C.QClipboard_pixmapWithMode(this.h, (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qclipboard.h b/qt6/gen_qclipboard.h index 0307aa34..483ced78 100644 --- a/qt6/gen_qclipboard.h +++ b/qt6/gen_qclipboard.h @@ -61,14 +61,14 @@ 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); -void QClipboard_clear1(QClipboard* self, int mode); -struct miqt_string QClipboard_text1(const QClipboard* self, int mode); +void QClipboard_clearWithMode(QClipboard* self, int mode); +struct miqt_string QClipboard_textWithMode(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); +QMimeData* QClipboard_mimeDataWithMode(const QClipboard* self, int mode); void QClipboard_setMimeData2(QClipboard* self, QMimeData* data, int mode); -QImage* QClipboard_image1(const QClipboard* self, int mode); -QPixmap* QClipboard_pixmap1(const QClipboard* self, int mode); +QImage* QClipboard_imageWithMode(const QClipboard* self, int mode); +QPixmap* QClipboard_pixmapWithMode(const QClipboard* self, int mode); void QClipboard_setImage2(QClipboard* self, QImage* param1, int mode); void QClipboard_setPixmap2(QClipboard* self, QPixmap* param1, int mode); diff --git a/qt6/gen_qcolor.cpp b/qt6/gen_qcolor.cpp index b76f4517..c2f9ce3f 100644 --- a/qt6/gen_qcolor.cpp +++ b/qt6/gen_qcolor.cpp @@ -50,7 +50,7 @@ QColor* QColor_new8(int spec) { return new QColor(static_cast(spec)); } -QColor* QColor_new9(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4) { +QColor* QColor_new9(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4) { return new QColor(static_cast(spec), static_cast(a1), static_cast(a2), static_cast(a3), static_cast(a4)); } @@ -62,7 +62,7 @@ QColor* QColor_new11(int r, int g, int b, int a) { return new QColor(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -QColor* QColor_new12(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4, uint16_t a5) { +QColor* QColor_new12(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4, unsigned short a5) { return new QColor(static_cast(spec), static_cast(a1), static_cast(a2), static_cast(a3), static_cast(a4), static_cast(a5)); } @@ -409,7 +409,7 @@ QColor* QColor_fromRgbF(float r, float g, float b) { return new QColor(QColor::fromRgbF(static_cast(r), static_cast(g), static_cast(b))); } -QColor* QColor_fromRgba64(uint16_t r, uint16_t g, uint16_t b) { +QColor* QColor_fromRgba64(unsigned short r, unsigned short g, unsigned short b) { return new QColor(QColor::fromRgba64(static_cast(r), static_cast(g), static_cast(b))); } @@ -470,7 +470,7 @@ bool QColor_isValidColorName(QAnyStringView* param1) { return QColor::isValidColorName(*param1); } -struct miqt_string QColor_name1(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(); @@ -481,111 +481,111 @@ struct miqt_string QColor_name1(const QColor* self, int format) { return _ms; } -void QColor_getRgb4(const QColor* self, int* r, int* g, int* b, int* a) { +void QColor_getRgb2(const QColor* self, int* r, int* g, int* b, int* a) { self->getRgb(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -void QColor_setRgb4(QColor* self, int r, int g, int b, int a) { +void QColor_setRgb2(QColor* self, int r, int g, int b, int a) { self->setRgb(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -void QColor_getRgbF4(const QColor* self, float* r, float* g, float* b, float* a) { +void QColor_getRgbF2(const QColor* self, float* r, float* g, float* b, float* a) { self->getRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -void QColor_setRgbF4(QColor* self, float r, float g, float b, float a) { +void QColor_setRgbF2(QColor* self, float r, float g, float b, float a) { self->setRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -void QColor_getHsv4(const QColor* self, int* h, int* s, int* v, int* a) { +void QColor_getHsv2(const QColor* self, int* h, int* s, int* v, int* a) { self->getHsv(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); } -void QColor_setHsv4(QColor* self, int h, int s, int v, int a) { +void QColor_setHsv2(QColor* self, int h, int s, int v, int a) { self->setHsv(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); } -void QColor_getHsvF4(const QColor* self, float* h, float* s, float* v, float* a) { +void QColor_getHsvF2(const QColor* self, float* h, float* s, float* v, float* a) { self->getHsvF(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); } -void QColor_setHsvF4(QColor* self, float h, float s, float v, float a) { +void QColor_setHsvF2(QColor* self, float h, float s, float v, float a) { self->setHsvF(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); } -void QColor_getCmyk5(const QColor* self, int* c, int* m, int* y, int* k, int* a) { +void QColor_getCmyk2(const QColor* self, int* c, int* m, int* y, int* k, int* a) { self->getCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } -void QColor_setCmyk5(QColor* self, int c, int m, int y, int k, int a) { +void QColor_setCmyk2(QColor* self, int c, int m, int y, int k, int a) { self->setCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } -void QColor_getCmykF5(const QColor* self, float* c, float* m, float* y, float* k, float* a) { +void QColor_getCmykF2(const QColor* self, float* c, float* m, float* y, float* k, float* a) { self->getCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } -void QColor_setCmykF5(QColor* self, float c, float m, float y, float k, float a) { +void QColor_setCmykF2(QColor* self, float c, float m, float y, float k, float a) { self->setCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } -void QColor_getHsl4(const QColor* self, int* h, int* s, int* l, int* a) { +void QColor_getHsl2(const QColor* self, int* h, int* s, int* l, int* a) { self->getHsl(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); } -void QColor_setHsl4(QColor* self, int h, int s, int l, int a) { +void QColor_setHsl2(QColor* self, int h, int s, int l, int a) { self->setHsl(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); } -void QColor_getHslF4(const QColor* self, float* h, float* s, float* l, float* a) { +void QColor_getHslF2(const QColor* self, float* h, float* s, float* l, float* a) { self->getHslF(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); } -void QColor_setHslF4(QColor* self, float h, float s, float l, float a) { +void QColor_setHslF2(QColor* self, float h, float s, float l, float a) { self->setHslF(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); } -QColor* QColor_fromRgb4(int r, int g, int b, int a) { +QColor* QColor_fromRgb3(int r, int g, int b, int a) { return new QColor(QColor::fromRgb(static_cast(r), static_cast(g), static_cast(b), static_cast(a))); } -QColor* QColor_fromRgbF4(float r, float g, float b, float a) { +QColor* QColor_fromRgbF2(float r, float g, float b, float a) { return new QColor(QColor::fromRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a))); } -QColor* QColor_fromRgba644(uint16_t r, uint16_t g, uint16_t b, uint16_t a) { +QColor* QColor_fromRgba642(unsigned short r, unsigned short g, unsigned short b, unsigned short a) { return new QColor(QColor::fromRgba64(static_cast(r), static_cast(g), static_cast(b), static_cast(a))); } -QColor* QColor_fromHsv4(int h, int s, int v, int a) { +QColor* QColor_fromHsv2(int h, int s, int v, int a) { return new QColor(QColor::fromHsv(static_cast(h), static_cast(s), static_cast(v), static_cast(a))); } -QColor* QColor_fromHsvF4(float h, float s, float v, float a) { +QColor* QColor_fromHsvF2(float h, float s, float v, float a) { return new QColor(QColor::fromHsvF(static_cast(h), static_cast(s), static_cast(v), static_cast(a))); } -QColor* QColor_fromCmyk5(int c, int m, int y, int k, int a) { +QColor* QColor_fromCmyk2(int c, int m, int y, int k, int a) { return new QColor(QColor::fromCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a))); } -QColor* QColor_fromCmykF5(float c, float m, float y, float k, float a) { +QColor* QColor_fromCmykF2(float c, float m, float y, float k, float a) { return new QColor(QColor::fromCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a))); } -QColor* QColor_fromHsl4(int h, int s, int l, int a) { +QColor* QColor_fromHsl2(int h, int s, int l, int a) { return new QColor(QColor::fromHsl(static_cast(h), static_cast(s), static_cast(l), static_cast(a))); } -QColor* QColor_fromHslF4(float h, float s, float l, float a) { +QColor* QColor_fromHslF2(float h, float s, float l, float a) { return new QColor(QColor::fromHslF(static_cast(h), static_cast(s), static_cast(l), static_cast(a))); } -QColor* QColor_lighter1(const QColor* self, int f) { +QColor* QColor_lighterWithInt(const QColor* self, int f) { return new QColor(self->lighter(static_cast(f))); } -QColor* QColor_darker1(const QColor* self, int f) { +QColor* QColor_darkerWithInt(const QColor* self, int f) { return new QColor(self->darker(static_cast(f))); } diff --git a/qt6/gen_qcolor.go b/qt6/gen_qcolor.go index 7a890364..70d1c388 100644 --- a/qt6/gen_qcolor.go +++ b/qt6/gen_qcolor.go @@ -120,7 +120,7 @@ func NewQColor8(spec QColor__Spec) *QColor { // NewQColor9 constructs a new QColor object. func NewQColor9(spec QColor__Spec, a1 uint16, a2 uint16, a3 uint16, a4 uint16) *QColor { - return newQColor(C.QColor_new9((C.int)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4))) + return newQColor(C.QColor_new9((C.int)(spec), (C.ushort)(a1), (C.ushort)(a2), (C.ushort)(a3), (C.ushort)(a4))) } // NewQColor10 constructs a new QColor object. @@ -138,7 +138,7 @@ func NewQColor11(r int, g int, b int, a int) *QColor { // NewQColor12 constructs a new QColor object. func NewQColor12(spec QColor__Spec, a1 uint16, a2 uint16, a3 uint16, a4 uint16, a5 uint16) *QColor { - return newQColor(C.QColor_new12((C.int)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4), (C.uint16_t)(a5))) + return newQColor(C.QColor_new12((C.int)(spec), (C.ushort)(a1), (C.ushort)(a2), (C.ushort)(a3), (C.ushort)(a4), (C.ushort)(a5))) } func QColor_FromString(name QAnyStringView) *QColor { @@ -498,7 +498,7 @@ func QColor_FromRgbF(r float32, g float32, b float32) *QColor { } func QColor_FromRgba64(r uint16, g uint16, b uint16) *QColor { - _goptr := newQColor(C.QColor_fromRgba64((C.uint16_t)(r), (C.uint16_t)(g), (C.uint16_t)(b))) + _goptr := newQColor(C.QColor_fromRgba64((C.ushort)(r), (C.ushort)(g), (C.ushort)(b))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -583,139 +583,139 @@ func QColor_IsValidColorName(param1 QAnyStringView) bool { return (bool)(C.QColor_isValidColorName(param1.cPointer())) } -func (this *QColor) Name1(format QColor__NameFormat) string { - var _ms C.struct_miqt_string = C.QColor_name1(this.h, (C.int)(format)) +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.data)) return _ret } -func (this *QColor) GetRgb4(r *int, g *int, b *int, a *int) { - C.QColor_getRgb4(this.h, (*C.int)(unsafe.Pointer(r)), (*C.int)(unsafe.Pointer(g)), (*C.int)(unsafe.Pointer(b)), (*C.int)(unsafe.Pointer(a))) +func (this *QColor) GetRgb2(r *int, g *int, b *int, a *int) { + C.QColor_getRgb2(this.h, (*C.int)(unsafe.Pointer(r)), (*C.int)(unsafe.Pointer(g)), (*C.int)(unsafe.Pointer(b)), (*C.int)(unsafe.Pointer(a))) } -func (this *QColor) SetRgb4(r int, g int, b int, a int) { - C.QColor_setRgb4(this.h, (C.int)(r), (C.int)(g), (C.int)(b), (C.int)(a)) +func (this *QColor) SetRgb2(r int, g int, b int, a int) { + C.QColor_setRgb2(this.h, (C.int)(r), (C.int)(g), (C.int)(b), (C.int)(a)) } -func (this *QColor) GetRgbF4(r *float32, g *float32, b *float32, a *float32) { - C.QColor_getRgbF4(this.h, (*C.float)(unsafe.Pointer(r)), (*C.float)(unsafe.Pointer(g)), (*C.float)(unsafe.Pointer(b)), (*C.float)(unsafe.Pointer(a))) +func (this *QColor) GetRgbF2(r *float32, g *float32, b *float32, a *float32) { + C.QColor_getRgbF2(this.h, (*C.float)(unsafe.Pointer(r)), (*C.float)(unsafe.Pointer(g)), (*C.float)(unsafe.Pointer(b)), (*C.float)(unsafe.Pointer(a))) } -func (this *QColor) SetRgbF4(r float32, g float32, b float32, a float32) { - C.QColor_setRgbF4(this.h, (C.float)(r), (C.float)(g), (C.float)(b), (C.float)(a)) +func (this *QColor) SetRgbF2(r float32, g float32, b float32, a float32) { + C.QColor_setRgbF2(this.h, (C.float)(r), (C.float)(g), (C.float)(b), (C.float)(a)) } -func (this *QColor) GetHsv4(h *int, s *int, v *int, a *int) { - C.QColor_getHsv4(this.h, (*C.int)(unsafe.Pointer(h)), (*C.int)(unsafe.Pointer(s)), (*C.int)(unsafe.Pointer(v)), (*C.int)(unsafe.Pointer(a))) +func (this *QColor) GetHsv2(h *int, s *int, v *int, a *int) { + C.QColor_getHsv2(this.h, (*C.int)(unsafe.Pointer(h)), (*C.int)(unsafe.Pointer(s)), (*C.int)(unsafe.Pointer(v)), (*C.int)(unsafe.Pointer(a))) } -func (this *QColor) SetHsv4(h int, s int, v int, a int) { - C.QColor_setHsv4(this.h, (C.int)(h), (C.int)(s), (C.int)(v), (C.int)(a)) +func (this *QColor) SetHsv2(h int, s int, v int, a int) { + C.QColor_setHsv2(this.h, (C.int)(h), (C.int)(s), (C.int)(v), (C.int)(a)) } -func (this *QColor) GetHsvF4(h *float32, s *float32, v *float32, a *float32) { - C.QColor_getHsvF4(this.h, (*C.float)(unsafe.Pointer(h)), (*C.float)(unsafe.Pointer(s)), (*C.float)(unsafe.Pointer(v)), (*C.float)(unsafe.Pointer(a))) +func (this *QColor) GetHsvF2(h *float32, s *float32, v *float32, a *float32) { + C.QColor_getHsvF2(this.h, (*C.float)(unsafe.Pointer(h)), (*C.float)(unsafe.Pointer(s)), (*C.float)(unsafe.Pointer(v)), (*C.float)(unsafe.Pointer(a))) } -func (this *QColor) SetHsvF4(h float32, s float32, v float32, a float32) { - C.QColor_setHsvF4(this.h, (C.float)(h), (C.float)(s), (C.float)(v), (C.float)(a)) +func (this *QColor) SetHsvF2(h float32, s float32, v float32, a float32) { + C.QColor_setHsvF2(this.h, (C.float)(h), (C.float)(s), (C.float)(v), (C.float)(a)) } -func (this *QColor) GetCmyk5(c *int, m *int, y *int, k *int, a *int) { - C.QColor_getCmyk5(this.h, (*C.int)(unsafe.Pointer(c)), (*C.int)(unsafe.Pointer(m)), (*C.int)(unsafe.Pointer(y)), (*C.int)(unsafe.Pointer(k)), (*C.int)(unsafe.Pointer(a))) +func (this *QColor) GetCmyk2(c *int, m *int, y *int, k *int, a *int) { + C.QColor_getCmyk2(this.h, (*C.int)(unsafe.Pointer(c)), (*C.int)(unsafe.Pointer(m)), (*C.int)(unsafe.Pointer(y)), (*C.int)(unsafe.Pointer(k)), (*C.int)(unsafe.Pointer(a))) } -func (this *QColor) SetCmyk5(c int, m int, y int, k int, a int) { - C.QColor_setCmyk5(this.h, (C.int)(c), (C.int)(m), (C.int)(y), (C.int)(k), (C.int)(a)) +func (this *QColor) SetCmyk2(c int, m int, y int, k int, a int) { + C.QColor_setCmyk2(this.h, (C.int)(c), (C.int)(m), (C.int)(y), (C.int)(k), (C.int)(a)) } -func (this *QColor) GetCmykF5(c *float32, m *float32, y *float32, k *float32, a *float32) { - C.QColor_getCmykF5(this.h, (*C.float)(unsafe.Pointer(c)), (*C.float)(unsafe.Pointer(m)), (*C.float)(unsafe.Pointer(y)), (*C.float)(unsafe.Pointer(k)), (*C.float)(unsafe.Pointer(a))) +func (this *QColor) GetCmykF2(c *float32, m *float32, y *float32, k *float32, a *float32) { + C.QColor_getCmykF2(this.h, (*C.float)(unsafe.Pointer(c)), (*C.float)(unsafe.Pointer(m)), (*C.float)(unsafe.Pointer(y)), (*C.float)(unsafe.Pointer(k)), (*C.float)(unsafe.Pointer(a))) } -func (this *QColor) SetCmykF5(c float32, m float32, y float32, k float32, a float32) { - C.QColor_setCmykF5(this.h, (C.float)(c), (C.float)(m), (C.float)(y), (C.float)(k), (C.float)(a)) +func (this *QColor) SetCmykF2(c float32, m float32, y float32, k float32, a float32) { + C.QColor_setCmykF2(this.h, (C.float)(c), (C.float)(m), (C.float)(y), (C.float)(k), (C.float)(a)) } -func (this *QColor) GetHsl4(h *int, s *int, l *int, a *int) { - C.QColor_getHsl4(this.h, (*C.int)(unsafe.Pointer(h)), (*C.int)(unsafe.Pointer(s)), (*C.int)(unsafe.Pointer(l)), (*C.int)(unsafe.Pointer(a))) +func (this *QColor) GetHsl2(h *int, s *int, l *int, a *int) { + C.QColor_getHsl2(this.h, (*C.int)(unsafe.Pointer(h)), (*C.int)(unsafe.Pointer(s)), (*C.int)(unsafe.Pointer(l)), (*C.int)(unsafe.Pointer(a))) } -func (this *QColor) SetHsl4(h int, s int, l int, a int) { - C.QColor_setHsl4(this.h, (C.int)(h), (C.int)(s), (C.int)(l), (C.int)(a)) +func (this *QColor) SetHsl2(h int, s int, l int, a int) { + C.QColor_setHsl2(this.h, (C.int)(h), (C.int)(s), (C.int)(l), (C.int)(a)) } -func (this *QColor) GetHslF4(h *float32, s *float32, l *float32, a *float32) { - C.QColor_getHslF4(this.h, (*C.float)(unsafe.Pointer(h)), (*C.float)(unsafe.Pointer(s)), (*C.float)(unsafe.Pointer(l)), (*C.float)(unsafe.Pointer(a))) +func (this *QColor) GetHslF2(h *float32, s *float32, l *float32, a *float32) { + C.QColor_getHslF2(this.h, (*C.float)(unsafe.Pointer(h)), (*C.float)(unsafe.Pointer(s)), (*C.float)(unsafe.Pointer(l)), (*C.float)(unsafe.Pointer(a))) } -func (this *QColor) SetHslF4(h float32, s float32, l float32, a float32) { - C.QColor_setHslF4(this.h, (C.float)(h), (C.float)(s), (C.float)(l), (C.float)(a)) +func (this *QColor) SetHslF2(h float32, s float32, l float32, a float32) { + C.QColor_setHslF2(this.h, (C.float)(h), (C.float)(s), (C.float)(l), (C.float)(a)) } -func QColor_FromRgb4(r int, g int, b int, a int) *QColor { - _goptr := newQColor(C.QColor_fromRgb4((C.int)(r), (C.int)(g), (C.int)(b), (C.int)(a))) +func QColor_FromRgb3(r int, g int, b int, a int) *QColor { + _goptr := newQColor(C.QColor_fromRgb3((C.int)(r), (C.int)(g), (C.int)(b), (C.int)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromRgbF4(r float32, g float32, b float32, a float32) *QColor { - _goptr := newQColor(C.QColor_fromRgbF4((C.float)(r), (C.float)(g), (C.float)(b), (C.float)(a))) +func QColor_FromRgbF2(r float32, g float32, b float32, a float32) *QColor { + _goptr := newQColor(C.QColor_fromRgbF2((C.float)(r), (C.float)(g), (C.float)(b), (C.float)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromRgba644(r uint16, g uint16, b uint16, a uint16) *QColor { - _goptr := newQColor(C.QColor_fromRgba644((C.uint16_t)(r), (C.uint16_t)(g), (C.uint16_t)(b), (C.uint16_t)(a))) +func QColor_FromRgba642(r uint16, g uint16, b uint16, a uint16) *QColor { + _goptr := newQColor(C.QColor_fromRgba642((C.ushort)(r), (C.ushort)(g), (C.ushort)(b), (C.ushort)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromHsv4(h int, s int, v int, a int) *QColor { - _goptr := newQColor(C.QColor_fromHsv4((C.int)(h), (C.int)(s), (C.int)(v), (C.int)(a))) +func QColor_FromHsv2(h int, s int, v int, a int) *QColor { + _goptr := newQColor(C.QColor_fromHsv2((C.int)(h), (C.int)(s), (C.int)(v), (C.int)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromHsvF4(h float32, s float32, v float32, a float32) *QColor { - _goptr := newQColor(C.QColor_fromHsvF4((C.float)(h), (C.float)(s), (C.float)(v), (C.float)(a))) +func QColor_FromHsvF2(h float32, s float32, v float32, a float32) *QColor { + _goptr := newQColor(C.QColor_fromHsvF2((C.float)(h), (C.float)(s), (C.float)(v), (C.float)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromCmyk5(c int, m int, y int, k int, a int) *QColor { - _goptr := newQColor(C.QColor_fromCmyk5((C.int)(c), (C.int)(m), (C.int)(y), (C.int)(k), (C.int)(a))) +func QColor_FromCmyk2(c int, m int, y int, k int, a int) *QColor { + _goptr := newQColor(C.QColor_fromCmyk2((C.int)(c), (C.int)(m), (C.int)(y), (C.int)(k), (C.int)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromCmykF5(c float32, m float32, y float32, k float32, a float32) *QColor { - _goptr := newQColor(C.QColor_fromCmykF5((C.float)(c), (C.float)(m), (C.float)(y), (C.float)(k), (C.float)(a))) +func QColor_FromCmykF2(c float32, m float32, y float32, k float32, a float32) *QColor { + _goptr := newQColor(C.QColor_fromCmykF2((C.float)(c), (C.float)(m), (C.float)(y), (C.float)(k), (C.float)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromHsl4(h int, s int, l int, a int) *QColor { - _goptr := newQColor(C.QColor_fromHsl4((C.int)(h), (C.int)(s), (C.int)(l), (C.int)(a))) +func QColor_FromHsl2(h int, s int, l int, a int) *QColor { + _goptr := newQColor(C.QColor_fromHsl2((C.int)(h), (C.int)(s), (C.int)(l), (C.int)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QColor_FromHslF4(h float32, s float32, l float32, a float32) *QColor { - _goptr := newQColor(C.QColor_fromHslF4((C.float)(h), (C.float)(s), (C.float)(l), (C.float)(a))) +func QColor_FromHslF2(h float32, s float32, l float32, a float32) *QColor { + _goptr := newQColor(C.QColor_fromHslF2((C.float)(h), (C.float)(s), (C.float)(l), (C.float)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QColor) Lighter1(f int) *QColor { - _goptr := newQColor(C.QColor_lighter1(this.h, (C.int)(f))) +func (this *QColor) LighterWithInt(f int) *QColor { + _goptr := newQColor(C.QColor_lighterWithInt(this.h, (C.int)(f))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QColor) Darker1(f int) *QColor { - _goptr := newQColor(C.QColor_darker1(this.h, (C.int)(f))) +func (this *QColor) DarkerWithInt(f int) *QColor { + _goptr := newQColor(C.QColor_darkerWithInt(this.h, (C.int)(f))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qcolor.h b/qt6/gen_qcolor.h index b7af0bbc..dd866bdc 100644 --- a/qt6/gen_qcolor.h +++ b/qt6/gen_qcolor.h @@ -34,10 +34,10 @@ QColor* QColor_new5(QRgba64* rgba64); QColor* QColor_new6(struct miqt_string name); QColor* QColor_new7(const char* aname); QColor* QColor_new8(int spec); -QColor* QColor_new9(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4); +QColor* QColor_new9(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4); QColor* QColor_new10(QColor* param1); QColor* QColor_new11(int r, int g, int b, int a); -QColor* QColor_new12(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4, uint16_t a5); +QColor* QColor_new12(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4, unsigned short a5); QColor* QColor_fromString(QAnyStringView* name); void QColor_operatorAssign(QColor* self, int color); bool QColor_isValid(const QColor* self); @@ -117,7 +117,7 @@ QColor* QColor_fromRgb(unsigned int rgb); QColor* QColor_fromRgba(unsigned int rgba); QColor* QColor_fromRgb2(int r, int g, int b); QColor* QColor_fromRgbF(float r, float g, float b); -QColor* QColor_fromRgba64(uint16_t r, uint16_t g, uint16_t b); +QColor* QColor_fromRgba64(unsigned short r, unsigned short g, unsigned short b); QColor* QColor_fromRgba64WithRgba(QRgba64* rgba); QColor* QColor_fromHsv(int h, int s, int v); QColor* QColor_fromHsvF(float h, float s, float v); @@ -132,34 +132,34 @@ bool QColor_operatorNotEqual(const QColor* self, QColor* c); QVariant* QColor_ToQVariant(const QColor* self); bool QColor_isValidColor(struct miqt_string name); bool QColor_isValidColorName(QAnyStringView* param1); -struct miqt_string QColor_name1(const QColor* self, int format); -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, float* r, float* g, float* b, float* a); -void QColor_setRgbF4(QColor* self, float r, float g, float b, float a); -void QColor_getHsv4(const QColor* self, int* h, int* s, int* v, int* a); -void QColor_setHsv4(QColor* self, int h, int s, int v, int a); -void QColor_getHsvF4(const QColor* self, float* h, float* s, float* v, float* a); -void QColor_setHsvF4(QColor* self, float h, float s, float v, float a); -void QColor_getCmyk5(const QColor* self, int* c, int* m, int* y, int* k, int* a); -void QColor_setCmyk5(QColor* self, int c, int m, int y, int k, int a); -void QColor_getCmykF5(const QColor* self, float* c, float* m, float* y, float* k, float* a); -void QColor_setCmykF5(QColor* self, float c, float m, float y, float k, float a); -void QColor_getHsl4(const QColor* self, int* h, int* s, int* l, int* a); -void QColor_setHsl4(QColor* self, int h, int s, int l, int a); -void QColor_getHslF4(const QColor* self, float* h, float* s, float* l, float* a); -void QColor_setHslF4(QColor* self, float h, float s, float l, float a); -QColor* QColor_fromRgb4(int r, int g, int b, int a); -QColor* QColor_fromRgbF4(float r, float g, float b, float a); -QColor* QColor_fromRgba644(uint16_t r, uint16_t g, uint16_t b, uint16_t a); -QColor* QColor_fromHsv4(int h, int s, int v, int a); -QColor* QColor_fromHsvF4(float h, float s, float v, float a); -QColor* QColor_fromCmyk5(int c, int m, int y, int k, int a); -QColor* QColor_fromCmykF5(float c, float m, float y, float k, float a); -QColor* QColor_fromHsl4(int h, int s, int l, int a); -QColor* QColor_fromHslF4(float h, float s, float l, float a); -QColor* QColor_lighter1(const QColor* self, int f); -QColor* QColor_darker1(const QColor* self, int f); +struct miqt_string QColor_nameWithFormat(const QColor* self, int format); +void QColor_getRgb2(const QColor* self, int* r, int* g, int* b, int* a); +void QColor_setRgb2(QColor* self, int r, int g, int b, int a); +void QColor_getRgbF2(const QColor* self, float* r, float* g, float* b, float* a); +void QColor_setRgbF2(QColor* self, float r, float g, float b, float a); +void QColor_getHsv2(const QColor* self, int* h, int* s, int* v, int* a); +void QColor_setHsv2(QColor* self, int h, int s, int v, int a); +void QColor_getHsvF2(const QColor* self, float* h, float* s, float* v, float* a); +void QColor_setHsvF2(QColor* self, float h, float s, float v, float a); +void QColor_getCmyk2(const QColor* self, int* c, int* m, int* y, int* k, int* a); +void QColor_setCmyk2(QColor* self, int c, int m, int y, int k, int a); +void QColor_getCmykF2(const QColor* self, float* c, float* m, float* y, float* k, float* a); +void QColor_setCmykF2(QColor* self, float c, float m, float y, float k, float a); +void QColor_getHsl2(const QColor* self, int* h, int* s, int* l, int* a); +void QColor_setHsl2(QColor* self, int h, int s, int l, int a); +void QColor_getHslF2(const QColor* self, float* h, float* s, float* l, float* a); +void QColor_setHslF2(QColor* self, float h, float s, float l, float a); +QColor* QColor_fromRgb3(int r, int g, int b, int a); +QColor* QColor_fromRgbF2(float r, float g, float b, float a); +QColor* QColor_fromRgba642(unsigned short r, unsigned short g, unsigned short b, unsigned short a); +QColor* QColor_fromHsv2(int h, int s, int v, int a); +QColor* QColor_fromHsvF2(float h, float s, float v, float a); +QColor* QColor_fromCmyk2(int c, int m, int y, int k, int a); +QColor* QColor_fromCmykF2(float c, float m, float y, float k, float a); +QColor* QColor_fromHsl2(int h, int s, int l, int a); +QColor* QColor_fromHslF2(float h, float s, float l, float a); +QColor* QColor_lighterWithInt(const QColor* self, int f); +QColor* QColor_darkerWithInt(const QColor* self, int f); void QColor_delete(QColor* self); #ifdef __cplusplus diff --git a/qt6/gen_qcolordialog.cpp b/qt6/gen_qcolordialog.cpp index c479a0fd..31dc34c2 100644 --- a/qt6/gen_qcolordialog.cpp +++ b/qt6/gen_qcolordialog.cpp @@ -1251,7 +1251,7 @@ void QColorDialog_setOption2(QColorDialog* self, int option, bool on) { self->setOption(static_cast(option), on); } -QColor* QColorDialog_getColor1(QColor* initial) { +QColor* QColorDialog_getColorWithInitial(QColor* initial) { return new QColor(QColorDialog::getColor(*initial)); } diff --git a/qt6/gen_qcolordialog.go b/qt6/gen_qcolordialog.go index 1d3d9b4b..cfd7c329 100644 --- a/qt6/gen_qcolordialog.go +++ b/qt6/gen_qcolordialog.go @@ -233,8 +233,8 @@ func (this *QColorDialog) SetOption2(option QColorDialog__ColorDialogOption, on C.QColorDialog_setOption2(this.h, (C.int)(option), (C.bool)(on)) } -func QColorDialog_GetColor1(initial *QColor) *QColor { - _goptr := newQColor(C.QColorDialog_getColor1(initial.cPointer())) +func QColorDialog_GetColorWithInitial(initial *QColor) *QColor { + _goptr := newQColor(C.QColorDialog_getColorWithInitial(initial.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qcolordialog.h b/qt6/gen_qcolordialog.h index 1e2c7b5a..707208bc 100644 --- a/qt6/gen_qcolordialog.h +++ b/qt6/gen_qcolordialog.h @@ -119,7 +119,7 @@ void QColorDialog_done(QColorDialog* self, int result); struct miqt_string QColorDialog_tr2(const char* s, const char* c); struct miqt_string QColorDialog_tr3(const char* s, const char* c, int n); void QColorDialog_setOption2(QColorDialog* self, int option, bool on); -QColor* QColorDialog_getColor1(QColor* initial); +QColor* QColorDialog_getColorWithInitial(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); diff --git a/qt6/gen_qcolormap.cpp b/qt6/gen_qcolormap.cpp index e9c51a48..6f6fa2e6 100644 --- a/qt6/gen_qcolormap.cpp +++ b/qt6/gen_qcolormap.cpp @@ -67,7 +67,7 @@ struct miqt_array /* of QColor* */ QColormap_colormap(const QColormap* self) { return _out; } -QColormap* QColormap_instance1(int screen) { +QColormap* QColormap_instanceWithScreen(int screen) { return new QColormap(QColormap::instance(static_cast(screen))); } diff --git a/qt6/gen_qcolormap.go b/qt6/gen_qcolormap.go index c68fbf1c..15a2b8ad 100644 --- a/qt6/gen_qcolormap.go +++ b/qt6/gen_qcolormap.go @@ -111,8 +111,8 @@ func (this *QColormap) Colormap() []QColor { return _ret } -func QColormap_Instance1(screen int) *QColormap { - _goptr := newQColormap(C.QColormap_instance1((C.int)(screen))) +func QColormap_InstanceWithScreen(screen int) *QColormap { + _goptr := newQColormap(C.QColormap_instanceWithScreen((C.int)(screen))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qcolormap.h b/qt6/gen_qcolormap.h index 17fcc070..53f92baf 100644 --- a/qt6/gen_qcolormap.h +++ b/qt6/gen_qcolormap.h @@ -33,7 +33,7 @@ int QColormap_size(const QColormap* self); unsigned int QColormap_pixel(const QColormap* self, QColor* color); QColor* QColormap_colorAt(const QColormap* self, unsigned int pixel); struct miqt_array /* of QColor* */ QColormap_colormap(const QColormap* self); -QColormap* QColormap_instance1(int screen); +QColormap* QColormap_instanceWithScreen(int screen); void QColormap_delete(QColormap* self); #ifdef __cplusplus diff --git a/qt6/gen_qcombobox.cpp b/qt6/gen_qcombobox.cpp index 06435395..2a2c7daa 100644 --- a/qt6/gen_qcombobox.cpp +++ b/qt6/gen_qcombobox.cpp @@ -1589,7 +1589,7 @@ int QComboBox_findData3(const QComboBox* self, QVariant* data, int role, int fla return self->findData(*data, static_cast(role), static_cast(flags)); } -QVariant* QComboBox_currentData1(const QComboBox* self, int role) { +QVariant* QComboBox_currentDataWithRole(const QComboBox* self, int role) { return new QVariant(self->currentData(static_cast(role))); } @@ -1597,12 +1597,12 @@ 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) { +void QComboBox_addItem3(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) { +void QComboBox_addItem4(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); } @@ -1617,7 +1617,7 @@ void QComboBox_insertItem4(QComboBox* self, int index, QIcon* icon, struct miqt_ self->insertItem(static_cast(index), *icon, text_QString, *userData); } -void QComboBox_setItemData3(QComboBox* self, int index, QVariant* value, int role) { +void QComboBox_setItemData2(QComboBox* self, int index, QVariant* value, int role) { self->setItemData(static_cast(index), *value, static_cast(role)); } diff --git a/qt6/gen_qcombobox.go b/qt6/gen_qcombobox.go index 40a63b97..80563b8a 100644 --- a/qt6/gen_qcombobox.go +++ b/qt6/gen_qcombobox.go @@ -662,8 +662,8 @@ func (this *QComboBox) FindData3(data *QVariant, role int, flags MatchFlag) int return (int)(C.QComboBox_findData3(this.h, data.cPointer(), (C.int)(role), (C.int)(flags))) } -func (this *QComboBox) CurrentData1(role int) *QVariant { - _goptr := newQVariant(C.QComboBox_currentData1(this.h, (C.int)(role))) +func (this *QComboBox) CurrentDataWithRole(role int) *QVariant { + _goptr := newQVariant(C.QComboBox_currentDataWithRole(this.h, (C.int)(role))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -674,20 +674,20 @@ func (this *QComboBox) ItemData2(index int, role int) *QVariant { return _goptr } -func (this *QComboBox) AddItem22(text string, userData *QVariant) { +func (this *QComboBox) AddItem3(text string, userData *QVariant) { text_ms := C.struct_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()) + C.QComboBox_addItem3(this.h, text_ms, userData.cPointer()) } -func (this *QComboBox) AddItem3(icon *QIcon, text string, userData *QVariant) { +func (this *QComboBox) AddItem4(icon *QIcon, text string, userData *QVariant) { text_ms := C.struct_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()) + C.QComboBox_addItem4(this.h, icon.cPointer(), text_ms, userData.cPointer()) } func (this *QComboBox) InsertItem3(index int, text string, userData *QVariant) { @@ -706,8 +706,8 @@ func (this *QComboBox) InsertItem4(index int, icon *QIcon, text string, userData C.QComboBox_insertItem4(this.h, (C.int)(index), icon.cPointer(), text_ms, userData.cPointer()) } -func (this *QComboBox) SetItemData3(index int, value *QVariant, role int) { - C.QComboBox_setItemData3(this.h, (C.int)(index), value.cPointer(), (C.int)(role)) +func (this *QComboBox) SetItemData2(index int, value *QVariant, role int) { + C.QComboBox_setItemData2(this.h, (C.int)(index), value.cPointer(), (C.int)(role)) } // UpdateMicroFocus can only be called from a QComboBox that was directly constructed. diff --git a/qt6/gen_qcombobox.h b/qt6/gen_qcombobox.h index bb0840d2..0d5cc431 100644 --- a/qt6/gen_qcombobox.h +++ b/qt6/gen_qcombobox.h @@ -210,13 +210,13 @@ struct miqt_string QComboBox_tr3(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_currentDataWithRole(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_addItem3(QComboBox* self, struct miqt_string text, QVariant* userData); +void QComboBox_addItem4(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_setItemData2(QComboBox* self, int index, QVariant* value, int role); bool QComboBox_override_virtual_setModel(void* self, intptr_t slot); void QComboBox_virtualbase_setModel(void* self, QAbstractItemModel* model); bool QComboBox_override_virtual_sizeHint(void* self, intptr_t slot); diff --git a/qt6/gen_qcommandlineparser.cpp b/qt6/gen_qcommandlineparser.cpp index 165dd806..dcb69418 100644 --- a/qt6/gen_qcommandlineparser.cpp +++ b/qt6/gen_qcommandlineparser.cpp @@ -298,14 +298,14 @@ struct miqt_string QCommandLineParser_tr3(const char* sourceText, const char* di return _ms; } -void QCommandLineParser_addPositionalArgument3(QCommandLineParser* self, struct miqt_string name, struct miqt_string description, struct miqt_string syntax) { +void QCommandLineParser_addPositionalArgument2(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); } -void QCommandLineParser_showHelp1(QCommandLineParser* self, int exitCode) { +void QCommandLineParser_showHelpWithExitCode(QCommandLineParser* self, int exitCode) { self->showHelp(static_cast(exitCode)); } diff --git a/qt6/gen_qcommandlineparser.go b/qt6/gen_qcommandlineparser.go index a256613f..740a7577 100644 --- a/qt6/gen_qcommandlineparser.go +++ b/qt6/gen_qcommandlineparser.go @@ -314,7 +314,7 @@ func QCommandLineParser_Tr3(sourceText string, disambiguation string, n int) str return _ret } -func (this *QCommandLineParser) AddPositionalArgument3(name string, description string, syntax string) { +func (this *QCommandLineParser) AddPositionalArgument2(name string, description string, syntax string) { name_ms := C.struct_miqt_string{} name_ms.data = C.CString(name) name_ms.len = C.size_t(len(name)) @@ -327,11 +327,11 @@ func (this *QCommandLineParser) AddPositionalArgument3(name string, description 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) + C.QCommandLineParser_addPositionalArgument2(this.h, name_ms, description_ms, syntax_ms) } -func (this *QCommandLineParser) ShowHelp1(exitCode int) { - C.QCommandLineParser_showHelp1(this.h, (C.int)(exitCode)) +func (this *QCommandLineParser) ShowHelpWithExitCode(exitCode int) { + C.QCommandLineParser_showHelpWithExitCode(this.h, (C.int)(exitCode)) } // Delete this object from C++ memory. diff --git a/qt6/gen_qcommandlineparser.h b/qt6/gen_qcommandlineparser.h index a1589e14..2eabc6ed 100644 --- a/qt6/gen_qcommandlineparser.h +++ b/qt6/gen_qcommandlineparser.h @@ -54,8 +54,8 @@ void QCommandLineParser_showHelp(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); -void QCommandLineParser_addPositionalArgument3(QCommandLineParser* self, struct miqt_string name, struct miqt_string description, struct miqt_string syntax); -void QCommandLineParser_showHelp1(QCommandLineParser* self, int exitCode); +void QCommandLineParser_addPositionalArgument2(QCommandLineParser* self, struct miqt_string name, struct miqt_string description, struct miqt_string syntax); +void QCommandLineParser_showHelpWithExitCode(QCommandLineParser* self, int exitCode); void QCommandLineParser_delete(QCommandLineParser* self); #ifdef __cplusplus diff --git a/qt6/gen_qcompleter.cpp b/qt6/gen_qcompleter.cpp index e9a957bc..f858d761 100644 --- a/qt6/gen_qcompleter.cpp +++ b/qt6/gen_qcompleter.cpp @@ -568,7 +568,7 @@ struct miqt_string QCompleter_tr3(const char* s, const char* c, int n) { return _ms; } -void QCompleter_complete1(QCompleter* self, QRect* rect) { +void QCompleter_completeWithRect(QCompleter* self, QRect* rect) { self->complete(*rect); } diff --git a/qt6/gen_qcompleter.go b/qt6/gen_qcompleter.go index fa69a198..af9d4eb8 100644 --- a/qt6/gen_qcompleter.go +++ b/qt6/gen_qcompleter.go @@ -417,8 +417,8 @@ func QCompleter_Tr3(s string, c string, n int) string { return _ret } -func (this *QCompleter) Complete1(rect *QRect) { - C.QCompleter_complete1(this.h, rect.cPointer()) +func (this *QCompleter) CompleteWithRect(rect *QRect) { + C.QCompleter_completeWithRect(this.h, rect.cPointer()) } // Sender can only be called from a QCompleter that was directly constructed. diff --git a/qt6/gen_qcompleter.h b/qt6/gen_qcompleter.h index 2d1ae524..90b5e863 100644 --- a/qt6/gen_qcompleter.h +++ b/qt6/gen_qcompleter.h @@ -97,7 +97,7 @@ 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); -void QCompleter_complete1(QCompleter* self, QRect* rect); +void QCompleter_completeWithRect(QCompleter* self, QRect* rect); bool QCompleter_override_virtual_pathFromIndex(void* self, intptr_t slot); struct miqt_string QCompleter_virtualbase_pathFromIndex(const void* self, QModelIndex* index); bool QCompleter_override_virtual_splitPath(void* self, intptr_t slot); diff --git a/qt6/gen_qconcatenatetablesproxymodel.cpp b/qt6/gen_qconcatenatetablesproxymodel.cpp index 6c6652bc..ba5ed488 100644 --- a/qt6/gen_qconcatenatetablesproxymodel.cpp +++ b/qt6/gen_qconcatenatetablesproxymodel.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qt6/gen_qcoreapplication.cpp b/qt6/gen_qcoreapplication.cpp index f9dd6009..79a734f3 100644 --- a/qt6/gen_qcoreapplication.cpp +++ b/qt6/gen_qcoreapplication.cpp @@ -582,15 +582,15 @@ void QCoreApplication_setAttribute2(int attribute, bool on) { QCoreApplication::setAttribute(static_cast(attribute), on); } -void QCoreApplication_processEvents1(int flags) { +void QCoreApplication_processEventsWithFlags(int flags) { QCoreApplication::processEvents(static_cast(flags)); } -void QCoreApplication_postEvent3(QObject* receiver, QEvent* event, int priority) { +void QCoreApplication_postEvent2(QObject* receiver, QEvent* event, int priority) { QCoreApplication::postEvent(receiver, event, static_cast(priority)); } -void QCoreApplication_sendPostedEvents1(QObject* receiver) { +void QCoreApplication_sendPostedEventsWithReceiver(QObject* receiver) { QCoreApplication::sendPostedEvents(receiver); } @@ -602,7 +602,7 @@ 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_translate2(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(); @@ -613,7 +613,7 @@ struct miqt_string QCoreApplication_translate3(const char* context, const char* return _ms; } -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, 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(); @@ -624,7 +624,7 @@ struct miqt_string QCoreApplication_translate4(const char* context, const char* return _ms; } -void QCoreApplication_exit1(int retcode) { +void QCoreApplication_exitWithRetcode(int retcode) { QCoreApplication::exit(static_cast(retcode)); } diff --git a/qt6/gen_qcoreapplication.go b/qt6/gen_qcoreapplication.go index 69e55ddd..24111581 100644 --- a/qt6/gen_qcoreapplication.go +++ b/qt6/gen_qcoreapplication.go @@ -476,16 +476,16 @@ func QCoreApplication_SetAttribute2(attribute ApplicationAttribute, on bool) { C.QCoreApplication_setAttribute2((C.int)(attribute), (C.bool)(on)) } -func QCoreApplication_ProcessEvents1(flags QEventLoop__ProcessEventsFlag) { - C.QCoreApplication_processEvents1((C.int)(flags)) +func QCoreApplication_ProcessEventsWithFlags(flags QEventLoop__ProcessEventsFlag) { + C.QCoreApplication_processEventsWithFlags((C.int)(flags)) } -func QCoreApplication_PostEvent3(receiver *QObject, event *QEvent, priority int) { - C.QCoreApplication_postEvent3(receiver.cPointer(), event.cPointer(), (C.int)(priority)) +func QCoreApplication_PostEvent2(receiver *QObject, event *QEvent, priority int) { + C.QCoreApplication_postEvent2(receiver.cPointer(), event.cPointer(), (C.int)(priority)) } -func QCoreApplication_SendPostedEvents1(receiver *QObject) { - C.QCoreApplication_sendPostedEvents1(receiver.cPointer()) +func QCoreApplication_SendPostedEventsWithReceiver(receiver *QObject) { + C.QCoreApplication_sendPostedEventsWithReceiver(receiver.cPointer()) } func QCoreApplication_SendPostedEvents2(receiver *QObject, event_type int) { @@ -496,34 +496,34 @@ func QCoreApplication_RemovePostedEvents2(receiver *QObject, eventType int) { C.QCoreApplication_removePostedEvents2(receiver.cPointer(), (C.int)(eventType)) } -func QCoreApplication_Translate3(context string, key string, disambiguation string) string { +func QCoreApplication_Translate2(context string, key string, disambiguation string) string { context_Cstring := C.CString(context) defer C.free(unsafe.Pointer(context_Cstring)) key_Cstring := C.CString(key) 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) + var _ms C.struct_miqt_string = C.QCoreApplication_translate2(context_Cstring, key_Cstring, disambiguation_Cstring) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func QCoreApplication_Translate4(context string, key string, disambiguation string, n int) string { +func QCoreApplication_Translate3(context string, key string, disambiguation string, n int) string { context_Cstring := C.CString(context) defer C.free(unsafe.Pointer(context_Cstring)) key_Cstring := C.CString(key) 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)) + var _ms C.struct_miqt_string = C.QCoreApplication_translate3(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 } -func QCoreApplication_Exit1(retcode int) { - C.QCoreApplication_exit1((C.int)(retcode)) +func QCoreApplication_ExitWithRetcode(retcode int) { + C.QCoreApplication_exitWithRetcode((C.int)(retcode)) } // ResolveInterface can only be called from a QCoreApplication that was directly constructed. diff --git a/qt6/gen_qcoreapplication.h b/qt6/gen_qcoreapplication.h index 22d2d7b9..44710be7 100644 --- a/qt6/gen_qcoreapplication.h +++ b/qt6/gen_qcoreapplication.h @@ -100,14 +100,14 @@ bool QCoreApplication_event(QCoreApplication* self, QEvent* param1); struct miqt_string QCoreApplication_tr2(const char* s, const char* c); struct miqt_string QCoreApplication_tr3(const char* s, const char* c, int n); void QCoreApplication_setAttribute2(int attribute, bool on); -void QCoreApplication_processEvents1(int flags); -void QCoreApplication_postEvent3(QObject* receiver, QEvent* event, int priority); -void QCoreApplication_sendPostedEvents1(QObject* receiver); +void QCoreApplication_processEventsWithFlags(int flags); +void QCoreApplication_postEvent2(QObject* receiver, QEvent* event, int priority); +void QCoreApplication_sendPostedEventsWithReceiver(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); -void QCoreApplication_exit1(int retcode); +struct miqt_string QCoreApplication_translate2(const char* context, const char* key, const char* disambiguation); +struct miqt_string QCoreApplication_translate3(const char* context, const char* key, const char* disambiguation, int n); +void QCoreApplication_exitWithRetcode(int retcode); bool QCoreApplication_override_virtual_notify(void* self, intptr_t slot); bool QCoreApplication_virtualbase_notify(void* self, QObject* param1, QEvent* param2); bool QCoreApplication_override_virtual_event(void* self, intptr_t slot); diff --git a/qt6/gen_qcoreevent.cpp b/qt6/gen_qcoreevent.cpp index 6ed3b1ba..712a06b3 100644 --- a/qt6/gen_qcoreevent.cpp +++ b/qt6/gen_qcoreevent.cpp @@ -117,7 +117,7 @@ QEvent* QEvent_clone(const QEvent* self) { return self->clone(); } -int QEvent_registerEventType1(int hint) { +int QEvent_registerEventTypeWithHint(int hint) { return QEvent::registerEventType(static_cast(hint)); } diff --git a/qt6/gen_qcoreevent.go b/qt6/gen_qcoreevent.go index 6c76d7ba..4f8187d1 100644 --- a/qt6/gen_qcoreevent.go +++ b/qt6/gen_qcoreevent.go @@ -274,8 +274,8 @@ func (this *QEvent) Clone() *QEvent { return newQEvent(C.QEvent_clone(this.h)) } -func QEvent_RegisterEventType1(hint int) int { - return (int)(C.QEvent_registerEventType1((C.int)(hint))) +func QEvent_RegisterEventTypeWithHint(hint int) int { + return (int)(C.QEvent_registerEventTypeWithHint((C.int)(hint))) } func (this *QEvent) callVirtualBase_SetAccepted(accepted bool) { diff --git a/qt6/gen_qcoreevent.h b/qt6/gen_qcoreevent.h index 4346d61d..75df9374 100644 --- a/qt6/gen_qcoreevent.h +++ b/qt6/gen_qcoreevent.h @@ -40,7 +40,7 @@ bool QEvent_isPointerEvent(const QEvent* self); bool QEvent_isSinglePointEvent(const QEvent* self); int QEvent_registerEventType(); QEvent* QEvent_clone(const QEvent* self); -int QEvent_registerEventType1(int hint); +int QEvent_registerEventTypeWithHint(int hint); bool QEvent_override_virtual_setAccepted(void* self, intptr_t slot); void QEvent_virtualbase_setAccepted(void* self, bool accepted); bool QEvent_override_virtual_clone(void* self, intptr_t slot); diff --git a/qt6/gen_qdatastream.cpp b/qt6/gen_qdatastream.cpp index 5c433e7f..599754e9 100644 --- a/qt6/gen_qdatastream.cpp +++ b/qt6/gen_qdatastream.cpp @@ -93,11 +93,11 @@ void QDataStream_operatorShiftRightWithQuint8(QDataStream* self, unsigned char* self->operator>>(static_cast(*i)); } -void QDataStream_operatorShiftRightWithQint16(QDataStream* self, int16_t* i) { +void QDataStream_operatorShiftRightWithQint16(QDataStream* self, short* i) { self->operator>>(static_cast(*i)); } -void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, uint16_t* i) { +void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, unsigned short* i) { self->operator>>(static_cast(*i)); } @@ -145,11 +145,11 @@ void QDataStream_operatorShiftLeftWithQuint8(QDataStream* self, unsigned char i) self->operator<<(static_cast(i)); } -void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, int16_t i) { +void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, short i) { self->operator<<(static_cast(i)); } -void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, uint16_t i) { +void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, unsigned short i) { self->operator<<(static_cast(i)); } diff --git a/qt6/gen_qdatastream.go b/qt6/gen_qdatastream.go index d0a0c9b2..ba57e65a 100644 --- a/qt6/gen_qdatastream.go +++ b/qt6/gen_qdatastream.go @@ -201,11 +201,11 @@ func (this *QDataStream) OperatorShiftRightWithQuint8(i *byte) { } func (this *QDataStream) OperatorShiftRightWithQint16(i *int16) { - C.QDataStream_operatorShiftRightWithQint16(this.h, (*C.int16_t)(unsafe.Pointer(i))) + C.QDataStream_operatorShiftRightWithQint16(this.h, (*C.short)(unsafe.Pointer(i))) } func (this *QDataStream) OperatorShiftRightWithQuint16(i *uint16) { - C.QDataStream_operatorShiftRightWithQuint16(this.h, (*C.uint16_t)(unsafe.Pointer(i))) + C.QDataStream_operatorShiftRightWithQuint16(this.h, (*C.ushort)(unsafe.Pointer(i))) } func (this *QDataStream) OperatorShiftRightWithQint32(i *int) { @@ -255,11 +255,11 @@ func (this *QDataStream) OperatorShiftLeftWithQuint8(i byte) { } func (this *QDataStream) OperatorShiftLeftWithQint16(i int16) { - C.QDataStream_operatorShiftLeftWithQint16(this.h, (C.int16_t)(i)) + C.QDataStream_operatorShiftLeftWithQint16(this.h, (C.short)(i)) } func (this *QDataStream) OperatorShiftLeftWithQuint16(i uint16) { - C.QDataStream_operatorShiftLeftWithQuint16(this.h, (C.uint16_t)(i)) + C.QDataStream_operatorShiftLeftWithQuint16(this.h, (C.ushort)(i)) } func (this *QDataStream) OperatorShiftLeftWithQint32(i int) { diff --git a/qt6/gen_qdatastream.h b/qt6/gen_qdatastream.h index 3e5d455c..8e64e2e3 100644 --- a/qt6/gen_qdatastream.h +++ b/qt6/gen_qdatastream.h @@ -43,8 +43,8 @@ void QDataStream_setVersion(QDataStream* self, int version); void QDataStream_operatorShiftRight(QDataStream* self, char* i); void QDataStream_operatorShiftRightWithQint8(QDataStream* self, signed char* i); void QDataStream_operatorShiftRightWithQuint8(QDataStream* self, unsigned char* i); -void QDataStream_operatorShiftRightWithQint16(QDataStream* self, int16_t* i); -void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, uint16_t* i); +void QDataStream_operatorShiftRightWithQint16(QDataStream* self, short* i); +void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, unsigned short* i); void QDataStream_operatorShiftRightWithQint32(QDataStream* self, int* i); void QDataStream_operatorShiftRightWithQuint32(QDataStream* self, unsigned int* i); void QDataStream_operatorShiftRightWithQint64(QDataStream* self, long long* i); @@ -56,8 +56,8 @@ void QDataStream_operatorShiftRightWithStr(QDataStream* self, char* str); void QDataStream_operatorShiftLeft(QDataStream* self, char i); void QDataStream_operatorShiftLeftWithQint8(QDataStream* self, signed char i); void QDataStream_operatorShiftLeftWithQuint8(QDataStream* self, unsigned char i); -void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, int16_t i); -void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, uint16_t i); +void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, short i); +void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, unsigned short i); void QDataStream_operatorShiftLeftWithQint32(QDataStream* self, int i); void QDataStream_operatorShiftLeftWithQuint32(QDataStream* self, unsigned int i); void QDataStream_operatorShiftLeftWithQint64(QDataStream* self, long long i); diff --git a/qt6/gen_qdatetime.cpp b/qt6/gen_qdatetime.cpp index 50516dbb..e002f40f 100644 --- a/qt6/gen_qdatetime.cpp +++ b/qt6/gen_qdatetime.cpp @@ -209,11 +209,11 @@ long long QDate_toJulianDay(const QDate* self) { return static_cast(_ret); } -int QDate_weekNumber1(const QDate* self, int* yearNum) { +int QDate_weekNumberWithYearNum(const QDate* self, int* yearNum) { return self->weekNumber(static_cast(yearNum)); } -QDateTime* QDate_startOfDay1(const QDate* self, int spec) { +QDateTime* QDate_startOfDayWithSpec(const QDate* self, int spec) { return new QDateTime(self->startOfDay(static_cast(spec))); } @@ -221,7 +221,7 @@ QDateTime* QDate_startOfDay2(const QDate* self, int spec, int offsetSeconds) { return new QDateTime(self->startOfDay(static_cast(spec), static_cast(offsetSeconds))); } -QDateTime* QDate_endOfDay1(const QDate* self, int spec) { +QDateTime* QDate_endOfDayWithSpec(const QDate* self, int spec) { return new QDateTime(self->endOfDay(static_cast(spec))); } @@ -229,7 +229,7 @@ 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_toString1(const QDate* self, int format) { +struct miqt_string QDate_toString3(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(); @@ -240,7 +240,7 @@ struct miqt_string QDate_toString1(const QDate* self, int format) { return _ms; } -struct miqt_string QDate_toString22(const QDate* self, struct miqt_string format, QCalendar* cal) { +struct miqt_string QDate_toString4(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 @@ -252,12 +252,12 @@ struct miqt_string QDate_toString22(const QDate* self, struct miqt_string format return _ms; } -QDate* QDate_fromString23(struct miqt_string string, int format) { +QDate* QDate_fromString8(struct miqt_string string, int format) { QString string_QString = QString::fromUtf8(string.data, string.len); return new QDate(QDate::fromString(string_QString, static_cast(format))); } -QDate* QDate_fromString34(struct miqt_string string, struct miqt_string format, QCalendar* cal) { +QDate* QDate_fromString9(struct miqt_string string, struct miqt_string format, QCalendar* cal) { QString string_QString = QString::fromUtf8(string.data, string.len); QString format_QString = QString::fromUtf8(format.data, format.len); return new QDate(QDate::fromString(string_QString, format_QString, *cal)); @@ -381,7 +381,7 @@ bool QTime_isValid2(int h, int m, int s) { return QTime::isValid(static_cast(h), static_cast(m), static_cast(s)); } -struct miqt_string QTime_toString1(const QTime* self, int f) { +struct miqt_string QTime_toStringWithQtDateFormat(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(); @@ -392,16 +392,16 @@ struct miqt_string QTime_toString1(const QTime* self, int f) { return _ms; } -bool QTime_setHMS4(QTime* self, int h, int m, int s, int ms) { +bool QTime_setHMS2(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_fromString23(struct miqt_string string, int format) { +QTime* QTime_fromString6(struct miqt_string string, int format) { QString string_QString = QString::fromUtf8(string.data, string.len); return new QTime(QTime::fromString(string_QString, static_cast(format))); } -bool QTime_isValid4(int h, int m, int s, int ms) { +bool QTime_isValid3(int h, int m, int s, int ms) { return QTime::isValid(static_cast(h), static_cast(m), static_cast(s), static_cast(ms)); } @@ -646,7 +646,7 @@ long long QDateTime_currentSecsSinceEpoch() { return static_cast(_ret); } -struct miqt_string QDateTime_toString1(const QDateTime* self, int format) { +struct miqt_string QDateTime_toString3(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(); @@ -657,7 +657,7 @@ struct miqt_string QDateTime_toString1(const QDateTime* self, int format) { return _ms; } -struct miqt_string QDateTime_toString22(const QDateTime* self, struct miqt_string format, QCalendar* cal) { +struct miqt_string QDateTime_toString4(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 @@ -669,30 +669,30 @@ struct miqt_string QDateTime_toString22(const QDateTime* self, struct miqt_strin return _ms; } -QDateTime* QDateTime_fromString23(struct miqt_string string, int format) { +QDateTime* QDateTime_fromString8(struct miqt_string string, int format) { QString string_QString = QString::fromUtf8(string.data, string.len); return new QDateTime(QDateTime::fromString(string_QString, static_cast(format))); } -QDateTime* QDateTime_fromString34(struct miqt_string string, struct miqt_string format, QCalendar* cal) { +QDateTime* QDateTime_fromString9(struct miqt_string string, struct miqt_string format, QCalendar* cal) { QString string_QString = QString::fromUtf8(string.data, string.len); QString format_QString = QString::fromUtf8(format.data, format.len); return new QDateTime(QDateTime::fromString(string_QString, format_QString, *cal)); } -QDateTime* QDateTime_fromMSecsSinceEpoch22(long long msecs, int spec) { +QDateTime* QDateTime_fromMSecsSinceEpoch3(long long msecs, int spec) { return new QDateTime(QDateTime::fromMSecsSinceEpoch(static_cast(msecs), static_cast(spec))); } -QDateTime* QDateTime_fromMSecsSinceEpoch3(long long msecs, int spec, int offsetFromUtc) { +QDateTime* QDateTime_fromMSecsSinceEpoch4(long long msecs, int spec, int offsetFromUtc) { return new QDateTime(QDateTime::fromMSecsSinceEpoch(static_cast(msecs), static_cast(spec), static_cast(offsetFromUtc))); } -QDateTime* QDateTime_fromSecsSinceEpoch22(long long secs, int spec) { +QDateTime* QDateTime_fromSecsSinceEpoch3(long long secs, int spec) { return new QDateTime(QDateTime::fromSecsSinceEpoch(static_cast(secs), static_cast(spec))); } -QDateTime* QDateTime_fromSecsSinceEpoch3(long long secs, int spec, int offsetFromUtc) { +QDateTime* QDateTime_fromSecsSinceEpoch4(long long secs, int spec, int offsetFromUtc) { return new QDateTime(QDateTime::fromSecsSinceEpoch(static_cast(secs), static_cast(spec), static_cast(offsetFromUtc))); } diff --git a/qt6/gen_qdatetime.go b/qt6/gen_qdatetime.go index 36fbe3d7..2cc4609a 100644 --- a/qt6/gen_qdatetime.go +++ b/qt6/gen_qdatetime.go @@ -280,12 +280,12 @@ func (this *QDate) ToJulianDay() int64 { return (int64)(C.QDate_toJulianDay(this.h)) } -func (this *QDate) WeekNumber1(yearNum *int) int { - return (int)(C.QDate_weekNumber1(this.h, (*C.int)(unsafe.Pointer(yearNum)))) +func (this *QDate) WeekNumberWithYearNum(yearNum *int) int { + return (int)(C.QDate_weekNumberWithYearNum(this.h, (*C.int)(unsafe.Pointer(yearNum)))) } -func (this *QDate) StartOfDay1(spec TimeSpec) *QDateTime { - _goptr := newQDateTime(C.QDate_startOfDay1(this.h, (C.int)(spec))) +func (this *QDate) StartOfDayWithSpec(spec TimeSpec) *QDateTime { + _goptr := newQDateTime(C.QDate_startOfDayWithSpec(this.h, (C.int)(spec))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -296,8 +296,8 @@ func (this *QDate) StartOfDay2(spec TimeSpec, offsetSeconds int) *QDateTime { return _goptr } -func (this *QDate) EndOfDay1(spec TimeSpec) *QDateTime { - _goptr := newQDateTime(C.QDate_endOfDay1(this.h, (C.int)(spec))) +func (this *QDate) EndOfDayWithSpec(spec TimeSpec) *QDateTime { + _goptr := newQDateTime(C.QDate_endOfDayWithSpec(this.h, (C.int)(spec))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -308,35 +308,35 @@ func (this *QDate) EndOfDay2(spec TimeSpec, offsetSeconds int) *QDateTime { return _goptr } -func (this *QDate) ToString1(format DateFormat) string { - var _ms C.struct_miqt_string = C.QDate_toString1(this.h, (C.int)(format)) +func (this *QDate) ToString3(format DateFormat) string { + var _ms C.struct_miqt_string = C.QDate_toString3(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 *QDate) ToString22(format string, cal QCalendar) string { +func (this *QDate) ToString4(format string, cal QCalendar) string { 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_toString22(this.h, format_ms, cal.cPointer()) + var _ms C.struct_miqt_string = C.QDate_toString4(this.h, format_ms, cal.cPointer()) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func QDate_FromString23(stringVal string, format DateFormat) *QDate { +func QDate_FromString8(stringVal string, format DateFormat) *QDate { 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)) - _goptr := newQDate(C.QDate_fromString23(stringVal_ms, (C.int)(format))) + _goptr := newQDate(C.QDate_fromString8(stringVal_ms, (C.int)(format))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QDate_FromString34(stringVal string, format string, cal QCalendar) *QDate { +func QDate_FromString9(stringVal string, format string, cal QCalendar) *QDate { stringVal_ms := C.struct_miqt_string{} stringVal_ms.data = C.CString(stringVal) stringVal_ms.len = C.size_t(len(stringVal)) @@ -345,7 +345,7 @@ func QDate_FromString34(stringVal string, format string, cal QCalendar) *QDate { format_ms.data = C.CString(format) format_ms.len = C.size_t(len(format)) defer C.free(unsafe.Pointer(format_ms.data)) - _goptr := newQDate(C.QDate_fromString34(stringVal_ms, format_ms, cal.cPointer())) + _goptr := newQDate(C.QDate_fromString9(stringVal_ms, format_ms, cal.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -536,29 +536,29 @@ func QTime_IsValid2(h int, m int, s int) bool { return (bool)(C.QTime_isValid2((C.int)(h), (C.int)(m), (C.int)(s))) } -func (this *QTime) ToString1(f DateFormat) string { - var _ms C.struct_miqt_string = C.QTime_toString1(this.h, (C.int)(f)) +func (this *QTime) ToStringWithQtDateFormat(f DateFormat) string { + var _ms C.struct_miqt_string = C.QTime_toStringWithQtDateFormat(this.h, (C.int)(f)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QTime) SetHMS4(h int, m int, s int, ms int) bool { - return (bool)(C.QTime_setHMS4(this.h, (C.int)(h), (C.int)(m), (C.int)(s), (C.int)(ms))) +func (this *QTime) SetHMS2(h int, m int, s int, ms int) bool { + return (bool)(C.QTime_setHMS2(this.h, (C.int)(h), (C.int)(m), (C.int)(s), (C.int)(ms))) } -func QTime_FromString23(stringVal string, format DateFormat) *QTime { +func QTime_FromString6(stringVal string, format DateFormat) *QTime { 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)) - _goptr := newQTime(C.QTime_fromString23(stringVal_ms, (C.int)(format))) + _goptr := newQTime(C.QTime_fromString6(stringVal_ms, (C.int)(format))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QTime_IsValid4(h int, m int, s int, ms int) bool { - return (bool)(C.QTime_isValid4((C.int)(h), (C.int)(m), (C.int)(s), (C.int)(ms))) +func QTime_IsValid3(h int, m int, s int, ms int) bool { + return (bool)(C.QTime_isValid3((C.int)(h), (C.int)(m), (C.int)(s), (C.int)(ms))) } // Delete this object from C++ memory. @@ -890,35 +890,35 @@ func QDateTime_CurrentSecsSinceEpoch() int64 { return (int64)(C.QDateTime_currentSecsSinceEpoch()) } -func (this *QDateTime) ToString1(format DateFormat) string { - var _ms C.struct_miqt_string = C.QDateTime_toString1(this.h, (C.int)(format)) +func (this *QDateTime) ToString3(format DateFormat) string { + var _ms C.struct_miqt_string = C.QDateTime_toString3(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 *QDateTime) ToString22(format string, cal QCalendar) string { +func (this *QDateTime) ToString4(format string, cal QCalendar) string { 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_toString22(this.h, format_ms, cal.cPointer()) + var _ms C.struct_miqt_string = C.QDateTime_toString4(this.h, format_ms, cal.cPointer()) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func QDateTime_FromString23(stringVal string, format DateFormat) *QDateTime { +func QDateTime_FromString8(stringVal string, format DateFormat) *QDateTime { 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)) - _goptr := newQDateTime(C.QDateTime_fromString23(stringVal_ms, (C.int)(format))) + _goptr := newQDateTime(C.QDateTime_fromString8(stringVal_ms, (C.int)(format))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QDateTime_FromString34(stringVal string, format string, cal QCalendar) *QDateTime { +func QDateTime_FromString9(stringVal string, format string, cal QCalendar) *QDateTime { stringVal_ms := C.struct_miqt_string{} stringVal_ms.data = C.CString(stringVal) stringVal_ms.len = C.size_t(len(stringVal)) @@ -927,31 +927,31 @@ func QDateTime_FromString34(stringVal string, format string, cal QCalendar) *QDa format_ms.data = C.CString(format) format_ms.len = C.size_t(len(format)) defer C.free(unsafe.Pointer(format_ms.data)) - _goptr := newQDateTime(C.QDateTime_fromString34(stringVal_ms, format_ms, cal.cPointer())) + _goptr := newQDateTime(C.QDateTime_fromString9(stringVal_ms, format_ms, cal.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QDateTime_FromMSecsSinceEpoch22(msecs int64, spec TimeSpec) *QDateTime { - _goptr := newQDateTime(C.QDateTime_fromMSecsSinceEpoch22((C.longlong)(msecs), (C.int)(spec))) +func QDateTime_FromMSecsSinceEpoch3(msecs int64, spec TimeSpec) *QDateTime { + _goptr := newQDateTime(C.QDateTime_fromMSecsSinceEpoch3((C.longlong)(msecs), (C.int)(spec))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QDateTime_FromMSecsSinceEpoch3(msecs int64, spec TimeSpec, offsetFromUtc int) *QDateTime { - _goptr := newQDateTime(C.QDateTime_fromMSecsSinceEpoch3((C.longlong)(msecs), (C.int)(spec), (C.int)(offsetFromUtc))) +func QDateTime_FromMSecsSinceEpoch4(msecs int64, spec TimeSpec, offsetFromUtc int) *QDateTime { + _goptr := newQDateTime(C.QDateTime_fromMSecsSinceEpoch4((C.longlong)(msecs), (C.int)(spec), (C.int)(offsetFromUtc))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QDateTime_FromSecsSinceEpoch22(secs int64, spec TimeSpec) *QDateTime { - _goptr := newQDateTime(C.QDateTime_fromSecsSinceEpoch22((C.longlong)(secs), (C.int)(spec))) +func QDateTime_FromSecsSinceEpoch3(secs int64, spec TimeSpec) *QDateTime { + _goptr := newQDateTime(C.QDateTime_fromSecsSinceEpoch3((C.longlong)(secs), (C.int)(spec))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QDateTime_FromSecsSinceEpoch3(secs int64, spec TimeSpec, offsetFromUtc int) *QDateTime { - _goptr := newQDateTime(C.QDateTime_fromSecsSinceEpoch3((C.longlong)(secs), (C.int)(spec), (C.int)(offsetFromUtc))) +func QDateTime_FromSecsSinceEpoch4(secs int64, spec TimeSpec, offsetFromUtc int) *QDateTime { + _goptr := newQDateTime(C.QDateTime_fromSecsSinceEpoch4((C.longlong)(secs), (C.int)(spec), (C.int)(offsetFromUtc))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qdatetime.h b/qt6/gen_qdatetime.h index 1ba19ab6..2e810815 100644 --- a/qt6/gen_qdatetime.h +++ b/qt6/gen_qdatetime.h @@ -71,15 +71,15 @@ bool QDate_isValid2(int y, int m, int d); bool QDate_isLeapYear(int year); QDate* QDate_fromJulianDay(long long jd_); long long QDate_toJulianDay(const QDate* self); -int QDate_weekNumber1(const QDate* self, int* yearNum); -QDateTime* QDate_startOfDay1(const QDate* self, int spec); +int QDate_weekNumberWithYearNum(const QDate* self, int* yearNum); +QDateTime* QDate_startOfDayWithSpec(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_endOfDayWithSpec(const QDate* self, int spec); QDateTime* QDate_endOfDay2(const QDate* self, int spec, int offsetSeconds); -struct miqt_string QDate_toString1(const QDate* self, int format); -struct miqt_string QDate_toString22(const QDate* self, struct miqt_string format, QCalendar* cal); -QDate* QDate_fromString23(struct miqt_string string, int format); -QDate* QDate_fromString34(struct miqt_string string, struct miqt_string format, QCalendar* cal); +struct miqt_string QDate_toString3(const QDate* self, int format); +struct miqt_string QDate_toString4(const QDate* self, struct miqt_string format, QCalendar* cal); +QDate* QDate_fromString8(struct miqt_string string, int format); +QDate* QDate_fromString9(struct miqt_string string, struct miqt_string format, QCalendar* cal); void QDate_delete(QDate* self); QTime* QTime_new(); @@ -106,10 +106,10 @@ QTime* QTime_currentTime(); QTime* QTime_fromStringWithString(struct miqt_string string); QTime* QTime_fromString4(struct miqt_string string, struct miqt_string format); bool QTime_isValid2(int h, int m, int s); -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_fromString23(struct miqt_string string, int format); -bool QTime_isValid4(int h, int m, int s, int ms); +struct miqt_string QTime_toStringWithQtDateFormat(const QTime* self, int f); +bool QTime_setHMS2(QTime* self, int h, int m, int s, int ms); +QTime* QTime_fromString6(struct miqt_string string, int format); +bool QTime_isValid3(int h, int m, int s, int ms); void QTime_delete(QTime* self); QDateTime* QDateTime_new(); @@ -163,14 +163,14 @@ QDateTime* QDateTime_fromMSecsSinceEpoch2(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); -struct miqt_string QDateTime_toString22(const QDateTime* self, struct miqt_string format, QCalendar* cal); -QDateTime* QDateTime_fromString23(struct miqt_string string, int format); -QDateTime* QDateTime_fromString34(struct miqt_string string, struct miqt_string format, QCalendar* cal); -QDateTime* QDateTime_fromMSecsSinceEpoch22(long long msecs, int spec); -QDateTime* QDateTime_fromMSecsSinceEpoch3(long long msecs, int spec, int offsetFromUtc); -QDateTime* QDateTime_fromSecsSinceEpoch22(long long secs, int spec); -QDateTime* QDateTime_fromSecsSinceEpoch3(long long secs, int spec, int offsetFromUtc); +struct miqt_string QDateTime_toString3(const QDateTime* self, int format); +struct miqt_string QDateTime_toString4(const QDateTime* self, struct miqt_string format, QCalendar* cal); +QDateTime* QDateTime_fromString8(struct miqt_string string, int format); +QDateTime* QDateTime_fromString9(struct miqt_string string, struct miqt_string format, QCalendar* cal); +QDateTime* QDateTime_fromMSecsSinceEpoch3(long long msecs, int spec); +QDateTime* QDateTime_fromMSecsSinceEpoch4(long long msecs, int spec, int offsetFromUtc); +QDateTime* QDateTime_fromSecsSinceEpoch3(long long secs, int spec); +QDateTime* QDateTime_fromSecsSinceEpoch4(long long secs, int spec, int offsetFromUtc); void QDateTime_delete(QDateTime* self); #ifdef __cplusplus diff --git a/qt6/gen_qdeadlinetimer.cpp b/qt6/gen_qdeadlinetimer.cpp index 9c20a735..f3a05034 100644 --- a/qt6/gen_qdeadlinetimer.cpp +++ b/qt6/gen_qdeadlinetimer.cpp @@ -143,7 +143,7 @@ void QDeadlineTimer_setPreciseDeadline3(QDeadlineTimer* self, long long secs, lo self->setPreciseDeadline(static_cast(secs), static_cast(nsecs), static_cast(type)); } -QDeadlineTimer* QDeadlineTimer_current1(int timerType) { +QDeadlineTimer* QDeadlineTimer_currentWithTimerType(int timerType) { return new QDeadlineTimer(QDeadlineTimer::current(static_cast(timerType))); } diff --git a/qt6/gen_qdeadlinetimer.go b/qt6/gen_qdeadlinetimer.go index 0d8d267a..7298e017 100644 --- a/qt6/gen_qdeadlinetimer.go +++ b/qt6/gen_qdeadlinetimer.go @@ -193,8 +193,8 @@ func (this *QDeadlineTimer) SetPreciseDeadline3(secs int64, nsecs int64, typeVal C.QDeadlineTimer_setPreciseDeadline3(this.h, (C.longlong)(secs), (C.longlong)(nsecs), (C.int)(typeVal)) } -func QDeadlineTimer_Current1(timerType TimerType) *QDeadlineTimer { - _goptr := newQDeadlineTimer(C.QDeadlineTimer_current1((C.int)(timerType))) +func QDeadlineTimer_CurrentWithTimerType(timerType TimerType) *QDeadlineTimer { + _goptr := newQDeadlineTimer(C.QDeadlineTimer_currentWithTimerType((C.int)(timerType))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qdeadlinetimer.h b/qt6/gen_qdeadlinetimer.h index 5ca2f30b..1f7c69ef 100644 --- a/qt6/gen_qdeadlinetimer.h +++ b/qt6/gen_qdeadlinetimer.h @@ -51,7 +51,7 @@ void QDeadlineTimer_setPreciseRemainingTime3(QDeadlineTimer* self, long long sec void QDeadlineTimer_setDeadline2(QDeadlineTimer* self, long long msecs, int timerType); void QDeadlineTimer_setPreciseDeadline2(QDeadlineTimer* self, long long secs, long long nsecs); void QDeadlineTimer_setPreciseDeadline3(QDeadlineTimer* self, long long secs, long long nsecs, int type); -QDeadlineTimer* QDeadlineTimer_current1(int timerType); +QDeadlineTimer* QDeadlineTimer_currentWithTimerType(int timerType); void QDeadlineTimer_delete(QDeadlineTimer* self); #ifdef __cplusplus diff --git a/qt6/gen_qdebug.cpp b/qt6/gen_qdebug.cpp index 752c4893..4ea58fd9 100644 --- a/qt6/gen_qdebug.cpp +++ b/qt6/gen_qdebug.cpp @@ -122,13 +122,13 @@ QDebug* QDebug_operatorShiftLeftWithChar(QDebug* self, char t) { return &_ret; } -QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, int16_t t) { +QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, short t) { QDebug& _ret = self->operator<<(static_cast(t)); // Cast returned reference into pointer return &_ret; } -QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, uint16_t t) { +QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, unsigned short t) { QDebug& _ret = self->operator<<(static_cast(t)); // Cast returned reference into pointer return &_ret; @@ -214,7 +214,7 @@ QDebug* QDebug_operatorShiftLeftWithVoid(QDebug* self, const void* t) { return &_ret; } -QDebug* QDebug_maybeQuote1(QDebug* self, char c) { +QDebug* QDebug_maybeQuoteWithChar(QDebug* self, char c) { QDebug& _ret = self->maybeQuote(static_cast(c)); // Cast returned reference into pointer return &_ret; @@ -274,7 +274,7 @@ QNoDebug* QNoDebug_verbosity(QNoDebug* self, int param1) { return &_ret; } -QNoDebug* QNoDebug_maybeQuote1(QNoDebug* self, const char param1) { +QNoDebug* QNoDebug_maybeQuoteWithChar(QNoDebug* self, const char param1) { QNoDebug& _ret = self->maybeQuote(static_cast(param1)); // Cast returned reference into pointer return &_ret; diff --git a/qt6/gen_qdebug.go b/qt6/gen_qdebug.go index 2bcb1a7d..d43d34f0 100644 --- a/qt6/gen_qdebug.go +++ b/qt6/gen_qdebug.go @@ -138,11 +138,11 @@ func (this *QDebug) OperatorShiftLeftWithChar(t int8) *QDebug { } func (this *QDebug) OperatorShiftLeftWithShort(t int16) *QDebug { - return newQDebug(C.QDebug_operatorShiftLeftWithShort(this.h, (C.int16_t)(t))) + return newQDebug(C.QDebug_operatorShiftLeftWithShort(this.h, (C.short)(t))) } func (this *QDebug) OperatorShiftLeftWithUnsignedshort(t uint16) *QDebug { - return newQDebug(C.QDebug_operatorShiftLeftWithUnsignedshort(this.h, (C.uint16_t)(t))) + return newQDebug(C.QDebug_operatorShiftLeftWithUnsignedshort(this.h, (C.ushort)(t))) } func (this *QDebug) OperatorShiftLeftWithInt(t int) *QDebug { @@ -210,8 +210,8 @@ func (this *QDebug) OperatorShiftLeftWithVoid(t unsafe.Pointer) *QDebug { return newQDebug(C.QDebug_operatorShiftLeftWithVoid(this.h, t)) } -func (this *QDebug) MaybeQuote1(c int8) *QDebug { - return newQDebug(C.QDebug_maybeQuote1(this.h, (C.char)(c))) +func (this *QDebug) MaybeQuoteWithChar(c int8) *QDebug { + return newQDebug(C.QDebug_maybeQuoteWithChar(this.h, (C.char)(c))) } // Delete this object from C++ memory. @@ -340,8 +340,8 @@ func (this *QNoDebug) Verbosity(param1 int) *QNoDebug { return newQNoDebug(C.QNoDebug_verbosity(this.h, (C.int)(param1))) } -func (this *QNoDebug) MaybeQuote1(param1 int8) *QNoDebug { - return newQNoDebug(C.QNoDebug_maybeQuote1(this.h, (C.const_char)(param1))) +func (this *QNoDebug) MaybeQuoteWithChar(param1 int8) *QNoDebug { + return newQNoDebug(C.QNoDebug_maybeQuoteWithChar(this.h, (C.const_char)(param1))) } // Delete this object from C++ memory. diff --git a/qt6/gen_qdebug.h b/qt6/gen_qdebug.h index b606a57c..3e1c500a 100644 --- a/qt6/gen_qdebug.h +++ b/qt6/gen_qdebug.h @@ -52,8 +52,8 @@ QDebug* QDebug_maybeQuote(QDebug* self); QDebug* QDebug_operatorShiftLeft(QDebug* self, QChar* t); QDebug* QDebug_operatorShiftLeftWithBool(QDebug* self, bool t); QDebug* QDebug_operatorShiftLeftWithChar(QDebug* self, char t); -QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, int16_t t); -QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, uint16_t t); +QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, short t); +QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, unsigned short t); QDebug* QDebug_operatorShiftLeftWithInt(QDebug* self, int t); QDebug* QDebug_operatorShiftLeftWithUnsignedint(QDebug* self, unsigned int t); QDebug* QDebug_operatorShiftLeftWithLong(QDebug* self, long t); @@ -67,7 +67,7 @@ QDebug* QDebug_operatorShiftLeftWithQString(QDebug* self, struct miqt_string t); QDebug* QDebug_operatorShiftLeftWithQByteArray(QDebug* self, struct miqt_string t); QDebug* QDebug_operatorShiftLeftWithQByteArrayView(QDebug* self, QByteArrayView* t); QDebug* QDebug_operatorShiftLeftWithVoid(QDebug* self, const void* t); -QDebug* QDebug_maybeQuote1(QDebug* self, char c); +QDebug* QDebug_maybeQuoteWithChar(QDebug* self, char c); void QDebug_delete(QDebug* self); QDebugStateSaver* QDebugStateSaver_new(QDebug* dbg); @@ -80,7 +80,7 @@ QNoDebug* QNoDebug_quote(QNoDebug* self); QNoDebug* QNoDebug_noquote(QNoDebug* self); QNoDebug* QNoDebug_maybeQuote(QNoDebug* self); QNoDebug* QNoDebug_verbosity(QNoDebug* self, int param1); -QNoDebug* QNoDebug_maybeQuote1(QNoDebug* self, const char param1); +QNoDebug* QNoDebug_maybeQuoteWithChar(QNoDebug* self, const char param1); void QNoDebug_delete(QNoDebug* self); #ifdef __cplusplus diff --git a/qt6/gen_qdir.cpp b/qt6/gen_qdir.cpp index cd947a55..596cffb3 100644 --- a/qt6/gen_qdir.cpp +++ b/qt6/gen_qdir.cpp @@ -589,11 +589,11 @@ void QDir_refresh(const QDir* self) { self->refresh(); } -bool QDir_isEmpty1(const QDir* self, int filters) { +bool QDir_isEmptyWithFilters(const QDir* self, int filters) { return self->isEmpty(static_cast(filters)); } -struct miqt_array /* of struct miqt_string */ QDir_entryList1(const QDir* self, int filters) { +struct miqt_array /* of struct miqt_string */ QDir_entryListWithFilters(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())); @@ -633,7 +633,7 @@ struct miqt_array /* of struct miqt_string */ QDir_entryList2(const QDir* self, return _out; } -struct miqt_array /* of struct miqt_string */ QDir_entryList22(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters) { +struct miqt_array /* of struct miqt_string */ QDir_entryList3(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); @@ -660,7 +660,7 @@ struct miqt_array /* of struct miqt_string */ QDir_entryList22(const QDir* self return _out; } -struct miqt_array /* of struct miqt_string */ QDir_entryList3(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters, int sort) { +struct miqt_array /* of struct miqt_string */ QDir_entryList4(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); @@ -687,7 +687,7 @@ struct miqt_array /* of struct miqt_string */ QDir_entryList3(const QDir* self, return _out; } -struct miqt_array /* of QFileInfo* */ QDir_entryInfoList1(const QDir* self, int filters) { +struct miqt_array /* of QFileInfo* */ QDir_entryInfoListWithFilters(const QDir* self, int filters) { QFileInfoList _ret = self->entryInfoList(static_cast(filters)); // Convert QList<> from C++ memory to manually-managed C memory QFileInfo** _arr = static_cast(malloc(sizeof(QFileInfo*) * _ret.length())); @@ -713,7 +713,7 @@ struct miqt_array /* of QFileInfo* */ QDir_entryInfoList2(const QDir* self, int return _out; } -struct miqt_array /* of QFileInfo* */ QDir_entryInfoList22(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters) { +struct miqt_array /* of QFileInfo* */ QDir_entryInfoList3(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); @@ -733,7 +733,7 @@ struct miqt_array /* of QFileInfo* */ QDir_entryInfoList22(const QDir* self, st return _out; } -struct miqt_array /* of QFileInfo* */ QDir_entryInfoList3(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters, int sort) { +struct miqt_array /* of QFileInfo* */ QDir_entryInfoList4(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); diff --git a/qt6/gen_qdir.go b/qt6/gen_qdir.go index f626844b..9779486d 100644 --- a/qt6/gen_qdir.go +++ b/qt6/gen_qdir.go @@ -703,12 +703,12 @@ func (this *QDir) Refresh() { C.QDir_refresh(this.h) } -func (this *QDir) IsEmpty1(filters QDir__Filter) bool { - return (bool)(C.QDir_isEmpty1(this.h, (C.int)(filters))) +func (this *QDir) IsEmptyWithFilters(filters QDir__Filter) bool { + return (bool)(C.QDir_isEmptyWithFilters(this.h, (C.int)(filters))) } -func (this *QDir) EntryList1(filters QDir__Filter) []string { - var _ma C.struct_miqt_array = C.QDir_entryList1(this.h, (C.int)(filters)) +func (this *QDir) EntryListWithFilters(filters QDir__Filter) []string { + var _ma C.struct_miqt_array = C.QDir_entryListWithFilters(this.h, (C.int)(filters)) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -733,7 +733,7 @@ func (this *QDir) EntryList2(filters QDir__Filter, sort QDir__SortFlag) []string return _ret } -func (this *QDir) EntryList22(nameFilters []string, filters QDir__Filter) []string { +func (this *QDir) EntryList3(nameFilters []string, filters QDir__Filter) []string { nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(int(unsafe.Sizeof(C.struct_miqt_string{})) * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { @@ -744,7 +744,7 @@ func (this *QDir) EntryList22(nameFilters []string, filters QDir__Filter) []stri nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} - var _ma C.struct_miqt_array = C.QDir_entryList22(this.h, nameFilters_ma, (C.int)(filters)) + var _ma C.struct_miqt_array = C.QDir_entryList3(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 for i := 0; i < int(_ma.len); i++ { @@ -756,7 +756,7 @@ func (this *QDir) EntryList22(nameFilters []string, filters QDir__Filter) []stri return _ret } -func (this *QDir) EntryList3(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag) []string { +func (this *QDir) EntryList4(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag) []string { nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(int(unsafe.Sizeof(C.struct_miqt_string{})) * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { @@ -767,7 +767,7 @@ func (this *QDir) EntryList3(nameFilters []string, filters QDir__Filter, sort QD nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} - var _ma C.struct_miqt_array = C.QDir_entryList3(this.h, nameFilters_ma, (C.int)(filters), (C.int)(sort)) + var _ma C.struct_miqt_array = C.QDir_entryList4(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 for i := 0; i < int(_ma.len); i++ { @@ -779,8 +779,8 @@ func (this *QDir) EntryList3(nameFilters []string, filters QDir__Filter, sort QD return _ret } -func (this *QDir) EntryInfoList1(filters QDir__Filter) []QFileInfo { - var _ma C.struct_miqt_array = C.QDir_entryInfoList1(this.h, (C.int)(filters)) +func (this *QDir) EntryInfoListWithFilters(filters QDir__Filter) []QFileInfo { + var _ma C.struct_miqt_array = C.QDir_entryInfoListWithFilters(this.h, (C.int)(filters)) _ret := make([]QFileInfo, int(_ma.len)) _outCast := (*[0xffff]*C.QFileInfo)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -803,7 +803,7 @@ func (this *QDir) EntryInfoList2(filters QDir__Filter, sort QDir__SortFlag) []QF return _ret } -func (this *QDir) EntryInfoList22(nameFilters []string, filters QDir__Filter) []QFileInfo { +func (this *QDir) EntryInfoList3(nameFilters []string, filters QDir__Filter) []QFileInfo { nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(int(unsafe.Sizeof(C.struct_miqt_string{})) * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { @@ -814,7 +814,7 @@ func (this *QDir) EntryInfoList22(nameFilters []string, filters QDir__Filter) [] nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} - var _ma C.struct_miqt_array = C.QDir_entryInfoList22(this.h, nameFilters_ma, (C.int)(filters)) + var _ma C.struct_miqt_array = C.QDir_entryInfoList3(this.h, nameFilters_ma, (C.int)(filters)) _ret := make([]QFileInfo, int(_ma.len)) _outCast := (*[0xffff]*C.QFileInfo)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -825,7 +825,7 @@ func (this *QDir) EntryInfoList22(nameFilters []string, filters QDir__Filter) [] return _ret } -func (this *QDir) EntryInfoList3(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag) []QFileInfo { +func (this *QDir) EntryInfoList4(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag) []QFileInfo { nameFilters_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(int(unsafe.Sizeof(C.struct_miqt_string{})) * len(nameFilters)))) defer C.free(unsafe.Pointer(nameFilters_CArray)) for i := range nameFilters { @@ -836,7 +836,7 @@ func (this *QDir) EntryInfoList3(nameFilters []string, filters QDir__Filter, sor nameFilters_CArray[i] = nameFilters_i_ms } nameFilters_ma := C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} - var _ma C.struct_miqt_array = C.QDir_entryInfoList3(this.h, nameFilters_ma, (C.int)(filters), (C.int)(sort)) + var _ma C.struct_miqt_array = C.QDir_entryInfoList4(this.h, nameFilters_ma, (C.int)(filters), (C.int)(sort)) _ret := make([]QFileInfo, int(_ma.len)) _outCast := (*[0xffff]*C.QFileInfo)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt6/gen_qdir.h b/qt6/gen_qdir.h index ae0889ba..053edfe7 100644 --- a/qt6/gen_qdir.h +++ b/qt6/gen_qdir.h @@ -96,15 +96,15 @@ bool QDir_match(struct miqt_array /* of struct miqt_string */ filters, struct m 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 /* of struct miqt_string */ QDir_entryList1(const QDir* self, int filters); +bool QDir_isEmptyWithFilters(const QDir* self, int filters); +struct miqt_array /* of struct miqt_string */ QDir_entryListWithFilters(const QDir* self, int filters); struct miqt_array /* of struct miqt_string */ QDir_entryList2(const QDir* self, int filters, int sort); -struct miqt_array /* of struct miqt_string */ QDir_entryList22(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters); -struct miqt_array /* of struct miqt_string */ QDir_entryList3(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters, int sort); -struct miqt_array /* of QFileInfo* */ QDir_entryInfoList1(const QDir* self, int filters); +struct miqt_array /* of struct miqt_string */ QDir_entryList3(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters); +struct miqt_array /* of struct miqt_string */ QDir_entryList4(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters, int sort); +struct miqt_array /* of QFileInfo* */ QDir_entryInfoListWithFilters(const QDir* self, int filters); struct miqt_array /* of QFileInfo* */ QDir_entryInfoList2(const QDir* self, int filters, int sort); -struct miqt_array /* of QFileInfo* */ QDir_entryInfoList22(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters); -struct miqt_array /* of QFileInfo* */ QDir_entryInfoList3(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters, int sort); +struct miqt_array /* of QFileInfo* */ QDir_entryInfoList3(const QDir* self, struct miqt_array /* of struct miqt_string */ nameFilters, int filters); +struct miqt_array /* of QFileInfo* */ QDir_entryInfoList4(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/qt6/gen_qdrag.cpp b/qt6/gen_qdrag.cpp index 89e916a9..fa725198 100644 --- a/qt6/gen_qdrag.cpp +++ b/qt6/gen_qdrag.cpp @@ -317,7 +317,7 @@ struct miqt_string QDrag_tr3(const char* s, const char* c, int n) { return _ms; } -int QDrag_exec1(QDrag* self, int supportedActions) { +int QDrag_execWithSupportedActions(QDrag* self, int supportedActions) { Qt::DropAction _ret = self->exec(static_cast(supportedActions)); return static_cast(_ret); } diff --git a/qt6/gen_qdrag.go b/qt6/gen_qdrag.go index 8378c0e1..1d685bbe 100644 --- a/qt6/gen_qdrag.go +++ b/qt6/gen_qdrag.go @@ -203,8 +203,8 @@ func QDrag_Tr3(s string, c string, n int) string { return _ret } -func (this *QDrag) Exec1(supportedActions DropAction) DropAction { - return (DropAction)(C.QDrag_exec1(this.h, (C.int)(supportedActions))) +func (this *QDrag) ExecWithSupportedActions(supportedActions DropAction) DropAction { + return (DropAction)(C.QDrag_execWithSupportedActions(this.h, (C.int)(supportedActions))) } // Sender can only be called from a QDrag that was directly constructed. diff --git a/qt6/gen_qdrag.h b/qt6/gen_qdrag.h index 30010da7..e0c75200 100644 --- a/qt6/gen_qdrag.h +++ b/qt6/gen_qdrag.h @@ -64,7 +64,7 @@ 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); -int QDrag_exec1(QDrag* self, int supportedActions); +int QDrag_execWithSupportedActions(QDrag* self, int supportedActions); bool QDrag_override_virtual_event(void* self, intptr_t slot); bool QDrag_virtualbase_event(void* self, QEvent* event); bool QDrag_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt6/gen_qevent.cpp b/qt6/gen_qevent.cpp index 24b332d5..b131d40d 100644 --- a/qt6/gen_qevent.cpp +++ b/qt6/gen_qevent.cpp @@ -2533,7 +2533,7 @@ QKeyEvent* QKeyEvent_new4(int type, int key, int modifiers, struct miqt_string t return new MiqtVirtualQKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), text_QString, autorep); } -QKeyEvent* QKeyEvent_new5(int type, int key, int modifiers, struct miqt_string text, bool autorep, uint16_t count) { +QKeyEvent* QKeyEvent_new5(int type, int key, int modifiers, struct miqt_string text, bool autorep, unsigned short count) { QString text_QString = QString::fromUtf8(text.data, text.len); return new MiqtVirtualQKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), text_QString, autorep, static_cast(count)); } @@ -2548,12 +2548,12 @@ QKeyEvent* QKeyEvent_new7(int type, int key, int modifiers, unsigned int nativeS return new MiqtVirtualQKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep); } -QKeyEvent* QKeyEvent_new8(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count) { +QKeyEvent* QKeyEvent_new8(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, unsigned short count) { QString text_QString = QString::fromUtf8(text.data, text.len); return new MiqtVirtualQKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep, static_cast(count)); } -QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count, QInputDevice* device) { +QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, unsigned short count, QInputDevice* device) { QString text_QString = QString::fromUtf8(text.data, text.len); return new MiqtVirtualQKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep, static_cast(count), device); } diff --git a/qt6/gen_qevent.go b/qt6/gen_qevent.go index 49fa9161..985252af 100644 --- a/qt6/gen_qevent.go +++ b/qt6/gen_qevent.go @@ -2375,7 +2375,7 @@ func NewQKeyEvent5(typeVal QEvent__Type, key int, modifiers KeyboardModifier, te text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - return newQKeyEvent(C.QKeyEvent_new5((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), text_ms, (C.bool)(autorep), (C.uint16_t)(count))) + return newQKeyEvent(C.QKeyEvent_new5((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), text_ms, (C.bool)(autorep), (C.ushort)(count))) } // NewQKeyEvent6 constructs a new QKeyEvent object. @@ -2405,7 +2405,7 @@ func NewQKeyEvent8(typeVal QEvent__Type, key int, modifiers KeyboardModifier, na text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - return newQKeyEvent(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), (C.uint16_t)(count))) + return newQKeyEvent(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), (C.ushort)(count))) } // NewQKeyEvent9 constructs a new QKeyEvent object. @@ -2415,7 +2415,7 @@ func NewQKeyEvent9(typeVal QEvent__Type, key int, modifiers KeyboardModifier, na text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - return newQKeyEvent(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), device.cPointer())) + return newQKeyEvent(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.ushort)(count), device.cPointer())) } func (this *QKeyEvent) Clone() *QKeyEvent { diff --git a/qt6/gen_qevent.h b/qt6/gen_qevent.h index 55c18fc6..d84d5bde 100644 --- a/qt6/gen_qevent.h +++ b/qt6/gen_qevent.h @@ -397,11 +397,11 @@ QKeyEvent* QKeyEvent_new(int type, int key, int modifiers); QKeyEvent* QKeyEvent_new2(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers); QKeyEvent* QKeyEvent_new3(int type, int key, int modifiers, struct miqt_string text); QKeyEvent* QKeyEvent_new4(int type, int key, int modifiers, struct miqt_string text, bool autorep); -QKeyEvent* QKeyEvent_new5(int type, int key, int modifiers, struct miqt_string text, bool autorep, uint16_t count); +QKeyEvent* QKeyEvent_new5(int type, int key, int modifiers, struct miqt_string text, bool autorep, unsigned short count); QKeyEvent* QKeyEvent_new6(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text); QKeyEvent* QKeyEvent_new7(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep); -QKeyEvent* QKeyEvent_new8(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count); -QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count, QInputDevice* device); +QKeyEvent* QKeyEvent_new8(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, unsigned short count); +QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, unsigned short count, QInputDevice* device); void QKeyEvent_virtbase(QKeyEvent* src, QInputEvent** outptr_QInputEvent); QKeyEvent* QKeyEvent_clone(const QKeyEvent* self); int QKeyEvent_key(const QKeyEvent* self); diff --git a/qt6/gen_qeventloop.cpp b/qt6/gen_qeventloop.cpp index 75dc9dbb..333f78f7 100644 --- a/qt6/gen_qeventloop.cpp +++ b/qt6/gen_qeventloop.cpp @@ -264,15 +264,15 @@ struct miqt_string QEventLoop_tr3(const char* s, const char* c, int n) { return _ms; } -bool QEventLoop_processEvents1(QEventLoop* self, int flags) { +bool QEventLoop_processEventsWithFlags(QEventLoop* self, int flags) { return self->processEvents(static_cast(flags)); } -int QEventLoop_exec1(QEventLoop* self, int flags) { +int QEventLoop_execWithFlags(QEventLoop* self, int flags) { return self->exec(static_cast(flags)); } -void QEventLoop_exit1(QEventLoop* self, int returnCode) { +void QEventLoop_exitWithReturnCode(QEventLoop* self, int returnCode) { self->exit(static_cast(returnCode)); } diff --git a/qt6/gen_qeventloop.go b/qt6/gen_qeventloop.go index 4c08f3e5..5d5d4a38 100644 --- a/qt6/gen_qeventloop.go +++ b/qt6/gen_qeventloop.go @@ -148,16 +148,16 @@ func QEventLoop_Tr3(s string, c string, n int) string { return _ret } -func (this *QEventLoop) ProcessEvents1(flags QEventLoop__ProcessEventsFlag) bool { - return (bool)(C.QEventLoop_processEvents1(this.h, (C.int)(flags))) +func (this *QEventLoop) ProcessEventsWithFlags(flags QEventLoop__ProcessEventsFlag) bool { + return (bool)(C.QEventLoop_processEventsWithFlags(this.h, (C.int)(flags))) } -func (this *QEventLoop) Exec1(flags QEventLoop__ProcessEventsFlag) int { - return (int)(C.QEventLoop_exec1(this.h, (C.int)(flags))) +func (this *QEventLoop) ExecWithFlags(flags QEventLoop__ProcessEventsFlag) int { + return (int)(C.QEventLoop_execWithFlags(this.h, (C.int)(flags))) } -func (this *QEventLoop) Exit1(returnCode int) { - C.QEventLoop_exit1(this.h, (C.int)(returnCode)) +func (this *QEventLoop) ExitWithReturnCode(returnCode int) { + C.QEventLoop_exitWithReturnCode(this.h, (C.int)(returnCode)) } // Sender can only be called from a QEventLoop that was directly constructed. diff --git a/qt6/gen_qeventloop.h b/qt6/gen_qeventloop.h index 2f015632..d18a2fbe 100644 --- a/qt6/gen_qeventloop.h +++ b/qt6/gen_qeventloop.h @@ -52,9 +52,9 @@ void QEventLoop_exit(QEventLoop* self); 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); -bool QEventLoop_processEvents1(QEventLoop* self, int flags); -int QEventLoop_exec1(QEventLoop* self, int flags); -void QEventLoop_exit1(QEventLoop* self, int returnCode); +bool QEventLoop_processEventsWithFlags(QEventLoop* self, int flags); +int QEventLoop_execWithFlags(QEventLoop* self, int flags); +void QEventLoop_exitWithReturnCode(QEventLoop* self, int returnCode); bool QEventLoop_override_virtual_event(void* self, intptr_t slot); bool QEventLoop_virtualbase_event(void* self, QEvent* event); bool QEventLoop_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt6/gen_qeventpoint.cpp b/qt6/gen_qeventpoint.cpp index 9eb3c195..a58ea044 100644 --- a/qt6/gen_qeventpoint.cpp +++ b/qt6/gen_qeventpoint.cpp @@ -214,7 +214,7 @@ void QEventPoint_setAccepted(QEventPoint* self) { self->setAccepted(); } -void QEventPoint_setAccepted1(QEventPoint* self, bool accepted) { +void QEventPoint_setAcceptedWithAccepted(QEventPoint* self, bool accepted) { self->setAccepted(accepted); } diff --git a/qt6/gen_qeventpoint.go b/qt6/gen_qeventpoint.go index 64174aeb..81e249d9 100644 --- a/qt6/gen_qeventpoint.go +++ b/qt6/gen_qeventpoint.go @@ -313,8 +313,8 @@ func (this *QEventPoint) SetAccepted() { C.QEventPoint_setAccepted(this.h) } -func (this *QEventPoint) SetAccepted1(accepted bool) { - C.QEventPoint_setAccepted1(this.h, (C.bool)(accepted)) +func (this *QEventPoint) SetAcceptedWithAccepted(accepted bool) { + C.QEventPoint_setAcceptedWithAccepted(this.h, (C.bool)(accepted)) } // Delete this object from C++ memory. diff --git a/qt6/gen_qeventpoint.h b/qt6/gen_qeventpoint.h index 469b052b..6b2c57cc 100644 --- a/qt6/gen_qeventpoint.h +++ b/qt6/gen_qeventpoint.h @@ -78,7 +78,7 @@ double QEventPoint_rotation(const QEventPoint* self); QSizeF* QEventPoint_ellipseDiameters(const QEventPoint* self); bool QEventPoint_isAccepted(const QEventPoint* self); void QEventPoint_setAccepted(QEventPoint* self); -void QEventPoint_setAccepted1(QEventPoint* self, bool accepted); +void QEventPoint_setAcceptedWithAccepted(QEventPoint* self, bool accepted); void QEventPoint_delete(QEventPoint* self); #ifdef __cplusplus diff --git a/qt6/gen_qfile.cpp b/qt6/gen_qfile.cpp index e9d93721..02e1080d 100644 --- a/qt6/gen_qfile.cpp +++ b/qt6/gen_qfile.cpp @@ -827,7 +827,7 @@ struct miqt_string QFile_tr3(const char* s, const char* c, int n) { return _ms; } -bool QFile_open33(QFile* self, int fd, int ioFlags, int handleFlags) { +bool QFile_open6(QFile* self, int fd, int ioFlags, int handleFlags) { return self->open(static_cast(fd), static_cast(ioFlags), static_cast(handleFlags)); } diff --git a/qt6/gen_qfile.go b/qt6/gen_qfile.go index 69c18875..448a7b61 100644 --- a/qt6/gen_qfile.go +++ b/qt6/gen_qfile.go @@ -338,8 +338,8 @@ func QFile_Tr3(s string, c string, n int) string { return _ret } -func (this *QFile) Open33(fd int, ioFlags QIODeviceBase__OpenModeFlag, handleFlags QFileDevice__FileHandleFlag) bool { - return (bool)(C.QFile_open33(this.h, (C.int)(fd), (C.int)(ioFlags), (C.int)(handleFlags))) +func (this *QFile) Open6(fd int, ioFlags QIODeviceBase__OpenModeFlag, handleFlags QFileDevice__FileHandleFlag) bool { + return (bool)(C.QFile_open6(this.h, (C.int)(fd), (C.int)(ioFlags), (C.int)(handleFlags))) } // SetOpenMode can only be called from a QFile that was directly constructed. diff --git a/qt6/gen_qfile.h b/qt6/gen_qfile.h index a96b8514..7479e47e 100644 --- a/qt6/gen_qfile.h +++ b/qt6/gen_qfile.h @@ -77,7 +77,7 @@ 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); -bool QFile_open33(QFile* self, int fd, int ioFlags, int handleFlags); +bool QFile_open6(QFile* self, int fd, int ioFlags, int handleFlags); bool QFile_override_virtual_fileName(void* self, intptr_t slot); struct miqt_string QFile_virtualbase_fileName(const void* self); bool QFile_override_virtual_open(void* self, intptr_t slot); diff --git a/qt6/gen_qfiledevice.cpp b/qt6/gen_qfiledevice.cpp index b1a6a2d2..66b1852c 100644 --- a/qt6/gen_qfiledevice.cpp +++ b/qt6/gen_qfiledevice.cpp @@ -148,7 +148,7 @@ struct miqt_string QFileDevice_tr3(const char* s, const char* c, int n) { return _ms; } -unsigned char* QFileDevice_map3(QFileDevice* self, long long offset, long long size, int flags) { +unsigned char* QFileDevice_map2(QFileDevice* self, long long offset, long long size, int flags) { uchar* _ret = self->map(static_cast(offset), static_cast(size), static_cast(flags)); return static_cast(_ret); } diff --git a/qt6/gen_qfiledevice.go b/qt6/gen_qfiledevice.go index 4255fcd4..e8913477 100644 --- a/qt6/gen_qfiledevice.go +++ b/qt6/gen_qfiledevice.go @@ -227,8 +227,8 @@ func QFileDevice_Tr3(s string, c string, n int) string { return _ret } -func (this *QFileDevice) Map3(offset int64, size int64, flags QFileDevice__MemoryMapFlag) *byte { - return (*byte)(unsafe.Pointer(C.QFileDevice_map3(this.h, (C.longlong)(offset), (C.longlong)(size), (C.int)(flags)))) +func (this *QFileDevice) Map2(offset int64, size int64, flags QFileDevice__MemoryMapFlag) *byte { + return (*byte)(unsafe.Pointer(C.QFileDevice_map2(this.h, (C.longlong)(offset), (C.longlong)(size), (C.int)(flags)))) } // Delete this object from C++ memory. diff --git a/qt6/gen_qfiledevice.h b/qt6/gen_qfiledevice.h index 18596cab..9265bb47 100644 --- a/qt6/gen_qfiledevice.h +++ b/qt6/gen_qfiledevice.h @@ -59,7 +59,7 @@ long long QFileDevice_writeData(QFileDevice* self, const char* data, long long l long long QFileDevice_readLineData(QFileDevice* self, char* data, long long maxlen); struct miqt_string QFileDevice_tr2(const char* s, const char* c); struct miqt_string QFileDevice_tr3(const char* s, const char* c, int n); -unsigned char* QFileDevice_map3(QFileDevice* self, long long offset, long long size, int flags); +unsigned char* QFileDevice_map2(QFileDevice* self, long long offset, long long size, int flags); void QFileDevice_delete(QFileDevice* self); #ifdef __cplusplus diff --git a/qt6/gen_qfiledialog.cpp b/qt6/gen_qfiledialog.cpp index 5a7c5fb9..7eede134 100644 --- a/qt6/gen_qfiledialog.cpp +++ b/qt6/gen_qfiledialog.cpp @@ -1829,7 +1829,7 @@ 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_getOpenFileNameWithParent(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(); @@ -1879,7 +1879,7 @@ struct miqt_string QFileDialog_getOpenFileName4(QWidget* parent, struct miqt_str return _ms; } -QUrl* QFileDialog_getOpenFileUrl1(QWidget* parent) { +QUrl* QFileDialog_getOpenFileUrlWithParent(QWidget* parent) { return new QUrl(QFileDialog::getOpenFileUrl(parent)); } @@ -1899,7 +1899,7 @@ QUrl* QFileDialog_getOpenFileUrl4(QWidget* parent, struct miqt_string caption, Q return new QUrl(QFileDialog::getOpenFileUrl(parent, caption_QString, *dir, filter_QString)); } -struct miqt_string QFileDialog_getSaveFileName1(QWidget* parent) { +struct miqt_string QFileDialog_getSaveFileNameWithParent(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(); @@ -1949,7 +1949,7 @@ struct miqt_string QFileDialog_getSaveFileName4(QWidget* parent, struct miqt_str return _ms; } -QUrl* QFileDialog_getSaveFileUrl1(QWidget* parent) { +QUrl* QFileDialog_getSaveFileUrlWithParent(QWidget* parent) { return new QUrl(QFileDialog::getSaveFileUrl(parent)); } @@ -1969,7 +1969,7 @@ QUrl* QFileDialog_getSaveFileUrl4(QWidget* parent, struct miqt_string caption, Q return new QUrl(QFileDialog::getSaveFileUrl(parent, caption_QString, *dir, filter_QString)); } -struct miqt_string QFileDialog_getExistingDirectory1(QWidget* parent) { +struct miqt_string QFileDialog_getExistingDirectoryWithParent(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(); @@ -2018,7 +2018,7 @@ struct miqt_string QFileDialog_getExistingDirectory4(QWidget* parent, struct miq return _ms; } -QUrl* QFileDialog_getExistingDirectoryUrl1(QWidget* parent) { +QUrl* QFileDialog_getExistingDirectoryUrlWithParent(QWidget* parent) { return new QUrl(QFileDialog::getExistingDirectoryUrl(parent)); } @@ -2049,7 +2049,7 @@ QUrl* QFileDialog_getExistingDirectoryUrl5(QWidget* parent, struct miqt_string c return new QUrl(QFileDialog::getExistingDirectoryUrl(parent, caption_QString, *dir, static_cast(options), supportedSchemes_QList)); } -struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNames1(QWidget* parent) { +struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNamesWithParent(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())); @@ -2135,7 +2135,7 @@ struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNames4(QWi return _out; } -struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrls1(QWidget* parent) { +struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrlsWithParent(QWidget* parent) { QList _ret = QFileDialog::getOpenFileUrls(parent); // Convert QList<> from C++ memory to manually-managed C memory QUrl** _arr = static_cast(malloc(sizeof(QUrl*) * _ret.length())); diff --git a/qt6/gen_qfiledialog.go b/qt6/gen_qfiledialog.go index d0fd8461..08675114 100644 --- a/qt6/gen_qfiledialog.go +++ b/qt6/gen_qfiledialog.go @@ -877,8 +877,8 @@ func (this *QFileDialog) SetOption2(option QFileDialog__Option, on bool) { C.QFileDialog_setOption2(this.h, (C.int)(option), (C.bool)(on)) } -func QFileDialog_GetOpenFileName1(parent *QWidget) string { - var _ms C.struct_miqt_string = C.QFileDialog_getOpenFileName1(parent.cPointer()) +func QFileDialog_GetOpenFileNameWithParent(parent *QWidget) string { + var _ms C.struct_miqt_string = C.QFileDialog_getOpenFileNameWithParent(parent.cPointer()) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -929,8 +929,8 @@ func QFileDialog_GetOpenFileName4(parent *QWidget, caption string, dir string, f return _ret } -func QFileDialog_GetOpenFileUrl1(parent *QWidget) *QUrl { - _goptr := newQUrl(C.QFileDialog_getOpenFileUrl1(parent.cPointer())) +func QFileDialog_GetOpenFileUrlWithParent(parent *QWidget) *QUrl { + _goptr := newQUrl(C.QFileDialog_getOpenFileUrlWithParent(parent.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -969,8 +969,8 @@ func QFileDialog_GetOpenFileUrl4(parent *QWidget, caption string, dir *QUrl, fil return _goptr } -func QFileDialog_GetSaveFileName1(parent *QWidget) string { - var _ms C.struct_miqt_string = C.QFileDialog_getSaveFileName1(parent.cPointer()) +func QFileDialog_GetSaveFileNameWithParent(parent *QWidget) string { + var _ms C.struct_miqt_string = C.QFileDialog_getSaveFileNameWithParent(parent.cPointer()) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1021,8 +1021,8 @@ func QFileDialog_GetSaveFileName4(parent *QWidget, caption string, dir string, f return _ret } -func QFileDialog_GetSaveFileUrl1(parent *QWidget) *QUrl { - _goptr := newQUrl(C.QFileDialog_getSaveFileUrl1(parent.cPointer())) +func QFileDialog_GetSaveFileUrlWithParent(parent *QWidget) *QUrl { + _goptr := newQUrl(C.QFileDialog_getSaveFileUrlWithParent(parent.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1061,8 +1061,8 @@ func QFileDialog_GetSaveFileUrl4(parent *QWidget, caption string, dir *QUrl, fil return _goptr } -func QFileDialog_GetExistingDirectory1(parent *QWidget) string { - var _ms C.struct_miqt_string = C.QFileDialog_getExistingDirectory1(parent.cPointer()) +func QFileDialog_GetExistingDirectoryWithParent(parent *QWidget) string { + var _ms C.struct_miqt_string = C.QFileDialog_getExistingDirectoryWithParent(parent.cPointer()) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1109,8 +1109,8 @@ func QFileDialog_GetExistingDirectory4(parent *QWidget, caption string, dir stri return _ret } -func QFileDialog_GetExistingDirectoryUrl1(parent *QWidget) *QUrl { - _goptr := newQUrl(C.QFileDialog_getExistingDirectoryUrl1(parent.cPointer())) +func QFileDialog_GetExistingDirectoryUrlWithParent(parent *QWidget) *QUrl { + _goptr := newQUrl(C.QFileDialog_getExistingDirectoryUrlWithParent(parent.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1165,8 +1165,8 @@ func QFileDialog_GetExistingDirectoryUrl5(parent *QWidget, caption string, dir * return _goptr } -func QFileDialog_GetOpenFileNames1(parent *QWidget) []string { - var _ma C.struct_miqt_array = C.QFileDialog_getOpenFileNames1(parent.cPointer()) +func QFileDialog_GetOpenFileNamesWithParent(parent *QWidget) []string { + var _ma C.struct_miqt_array = C.QFileDialog_getOpenFileNamesWithParent(parent.cPointer()) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1241,8 +1241,8 @@ func QFileDialog_GetOpenFileNames4(parent *QWidget, caption string, dir string, return _ret } -func QFileDialog_GetOpenFileUrls1(parent *QWidget) []QUrl { - var _ma C.struct_miqt_array = C.QFileDialog_getOpenFileUrls1(parent.cPointer()) +func QFileDialog_GetOpenFileUrlsWithParent(parent *QWidget) []QUrl { + var _ma C.struct_miqt_array = C.QFileDialog_getOpenFileUrlsWithParent(parent.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++ { diff --git a/qt6/gen_qfiledialog.h b/qt6/gen_qfiledialog.h index a1a09d9a..002d1f03 100644 --- a/qt6/gen_qfiledialog.h +++ b/qt6/gen_qfiledialog.h @@ -188,36 +188,36 @@ void QFileDialog_changeEvent(QFileDialog* self, QEvent* e); struct miqt_string QFileDialog_tr2(const char* s, const char* c); struct miqt_string QFileDialog_tr3(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_getOpenFileNameWithParent(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_getOpenFileUrlWithParent(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_getSaveFileNameWithParent(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_getSaveFileUrlWithParent(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_getExistingDirectoryWithParent(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_getExistingDirectoryUrlWithParent(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); -struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNames1(QWidget* parent); +struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNamesWithParent(QWidget* parent); struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNames2(QWidget* parent, struct miqt_string caption); struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNames3(QWidget* parent, struct miqt_string caption, struct miqt_string dir); struct miqt_array /* of struct miqt_string */ QFileDialog_getOpenFileNames4(QWidget* parent, struct miqt_string caption, struct miqt_string dir, struct miqt_string filter); -struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrls1(QWidget* parent); +struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrlsWithParent(QWidget* parent); struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrls2(QWidget* parent, struct miqt_string caption); struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrls3(QWidget* parent, struct miqt_string caption, QUrl* dir); struct miqt_array /* of QUrl* */ QFileDialog_getOpenFileUrls4(QWidget* parent, struct miqt_string caption, QUrl* dir, struct miqt_string filter); diff --git a/qt6/gen_qfilesystemmodel.cpp b/qt6/gen_qfilesystemmodel.cpp index 1f73d6d7..c14b7dd8 100644 --- a/qt6/gen_qfilesystemmodel.cpp +++ b/qt6/gen_qfilesystemmodel.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -1515,7 +1516,7 @@ QModelIndex* QFileSystemModel_index2(const QFileSystemModel* self, struct miqt_s return new QModelIndex(self->index(path_QString, static_cast(column))); } -QVariant* QFileSystemModel_myComputer1(const QFileSystemModel* self, int role) { +QVariant* QFileSystemModel_myComputerWithRole(const QFileSystemModel* self, int role) { return new QVariant(self->myComputer(static_cast(role))); } diff --git a/qt6/gen_qfilesystemmodel.go b/qt6/gen_qfilesystemmodel.go index 87f8ce54..0890ee14 100644 --- a/qt6/gen_qfilesystemmodel.go +++ b/qt6/gen_qfilesystemmodel.go @@ -528,8 +528,8 @@ func (this *QFileSystemModel) Index2(path string, column int) *QModelIndex { return _goptr } -func (this *QFileSystemModel) MyComputer1(role int) *QVariant { - _goptr := newQVariant(C.QFileSystemModel_myComputer1(this.h, (C.int)(role))) +func (this *QFileSystemModel) MyComputerWithRole(role int) *QVariant { + _goptr := newQVariant(C.QFileSystemModel_myComputerWithRole(this.h, (C.int)(role))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qfilesystemmodel.h b/qt6/gen_qfilesystemmodel.h index 2b53ae5e..b926cb22 100644 --- a/qt6/gen_qfilesystemmodel.h +++ b/qt6/gen_qfilesystemmodel.h @@ -124,7 +124,7 @@ bool QFileSystemModel_event(QFileSystemModel* self, QEvent* event); struct miqt_string QFileSystemModel_tr2(const char* s, const char* c); struct miqt_string QFileSystemModel_tr3(const char* s, const char* c, int n); QModelIndex* QFileSystemModel_index2(const QFileSystemModel* self, struct miqt_string path, int column); -QVariant* QFileSystemModel_myComputer1(const QFileSystemModel* self, int role); +QVariant* QFileSystemModel_myComputerWithRole(const QFileSystemModel* self, int role); void QFileSystemModel_setOption2(QFileSystemModel* self, int option, bool on); bool QFileSystemModel_override_virtual_index(void* self, intptr_t slot); QModelIndex* QFileSystemModel_virtualbase_index(const void* self, int row, int column, QModelIndex* parent); diff --git a/qt6/gen_qfontdatabase.cpp b/qt6/gen_qfontdatabase.cpp index 0c1d0063..fc42f148 100644 --- a/qt6/gen_qfontdatabase.cpp +++ b/qt6/gen_qfontdatabase.cpp @@ -273,7 +273,7 @@ QFont* QFontDatabase_systemFont(int type) { return new QFont(QFontDatabase::systemFont(static_cast(type))); } -struct miqt_array /* of struct miqt_string */ QFontDatabase_families1(int writingSystem) { +struct miqt_array /* of struct miqt_string */ QFontDatabase_familiesWithWritingSystem(int writingSystem) { QStringList _ret = QFontDatabase::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())); diff --git a/qt6/gen_qfontdatabase.go b/qt6/gen_qfontdatabase.go index 6573065a..12f8741b 100644 --- a/qt6/gen_qfontdatabase.go +++ b/qt6/gen_qfontdatabase.go @@ -369,8 +369,8 @@ func QFontDatabase_SystemFont(typeVal QFontDatabase__SystemFont) *QFont { return _goptr } -func QFontDatabase_Families1(writingSystem QFontDatabase__WritingSystem) []string { - var _ma C.struct_miqt_array = C.QFontDatabase_families1((C.int)(writingSystem)) +func QFontDatabase_FamiliesWithWritingSystem(writingSystem QFontDatabase__WritingSystem) []string { + var _ma C.struct_miqt_array = C.QFontDatabase_familiesWithWritingSystem((C.int)(writingSystem)) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt6/gen_qfontdatabase.h b/qt6/gen_qfontdatabase.h index 912335a4..590445ae 100644 --- a/qt6/gen_qfontdatabase.h +++ b/qt6/gen_qfontdatabase.h @@ -52,7 +52,7 @@ struct miqt_array /* of struct miqt_string */ QFontDatabase_applicationFontFami bool QFontDatabase_removeApplicationFont(int id); bool QFontDatabase_removeAllApplicationFonts(); QFont* QFontDatabase_systemFont(int type); -struct miqt_array /* of struct miqt_string */ QFontDatabase_families1(int writingSystem); +struct miqt_array /* of struct miqt_string */ QFontDatabase_familiesWithWritingSystem(int writingSystem); struct miqt_array /* of int */ QFontDatabase_pointSizes2(struct miqt_string family, struct miqt_string style); bool QFontDatabase_isBitmapScalable2(struct miqt_string family, struct miqt_string style); bool QFontDatabase_isSmoothlyScalable2(struct miqt_string family, struct miqt_string style); diff --git a/qt6/gen_qfontdialog.cpp b/qt6/gen_qfontdialog.cpp index 1f0f65aa..013a3b28 100644 --- a/qt6/gen_qfontdialog.cpp +++ b/qt6/gen_qfontdialog.cpp @@ -1235,20 +1235,20 @@ void QFontDialog_setOption2(QFontDialog* self, int option, bool on) { self->setOption(static_cast(option), on); } -QFont* QFontDialog_getFont22(bool* ok, QWidget* parent) { +QFont* QFontDialog_getFont3(bool* ok, QWidget* parent) { return new QFont(QFontDialog::getFont(ok, parent)); } -QFont* QFontDialog_getFont3(bool* ok, QFont* initial, QWidget* parent) { +QFont* QFontDialog_getFont4(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) { +QFont* QFontDialog_getFont5(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) { +QFont* QFontDialog_getFont6(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/qt6/gen_qfontdialog.go b/qt6/gen_qfontdialog.go index 10ee4ae1..2d9cde49 100644 --- a/qt6/gen_qfontdialog.go +++ b/qt6/gen_qfontdialog.go @@ -218,34 +218,34 @@ func (this *QFontDialog) SetOption2(option QFontDialog__FontDialogOption, on boo C.QFontDialog_setOption2(this.h, (C.int)(option), (C.bool)(on)) } -func QFontDialog_GetFont22(ok *bool, parent *QWidget) *QFont { - _goptr := newQFont(C.QFontDialog_getFont22((*C.bool)(unsafe.Pointer(ok)), parent.cPointer())) +func QFontDialog_GetFont3(ok *bool, parent *QWidget) *QFont { + _goptr := newQFont(C.QFontDialog_getFont3((*C.bool)(unsafe.Pointer(ok)), parent.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QFontDialog_GetFont3(ok *bool, initial *QFont, parent *QWidget) *QFont { - _goptr := newQFont(C.QFontDialog_getFont3((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer())) +func QFontDialog_GetFont4(ok *bool, initial *QFont, parent *QWidget) *QFont { + _goptr := newQFont(C.QFontDialog_getFont4((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QFontDialog_GetFont4(ok *bool, initial *QFont, parent *QWidget, title string) *QFont { +func QFontDialog_GetFont5(ok *bool, initial *QFont, parent *QWidget, title string) *QFont { 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)) - _goptr := newQFont(C.QFontDialog_getFont4((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), title_ms)) + _goptr := newQFont(C.QFontDialog_getFont5((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), title_ms)) _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 { +func QFontDialog_GetFont6(ok *bool, initial *QFont, parent *QWidget, title string, options QFontDialog__FontDialogOption) *QFont { 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)) - _goptr := newQFont(C.QFontDialog_getFont5((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), title_ms, (C.int)(options))) + _goptr := newQFont(C.QFontDialog_getFont6((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), title_ms, (C.int)(options))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qfontdialog.h b/qt6/gen_qfontdialog.h index 73fb96f2..0428d2a8 100644 --- a/qt6/gen_qfontdialog.h +++ b/qt6/gen_qfontdialog.h @@ -116,10 +116,10 @@ bool QFontDialog_eventFilter(QFontDialog* self, QObject* object, QEvent* event); struct miqt_string QFontDialog_tr2(const char* s, const char* c); struct miqt_string QFontDialog_tr3(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_getFont3(bool* ok, QWidget* parent); +QFont* QFontDialog_getFont4(bool* ok, QFont* initial, QWidget* parent); +QFont* QFontDialog_getFont5(bool* ok, QFont* initial, QWidget* parent, struct miqt_string title); +QFont* QFontDialog_getFont6(bool* ok, QFont* initial, QWidget* parent, struct miqt_string title, int options); bool QFontDialog_override_virtual_setVisible(void* self, intptr_t slot); void QFontDialog_virtualbase_setVisible(void* self, bool visible); bool QFontDialog_override_virtual_changeEvent(void* self, intptr_t slot); diff --git a/qt6/gen_qfontmetrics.cpp b/qt6/gen_qfontmetrics.cpp index 02aab273..79a2cd4f 100644 --- a/qt6/gen_qfontmetrics.cpp +++ b/qt6/gen_qfontmetrics.cpp @@ -196,17 +196,17 @@ bool QFontMetrics_operatorNotEqual(const QFontMetrics* self, QFontMetrics* other return (*self != *other); } -int QFontMetrics_horizontalAdvance22(const QFontMetrics* self, struct miqt_string param1, int len) { +int QFontMetrics_horizontalAdvance3(const QFontMetrics* self, struct miqt_string param1, int len) { QString param1_QString = QString::fromUtf8(param1.data, param1.len); return self->horizontalAdvance(param1_QString, static_cast(len)); } -QRect* QFontMetrics_boundingRect42(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) { 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) { +QRect* QFontMetrics_boundingRect6(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))); } @@ -221,17 +221,17 @@ QRect* QFontMetrics_boundingRect8(const QFontMetrics* self, int x, int y, int w, 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) { +QSize* QFontMetrics_size2(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) { +QSize* QFontMetrics_size3(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) { +struct miqt_string QFontMetrics_elidedText2(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 @@ -444,7 +444,7 @@ bool QFontMetricsF_operatorNotEqual(const QFontMetricsF* self, QFontMetricsF* ot return (*self != *other); } -double QFontMetricsF_horizontalAdvance22(const QFontMetricsF* self, struct miqt_string string, int length) { +double QFontMetricsF_horizontalAdvance3(const QFontMetricsF* self, struct miqt_string string, int length) { QString string_QString = QString::fromUtf8(string.data, string.len); qreal _ret = self->horizontalAdvance(string_QString, static_cast(length)); return static_cast(_ret); @@ -460,17 +460,17 @@ QRectF* QFontMetricsF_boundingRect5(const QFontMetricsF* self, QRectF* r, int fl return new QRectF(self->boundingRect(*r, static_cast(flags), string_QString, static_cast(tabstops), static_cast(tabarray))); } -QSizeF* QFontMetricsF_size3(const QFontMetricsF* self, int flags, struct miqt_string str, int tabstops) { +QSizeF* QFontMetricsF_size2(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) { +QSizeF* QFontMetricsF_size3(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) { +struct miqt_string QFontMetricsF_elidedText2(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 diff --git a/qt6/gen_qfontmetrics.go b/qt6/gen_qfontmetrics.go index 2ed98874..d0ca9bb0 100644 --- a/qt6/gen_qfontmetrics.go +++ b/qt6/gen_qfontmetrics.go @@ -266,30 +266,30 @@ func (this *QFontMetrics) OperatorNotEqual(other *QFontMetrics) bool { return (bool)(C.QFontMetrics_operatorNotEqual(this.h, other.cPointer())) } -func (this *QFontMetrics) HorizontalAdvance22(param1 string, lenVal int) int { +func (this *QFontMetrics) HorizontalAdvance3(param1 string, lenVal int) int { 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_horizontalAdvance22(this.h, param1_ms, (C.int)(lenVal))) + return (int)(C.QFontMetrics_horizontalAdvance3(this.h, param1_ms, (C.int)(lenVal))) } -func (this *QFontMetrics) BoundingRect42(r *QRect, flags int, text string, tabstops int) *QRect { +func (this *QFontMetrics) BoundingRect5(r *QRect, flags int, text string, tabstops int) *QRect { text_ms := C.struct_miqt_string{} text_ms.data = C.CString(text) text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - _goptr := newQRect(C.QFontMetrics_boundingRect42(this.h, r.cPointer(), (C.int)(flags), text_ms, (C.int)(tabstops))) + _goptr := newQRect(C.QFontMetrics_boundingRect5(this.h, r.cPointer(), (C.int)(flags), text_ms, (C.int)(tabstops))) _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 { +func (this *QFontMetrics) BoundingRect6(r *QRect, flags int, text string, tabstops int, tabarray *int) *QRect { text_ms := C.struct_miqt_string{} text_ms.data = C.CString(text) text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - _goptr := newQRect(C.QFontMetrics_boundingRect5(this.h, r.cPointer(), (C.int)(flags), text_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray)))) + _goptr := newQRect(C.QFontMetrics_boundingRect6(this.h, r.cPointer(), (C.int)(flags), text_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray)))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -314,32 +314,32 @@ func (this *QFontMetrics) BoundingRect8(x int, y int, w int, h int, flags int, t return _goptr } -func (this *QFontMetrics) Size3(flags int, str string, tabstops int) *QSize { +func (this *QFontMetrics) Size2(flags int, str string, tabstops int) *QSize { 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)) - _goptr := newQSize(C.QFontMetrics_size3(this.h, (C.int)(flags), str_ms, (C.int)(tabstops))) + _goptr := newQSize(C.QFontMetrics_size2(this.h, (C.int)(flags), str_ms, (C.int)(tabstops))) _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 { +func (this *QFontMetrics) Size3(flags int, str string, tabstops int, tabarray *int) *QSize { 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)) - _goptr := newQSize(C.QFontMetrics_size4(this.h, (C.int)(flags), str_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray)))) + _goptr := newQSize(C.QFontMetrics_size3(this.h, (C.int)(flags), str_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray)))) _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 { +func (this *QFontMetrics) ElidedText2(text string, mode TextElideMode, width int, flags int) string { text_ms := C.struct_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)) + var _ms C.struct_miqt_string = C.QFontMetrics_elidedText2(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 @@ -612,12 +612,12 @@ func (this *QFontMetricsF) OperatorNotEqual(other *QFontMetricsF) bool { return (bool)(C.QFontMetricsF_operatorNotEqual(this.h, other.cPointer())) } -func (this *QFontMetricsF) HorizontalAdvance22(stringVal string, length int) float64 { +func (this *QFontMetricsF) HorizontalAdvance3(stringVal string, length int) float64 { 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_horizontalAdvance22(this.h, stringVal_ms, (C.int)(length))) + return (float64)(C.QFontMetricsF_horizontalAdvance3(this.h, stringVal_ms, (C.int)(length))) } func (this *QFontMetricsF) BoundingRect4(r *QRectF, flags int, stringVal string, tabstops int) *QRectF { @@ -640,32 +640,32 @@ func (this *QFontMetricsF) BoundingRect5(r *QRectF, flags int, stringVal string, return _goptr } -func (this *QFontMetricsF) Size3(flags int, str string, tabstops int) *QSizeF { +func (this *QFontMetricsF) Size2(flags int, str string, tabstops int) *QSizeF { 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)) - _goptr := newQSizeF(C.QFontMetricsF_size3(this.h, (C.int)(flags), str_ms, (C.int)(tabstops))) + _goptr := newQSizeF(C.QFontMetricsF_size2(this.h, (C.int)(flags), str_ms, (C.int)(tabstops))) _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 { +func (this *QFontMetricsF) Size3(flags int, str string, tabstops int, tabarray *int) *QSizeF { 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)) - _goptr := newQSizeF(C.QFontMetricsF_size4(this.h, (C.int)(flags), str_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray)))) + _goptr := newQSizeF(C.QFontMetricsF_size3(this.h, (C.int)(flags), str_ms, (C.int)(tabstops), (*C.int)(unsafe.Pointer(tabarray)))) _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 { +func (this *QFontMetricsF) ElidedText2(text string, mode TextElideMode, width float64, flags int) string { text_ms := C.struct_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)) + var _ms C.struct_miqt_string = C.QFontMetricsF_elidedText2(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/qt6/gen_qfontmetrics.h b/qt6/gen_qfontmetrics.h index 5bee8e39..77100498 100644 --- a/qt6/gen_qfontmetrics.h +++ b/qt6/gen_qfontmetrics.h @@ -77,14 +77,14 @@ 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_horizontalAdvance22(const QFontMetrics* self, struct miqt_string param1, int len); -QRect* QFontMetrics_boundingRect42(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); +int QFontMetrics_horizontalAdvance3(const QFontMetrics* self, struct miqt_string param1, int len); +QRect* QFontMetrics_boundingRect5(const QFontMetrics* self, QRect* r, int flags, struct miqt_string text, int tabstops); +QRect* QFontMetrics_boundingRect6(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); +QSize* QFontMetrics_size2(const QFontMetrics* self, int flags, struct miqt_string str, int tabstops); +QSize* QFontMetrics_size3(const QFontMetrics* self, int flags, struct miqt_string str, int tabstops, int* tabarray); +struct miqt_string QFontMetrics_elidedText2(const QFontMetrics* self, struct miqt_string text, int mode, int width, int flags); void QFontMetrics_delete(QFontMetrics* self); QFontMetricsF* QFontMetricsF_new(QFont* font); @@ -127,12 +127,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_horizontalAdvance22(const QFontMetricsF* self, struct miqt_string string, int length); +double QFontMetricsF_horizontalAdvance3(const QFontMetricsF* self, struct miqt_string string, int length); QRectF* QFontMetricsF_boundingRect4(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string string, int tabstops); QRectF* QFontMetricsF_boundingRect5(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string string, 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); +QSizeF* QFontMetricsF_size2(const QFontMetricsF* self, int flags, struct miqt_string str, int tabstops); +QSizeF* QFontMetricsF_size3(const QFontMetricsF* self, int flags, struct miqt_string str, int tabstops, int* tabarray); +struct miqt_string QFontMetricsF_elidedText2(const QFontMetricsF* self, struct miqt_string text, int mode, double width, int flags); void QFontMetricsF_delete(QFontMetricsF* self); #ifdef __cplusplus diff --git a/qt6/gen_qgraphicsanchorlayout.cpp b/qt6/gen_qgraphicsanchorlayout.cpp index 9950a27e..eb5d956b 100644 --- a/qt6/gen_qgraphicsanchorlayout.cpp +++ b/qt6/gen_qgraphicsanchorlayout.cpp @@ -383,7 +383,7 @@ void QGraphicsAnchorLayout_invalidate(QGraphicsAnchorLayout* self) { self->invalidate(); } -void QGraphicsAnchorLayout_addAnchors3(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, QGraphicsLayoutItem* secondItem, int orientations) { +void QGraphicsAnchorLayout_addAnchors2(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, QGraphicsLayoutItem* secondItem, int orientations) { self->addAnchors(firstItem, secondItem, static_cast(orientations)); } diff --git a/qt6/gen_qgraphicsanchorlayout.go b/qt6/gen_qgraphicsanchorlayout.go index 055bbcbd..7f1f5dc7 100644 --- a/qt6/gen_qgraphicsanchorlayout.go +++ b/qt6/gen_qgraphicsanchorlayout.go @@ -229,8 +229,8 @@ func (this *QGraphicsAnchorLayout) Invalidate() { C.QGraphicsAnchorLayout_invalidate(this.h) } -func (this *QGraphicsAnchorLayout) AddAnchors3(firstItem *QGraphicsLayoutItem, secondItem *QGraphicsLayoutItem, orientations Orientation) { - C.QGraphicsAnchorLayout_addAnchors3(this.h, firstItem.cPointer(), secondItem.cPointer(), (C.int)(orientations)) +func (this *QGraphicsAnchorLayout) AddAnchors2(firstItem *QGraphicsLayoutItem, secondItem *QGraphicsLayoutItem, orientations Orientation) { + C.QGraphicsAnchorLayout_addAnchors2(this.h, firstItem.cPointer(), secondItem.cPointer(), (C.int)(orientations)) } // AddChildLayoutItem can only be called from a QGraphicsAnchorLayout that was directly constructed. diff --git a/qt6/gen_qgraphicsanchorlayout.h b/qt6/gen_qgraphicsanchorlayout.h index 5bac25ac..9e901f53 100644 --- a/qt6/gen_qgraphicsanchorlayout.h +++ b/qt6/gen_qgraphicsanchorlayout.h @@ -71,7 +71,7 @@ int QGraphicsAnchorLayout_count(const QGraphicsAnchorLayout* self); QGraphicsLayoutItem* QGraphicsAnchorLayout_itemAt(const QGraphicsAnchorLayout* self, int index); void QGraphicsAnchorLayout_invalidate(QGraphicsAnchorLayout* self); QSizeF* QGraphicsAnchorLayout_sizeHint(const QGraphicsAnchorLayout* self, int which, QSizeF* constraint); -void QGraphicsAnchorLayout_addAnchors3(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, QGraphicsLayoutItem* secondItem, int orientations); +void QGraphicsAnchorLayout_addAnchors2(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, QGraphicsLayoutItem* secondItem, int orientations); bool QGraphicsAnchorLayout_override_virtual_removeAt(void* self, intptr_t slot); void QGraphicsAnchorLayout_virtualbase_removeAt(void* self, int index); bool QGraphicsAnchorLayout_override_virtual_setGeometry(void* self, intptr_t slot); diff --git a/qt6/gen_qgraphicseffect.cpp b/qt6/gen_qgraphicseffect.cpp index 89fb9133..bd20e00f 100644 --- a/qt6/gen_qgraphicseffect.cpp +++ b/qt6/gen_qgraphicseffect.cpp @@ -296,8 +296,8 @@ public: friend QRectF* QGraphicsEffect_protectedbase_sourceBoundingRect(bool* _dynamic_cast_ok, const void* self); friend void QGraphicsEffect_protectedbase_drawSource(bool* _dynamic_cast_ok, void* self, QPainter* painter); friend QPixmap* QGraphicsEffect_protectedbase_sourcePixmap(bool* _dynamic_cast_ok, const void* self); - friend QRectF* QGraphicsEffect_protectedbase_sourceBoundingRect1(bool* _dynamic_cast_ok, const void* self, int system); - friend QPixmap* QGraphicsEffect_protectedbase_sourcePixmap1(bool* _dynamic_cast_ok, const void* self, int system); + friend QRectF* QGraphicsEffect_protectedbase_sourceBoundingRectWithSystem(bool* _dynamic_cast_ok, const void* self, int system); + friend QPixmap* QGraphicsEffect_protectedbase_sourcePixmapWithSystem(bool* _dynamic_cast_ok, const void* self, int system); friend QPixmap* QGraphicsEffect_protectedbase_sourcePixmap2(bool* _dynamic_cast_ok, const void* self, int system, QPoint* offset); friend QPixmap* QGraphicsEffect_protectedbase_sourcePixmap3(bool* _dynamic_cast_ok, const void* self, int system, QPoint* offset, int mode); friend QObject* QGraphicsEffect_protectedbase_sender(bool* _dynamic_cast_ok, const void* self); @@ -609,7 +609,7 @@ QPixmap* QGraphicsEffect_protectedbase_sourcePixmap(bool* _dynamic_cast_ok, cons } -QRectF* QGraphicsEffect_protectedbase_sourceBoundingRect1(bool* _dynamic_cast_ok, const void* self, int system) { +QRectF* QGraphicsEffect_protectedbase_sourceBoundingRectWithSystem(bool* _dynamic_cast_ok, const void* self, int system) { MiqtVirtualQGraphicsEffect* self_cast = dynamic_cast( (QGraphicsEffect*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -622,7 +622,7 @@ QRectF* QGraphicsEffect_protectedbase_sourceBoundingRect1(bool* _dynamic_cast_ok } -QPixmap* QGraphicsEffect_protectedbase_sourcePixmap1(bool* _dynamic_cast_ok, const void* self, int system) { +QPixmap* QGraphicsEffect_protectedbase_sourcePixmapWithSystem(bool* _dynamic_cast_ok, const void* self, int system) { MiqtVirtualQGraphicsEffect* self_cast = dynamic_cast( (QGraphicsEffect*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/gen_qgraphicseffect.go b/qt6/gen_qgraphicseffect.go index a6c1553a..ad82b6e2 100644 --- a/qt6/gen_qgraphicseffect.go +++ b/qt6/gen_qgraphicseffect.go @@ -242,11 +242,11 @@ func (this *QGraphicsEffect) SourcePixmap() QPixmap { } -// SourceBoundingRect1 can only be called from a QGraphicsEffect that was directly constructed. -func (this *QGraphicsEffect) SourceBoundingRect1(system CoordinateSystem) QRectF { +// SourceBoundingRectWithSystem can only be called from a QGraphicsEffect that was directly constructed. +func (this *QGraphicsEffect) SourceBoundingRectWithSystem(system CoordinateSystem) QRectF { var _dynamic_cast_ok C.bool = false - _goptr := newQRectF(C.QGraphicsEffect_protectedbase_sourceBoundingRect1(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.int)(system))) + _goptr := newQRectF(C.QGraphicsEffect_protectedbase_sourceBoundingRectWithSystem(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.int)(system))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer _method_ret := *_goptr @@ -258,11 +258,11 @@ func (this *QGraphicsEffect) SourceBoundingRect1(system CoordinateSystem) QRectF } -// SourcePixmap1 can only be called from a QGraphicsEffect that was directly constructed. -func (this *QGraphicsEffect) SourcePixmap1(system CoordinateSystem) QPixmap { +// SourcePixmapWithSystem can only be called from a QGraphicsEffect that was directly constructed. +func (this *QGraphicsEffect) SourcePixmapWithSystem(system CoordinateSystem) QPixmap { var _dynamic_cast_ok C.bool = false - _goptr := newQPixmap(C.QGraphicsEffect_protectedbase_sourcePixmap1(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.int)(system))) + _goptr := newQPixmap(C.QGraphicsEffect_protectedbase_sourcePixmapWithSystem(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.int)(system))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer _method_ret := *_goptr diff --git a/qt6/gen_qgraphicseffect.h b/qt6/gen_qgraphicseffect.h index 7f803901..abb7e8a5 100644 --- a/qt6/gen_qgraphicseffect.h +++ b/qt6/gen_qgraphicseffect.h @@ -96,8 +96,8 @@ bool QGraphicsEffect_protectedbase_sourceIsPixmap(bool* _dynamic_cast_ok, const QRectF* QGraphicsEffect_protectedbase_sourceBoundingRect(bool* _dynamic_cast_ok, const void* self); void QGraphicsEffect_protectedbase_drawSource(bool* _dynamic_cast_ok, void* self, QPainter* painter); QPixmap* QGraphicsEffect_protectedbase_sourcePixmap(bool* _dynamic_cast_ok, const void* self); -QRectF* QGraphicsEffect_protectedbase_sourceBoundingRect1(bool* _dynamic_cast_ok, const void* self, int system); -QPixmap* QGraphicsEffect_protectedbase_sourcePixmap1(bool* _dynamic_cast_ok, const void* self, int system); +QRectF* QGraphicsEffect_protectedbase_sourceBoundingRectWithSystem(bool* _dynamic_cast_ok, const void* self, int system); +QPixmap* QGraphicsEffect_protectedbase_sourcePixmapWithSystem(bool* _dynamic_cast_ok, const void* self, int system); QPixmap* QGraphicsEffect_protectedbase_sourcePixmap2(bool* _dynamic_cast_ok, const void* self, int system, QPoint* offset); QPixmap* QGraphicsEffect_protectedbase_sourcePixmap3(bool* _dynamic_cast_ok, const void* self, int system, QPoint* offset, int mode); QObject* QGraphicsEffect_protectedbase_sender(bool* _dynamic_cast_ok, const void* self); diff --git a/qt6/gen_qgraphicsgridlayout.cpp b/qt6/gen_qgraphicsgridlayout.cpp index 9abc6dd3..de4c0eed 100644 --- a/qt6/gen_qgraphicsgridlayout.cpp +++ b/qt6/gen_qgraphicsgridlayout.cpp @@ -440,7 +440,7 @@ QSizeF* QGraphicsGridLayout_sizeHint(const QGraphicsGridLayout* self, int which, return new QSizeF(self->sizeHint(static_cast(which), *constraint)); } -void QGraphicsGridLayout_addItem6(QGraphicsGridLayout* self, QGraphicsLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int alignment) { +void QGraphicsGridLayout_addItem3(QGraphicsGridLayout* self, QGraphicsLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int alignment) { self->addItem(item, static_cast(row), static_cast(column), static_cast(rowSpan), static_cast(columnSpan), static_cast(alignment)); } diff --git a/qt6/gen_qgraphicsgridlayout.go b/qt6/gen_qgraphicsgridlayout.go index 829657e5..df024280 100644 --- a/qt6/gen_qgraphicsgridlayout.go +++ b/qt6/gen_qgraphicsgridlayout.go @@ -244,8 +244,8 @@ func (this *QGraphicsGridLayout) SizeHint(which SizeHint, constraint *QSizeF) *Q return _goptr } -func (this *QGraphicsGridLayout) AddItem6(item *QGraphicsLayoutItem, row int, column int, rowSpan int, columnSpan int, alignment AlignmentFlag) { - C.QGraphicsGridLayout_addItem6(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(alignment)) +func (this *QGraphicsGridLayout) AddItem3(item *QGraphicsLayoutItem, row int, column int, rowSpan int, columnSpan int, alignment AlignmentFlag) { + C.QGraphicsGridLayout_addItem3(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(alignment)) } func (this *QGraphicsGridLayout) AddItem4(item *QGraphicsLayoutItem, row int, column int, alignment AlignmentFlag) { diff --git a/qt6/gen_qgraphicsgridlayout.h b/qt6/gen_qgraphicsgridlayout.h index 20a1753e..b47a8499 100644 --- a/qt6/gen_qgraphicsgridlayout.h +++ b/qt6/gen_qgraphicsgridlayout.h @@ -80,7 +80,7 @@ void QGraphicsGridLayout_removeItem(QGraphicsGridLayout* self, QGraphicsLayoutIt void QGraphicsGridLayout_invalidate(QGraphicsGridLayout* self); void QGraphicsGridLayout_setGeometry(QGraphicsGridLayout* self, QRectF* rect); QSizeF* QGraphicsGridLayout_sizeHint(const QGraphicsGridLayout* self, int which, QSizeF* constraint); -void QGraphicsGridLayout_addItem6(QGraphicsGridLayout* self, QGraphicsLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int alignment); +void QGraphicsGridLayout_addItem3(QGraphicsGridLayout* self, QGraphicsLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int alignment); void QGraphicsGridLayout_addItem4(QGraphicsGridLayout* self, QGraphicsLayoutItem* item, int row, int column, int alignment); bool QGraphicsGridLayout_override_virtual_count(void* self, intptr_t slot); int QGraphicsGridLayout_virtualbase_count(const void* self); diff --git a/qt6/gen_qgraphicsitem.cpp b/qt6/gen_qgraphicsitem.cpp index 13fac2df..8bfb7663 100644 --- a/qt6/gen_qgraphicsitem.cpp +++ b/qt6/gen_qgraphicsitem.cpp @@ -1904,19 +1904,19 @@ void QGraphicsItem_setCacheMode2(QGraphicsItem* self, int mode, QSize* cacheSize self->setCacheMode(static_cast(mode), *cacheSize); } -void QGraphicsItem_setFocus1(QGraphicsItem* self, int focusReason) { +void QGraphicsItem_setFocusWithFocusReason(QGraphicsItem* self, int focusReason) { self->setFocus(static_cast(focusReason)); } -void QGraphicsItem_ensureVisible1(QGraphicsItem* self, QRectF* rect) { +void QGraphicsItem_ensureVisibleWithRect(QGraphicsItem* self, QRectF* rect) { self->ensureVisible(*rect); } -void QGraphicsItem_ensureVisible22(QGraphicsItem* self, QRectF* rect, int xmargin) { +void QGraphicsItem_ensureVisible3(QGraphicsItem* self, QRectF* rect, int xmargin) { self->ensureVisible(*rect, static_cast(xmargin)); } -void QGraphicsItem_ensureVisible3(QGraphicsItem* self, QRectF* rect, int xmargin, int ymargin) { +void QGraphicsItem_ensureVisible4(QGraphicsItem* self, QRectF* rect, int xmargin, int ymargin) { self->ensureVisible(*rect, static_cast(xmargin), static_cast(ymargin)); } @@ -1936,7 +1936,7 @@ void QGraphicsItem_setTransform2(QGraphicsItem* self, QTransform* matrix, bool c self->setTransform(*matrix, combine); } -struct miqt_array /* of QGraphicsItem* */ QGraphicsItem_collidingItems1(const QGraphicsItem* self, int mode) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsItem_collidingItemsWithMode(const QGraphicsItem* self, int mode) { QList _ret = self->collidingItems(static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1949,15 +1949,15 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsItem_collidingItems1(const Q return _out; } -bool QGraphicsItem_isObscured1(const QGraphicsItem* self, QRectF* rect) { +bool QGraphicsItem_isObscuredWithRect(const QGraphicsItem* self, QRectF* rect) { return self->isObscured(*rect); } -void QGraphicsItem_update1(QGraphicsItem* self, QRectF* rect) { +void QGraphicsItem_updateWithRect(QGraphicsItem* self, QRectF* rect) { self->update(*rect); } -void QGraphicsItem_scroll3(QGraphicsItem* self, double dx, double dy, QRectF* rect) { +void QGraphicsItem_scroll2(QGraphicsItem* self, double dx, double dy, QRectF* rect) { self->scroll(static_cast(dx), static_cast(dy), *rect); } diff --git a/qt6/gen_qgraphicsitem.go b/qt6/gen_qgraphicsitem.go index 4dd7057b..3fcdb173 100644 --- a/qt6/gen_qgraphicsitem.go +++ b/qt6/gen_qgraphicsitem.go @@ -983,20 +983,20 @@ func (this *QGraphicsItem) SetCacheMode2(mode QGraphicsItem__CacheMode, cacheSiz C.QGraphicsItem_setCacheMode2(this.h, (C.int)(mode), cacheSize.cPointer()) } -func (this *QGraphicsItem) SetFocus1(focusReason FocusReason) { - C.QGraphicsItem_setFocus1(this.h, (C.int)(focusReason)) +func (this *QGraphicsItem) SetFocusWithFocusReason(focusReason FocusReason) { + C.QGraphicsItem_setFocusWithFocusReason(this.h, (C.int)(focusReason)) } -func (this *QGraphicsItem) EnsureVisible1(rect *QRectF) { - C.QGraphicsItem_ensureVisible1(this.h, rect.cPointer()) +func (this *QGraphicsItem) EnsureVisibleWithRect(rect *QRectF) { + C.QGraphicsItem_ensureVisibleWithRect(this.h, rect.cPointer()) } -func (this *QGraphicsItem) EnsureVisible22(rect *QRectF, xmargin int) { - C.QGraphicsItem_ensureVisible22(this.h, rect.cPointer(), (C.int)(xmargin)) +func (this *QGraphicsItem) EnsureVisible3(rect *QRectF, xmargin int) { + C.QGraphicsItem_ensureVisible3(this.h, rect.cPointer(), (C.int)(xmargin)) } -func (this *QGraphicsItem) EnsureVisible3(rect *QRectF, xmargin int, ymargin int) { - C.QGraphicsItem_ensureVisible3(this.h, rect.cPointer(), (C.int)(xmargin), (C.int)(ymargin)) +func (this *QGraphicsItem) EnsureVisible4(rect *QRectF, xmargin int, ymargin int) { + C.QGraphicsItem_ensureVisible4(this.h, rect.cPointer(), (C.int)(xmargin), (C.int)(ymargin)) } func (this *QGraphicsItem) EnsureVisible5(x float64, y float64, w float64, h float64, xmargin int) { @@ -1017,8 +1017,8 @@ func (this *QGraphicsItem) SetTransform2(matrix *QTransform, combine bool) { C.QGraphicsItem_setTransform2(this.h, matrix.cPointer(), (C.bool)(combine)) } -func (this *QGraphicsItem) CollidingItems1(mode ItemSelectionMode) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsItem_collidingItems1(this.h, (C.int)(mode)) +func (this *QGraphicsItem) CollidingItemsWithMode(mode ItemSelectionMode) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsItem_collidingItemsWithMode(this.h, (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1027,16 +1027,16 @@ func (this *QGraphicsItem) CollidingItems1(mode ItemSelectionMode) []*QGraphicsI return _ret } -func (this *QGraphicsItem) IsObscured1(rect *QRectF) bool { - return (bool)(C.QGraphicsItem_isObscured1(this.h, rect.cPointer())) +func (this *QGraphicsItem) IsObscuredWithRect(rect *QRectF) bool { + return (bool)(C.QGraphicsItem_isObscuredWithRect(this.h, rect.cPointer())) } -func (this *QGraphicsItem) Update1(rect *QRectF) { - C.QGraphicsItem_update1(this.h, rect.cPointer()) +func (this *QGraphicsItem) UpdateWithRect(rect *QRectF) { + C.QGraphicsItem_updateWithRect(this.h, rect.cPointer()) } -func (this *QGraphicsItem) Scroll3(dx float64, dy float64, rect *QRectF) { - C.QGraphicsItem_scroll3(this.h, (C.double)(dx), (C.double)(dy), rect.cPointer()) +func (this *QGraphicsItem) Scroll2(dx float64, dy float64, rect *QRectF) { + C.QGraphicsItem_scroll2(this.h, (C.double)(dx), (C.double)(dy), rect.cPointer()) } // UpdateMicroFocus can only be called from a QGraphicsItem that was directly constructed. diff --git a/qt6/gen_qgraphicsitem.h b/qt6/gen_qgraphicsitem.h index 6d3464cb..6100d493 100644 --- a/qt6/gen_qgraphicsitem.h +++ b/qt6/gen_qgraphicsitem.h @@ -306,18 +306,18 @@ void QGraphicsItem_setExtension(QGraphicsItem* self, int extension, QVariant* va QVariant* QGraphicsItem_extension(const QGraphicsItem* self, QVariant* variant); void QGraphicsItem_setFlag2(QGraphicsItem* self, int flag, bool enabled); void QGraphicsItem_setCacheMode2(QGraphicsItem* self, int mode, QSize* cacheSize); -void QGraphicsItem_setFocus1(QGraphicsItem* self, int focusReason); -void QGraphicsItem_ensureVisible1(QGraphicsItem* self, QRectF* rect); -void QGraphicsItem_ensureVisible22(QGraphicsItem* self, QRectF* rect, int xmargin); -void QGraphicsItem_ensureVisible3(QGraphicsItem* self, QRectF* rect, int xmargin, int ymargin); +void QGraphicsItem_setFocusWithFocusReason(QGraphicsItem* self, int focusReason); +void QGraphicsItem_ensureVisibleWithRect(QGraphicsItem* self, QRectF* rect); +void QGraphicsItem_ensureVisible3(QGraphicsItem* self, QRectF* rect, int xmargin); +void QGraphicsItem_ensureVisible4(QGraphicsItem* self, QRectF* rect, int xmargin, int ymargin); void QGraphicsItem_ensureVisible5(QGraphicsItem* self, double x, double y, double w, double h, int xmargin); void QGraphicsItem_ensureVisible6(QGraphicsItem* self, double x, double y, double w, double h, int xmargin, int ymargin); QTransform* QGraphicsItem_itemTransform2(const QGraphicsItem* self, QGraphicsItem* other, bool* ok); void QGraphicsItem_setTransform2(QGraphicsItem* self, QTransform* matrix, bool combine); -struct miqt_array /* of QGraphicsItem* */ QGraphicsItem_collidingItems1(const QGraphicsItem* self, int mode); -bool QGraphicsItem_isObscured1(const QGraphicsItem* self, QRectF* rect); -void QGraphicsItem_update1(QGraphicsItem* self, QRectF* rect); -void QGraphicsItem_scroll3(QGraphicsItem* self, double dx, double dy, QRectF* rect); +struct miqt_array /* of QGraphicsItem* */ QGraphicsItem_collidingItemsWithMode(const QGraphicsItem* self, int mode); +bool QGraphicsItem_isObscuredWithRect(const QGraphicsItem* self, QRectF* rect); +void QGraphicsItem_updateWithRect(QGraphicsItem* self, QRectF* rect); +void QGraphicsItem_scroll2(QGraphicsItem* self, double dx, double dy, QRectF* rect); bool QGraphicsItem_override_virtual_advance(void* self, intptr_t slot); void QGraphicsItem_virtualbase_advance(void* self, int phase); bool QGraphicsItem_override_virtual_boundingRect(void* self, intptr_t slot); diff --git a/qt6/gen_qgraphicslinearlayout.cpp b/qt6/gen_qgraphicslinearlayout.cpp index ae307baa..95b79f42 100644 --- a/qt6/gen_qgraphicslinearlayout.cpp +++ b/qt6/gen_qgraphicslinearlayout.cpp @@ -349,7 +349,7 @@ void QGraphicsLinearLayout_dump(const QGraphicsLinearLayout* self) { self->dump(); } -void QGraphicsLinearLayout_addStretch1(QGraphicsLinearLayout* self, int stretch) { +void QGraphicsLinearLayout_addStretchWithStretch(QGraphicsLinearLayout* self, int stretch) { self->addStretch(static_cast(stretch)); } @@ -357,7 +357,7 @@ void QGraphicsLinearLayout_insertStretch2(QGraphicsLinearLayout* self, int index self->insertStretch(static_cast(index), static_cast(stretch)); } -void QGraphicsLinearLayout_dump1(const QGraphicsLinearLayout* self, int indent) { +void QGraphicsLinearLayout_dumpWithIndent(const QGraphicsLinearLayout* self, int indent) { self->dump(static_cast(indent)); } diff --git a/qt6/gen_qgraphicslinearlayout.go b/qt6/gen_qgraphicslinearlayout.go index 7c49f453..202c5ffb 100644 --- a/qt6/gen_qgraphicslinearlayout.go +++ b/qt6/gen_qgraphicslinearlayout.go @@ -164,16 +164,16 @@ func (this *QGraphicsLinearLayout) Dump() { C.QGraphicsLinearLayout_dump(this.h) } -func (this *QGraphicsLinearLayout) AddStretch1(stretch int) { - C.QGraphicsLinearLayout_addStretch1(this.h, (C.int)(stretch)) +func (this *QGraphicsLinearLayout) AddStretchWithStretch(stretch int) { + C.QGraphicsLinearLayout_addStretchWithStretch(this.h, (C.int)(stretch)) } func (this *QGraphicsLinearLayout) InsertStretch2(index int, stretch int) { C.QGraphicsLinearLayout_insertStretch2(this.h, (C.int)(index), (C.int)(stretch)) } -func (this *QGraphicsLinearLayout) Dump1(indent int) { - C.QGraphicsLinearLayout_dump1(this.h, (C.int)(indent)) +func (this *QGraphicsLinearLayout) DumpWithIndent(indent int) { + C.QGraphicsLinearLayout_dumpWithIndent(this.h, (C.int)(indent)) } // AddChildLayoutItem can only be called from a QGraphicsLinearLayout that was directly constructed. diff --git a/qt6/gen_qgraphicslinearlayout.h b/qt6/gen_qgraphicslinearlayout.h index 4ff88e4d..7be07454 100644 --- a/qt6/gen_qgraphicslinearlayout.h +++ b/qt6/gen_qgraphicslinearlayout.h @@ -59,9 +59,9 @@ QGraphicsLayoutItem* QGraphicsLinearLayout_itemAt(const QGraphicsLinearLayout* s void QGraphicsLinearLayout_invalidate(QGraphicsLinearLayout* self); QSizeF* QGraphicsLinearLayout_sizeHint(const QGraphicsLinearLayout* self, int which, QSizeF* constraint); void QGraphicsLinearLayout_dump(const QGraphicsLinearLayout* self); -void QGraphicsLinearLayout_addStretch1(QGraphicsLinearLayout* self, int stretch); +void QGraphicsLinearLayout_addStretchWithStretch(QGraphicsLinearLayout* self, int stretch); void QGraphicsLinearLayout_insertStretch2(QGraphicsLinearLayout* self, int index, int stretch); -void QGraphicsLinearLayout_dump1(const QGraphicsLinearLayout* self, int indent); +void QGraphicsLinearLayout_dumpWithIndent(const QGraphicsLinearLayout* self, int indent); bool QGraphicsLinearLayout_override_virtual_removeAt(void* self, intptr_t slot); void QGraphicsLinearLayout_virtualbase_removeAt(void* self, int index); bool QGraphicsLinearLayout_override_virtual_setGeometry(void* self, intptr_t slot); diff --git a/qt6/gen_qgraphicsscene.cpp b/qt6/gen_qgraphicsscene.cpp index 3b50052e..673a077a 100644 --- a/qt6/gen_qgraphicsscene.cpp +++ b/qt6/gen_qgraphicsscene.cpp @@ -1153,7 +1153,7 @@ void QGraphicsScene_render4(QGraphicsScene* self, QPainter* painter, QRectF* tar self->render(painter, *target, *source, static_cast(aspectRatioMode)); } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items1(const QGraphicsScene* self, int order) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_itemsWithOrder(const QGraphicsScene* self, int order) { QList _ret = self->items(static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1166,7 +1166,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items1(const QGraphics return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items22(const QGraphicsScene* self, QPointF* pos, int mode) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items3(const QGraphicsScene* self, QPointF* pos, int mode) { QList _ret = self->items(*pos, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1179,7 +1179,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items22(const QGraphic return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items3(const QGraphicsScene* self, QPointF* pos, int mode, int order) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items4(const QGraphicsScene* self, QPointF* pos, int mode, int order) { QList _ret = self->items(*pos, static_cast(mode), static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1192,7 +1192,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items3(const QGraphics return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items4(const QGraphicsScene* self, QPointF* pos, int mode, int order, QTransform* deviceTransform) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items5(const QGraphicsScene* self, QPointF* pos, int mode, int order, QTransform* deviceTransform) { QList _ret = self->items(*pos, static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1205,7 +1205,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items4(const QGraphics return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items23(const QGraphicsScene* self, QRectF* rect, int mode) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items6(const QGraphicsScene* self, QRectF* rect, int mode) { QList _ret = self->items(*rect, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1218,7 +1218,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items23(const QGraphic return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items32(const QGraphicsScene* self, QRectF* rect, int mode, int order) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items7(const QGraphicsScene* self, QRectF* rect, int mode, int order) { QList _ret = self->items(*rect, static_cast(mode), static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1231,7 +1231,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items32(const QGraphic return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items42(const QGraphicsScene* self, QRectF* rect, int mode, int order, QTransform* deviceTransform) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items8(const QGraphicsScene* self, QRectF* rect, int mode, int order, QTransform* deviceTransform) { QList _ret = self->items(*rect, static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1244,7 +1244,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items42(const QGraphic return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items25(const QGraphicsScene* self, QPainterPath* path, int mode) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items12(const QGraphicsScene* self, QPainterPath* path, int mode) { QList _ret = self->items(*path, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1257,7 +1257,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items25(const QGraphic return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items34(const QGraphicsScene* self, QPainterPath* path, int mode, int order) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items13(const QGraphicsScene* self, QPainterPath* path, int mode, int order) { QList _ret = self->items(*path, static_cast(mode), static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1270,7 +1270,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items34(const QGraphic return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items44(const QGraphicsScene* self, QPainterPath* path, int mode, int order, QTransform* deviceTransform) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items14(const QGraphicsScene* self, QPainterPath* path, int mode, int order, QTransform* deviceTransform) { QList _ret = self->items(*path, static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1283,7 +1283,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items44(const QGraphic return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items7(const QGraphicsScene* self, double x, double y, double w, double h, int mode, int order, QTransform* deviceTransform) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items15(const QGraphicsScene* self, double x, double y, double w, double h, int mode, int order, QTransform* deviceTransform) { QList _ret = self->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1321,15 +1321,15 @@ void QGraphicsScene_setSelectionArea4(QGraphicsScene* self, QPainterPath* path, self->setSelectionArea(*path, static_cast(selectionOperation), static_cast(mode), *deviceTransform); } -QGraphicsEllipseItem* QGraphicsScene_addEllipse22(QGraphicsScene* self, QRectF* rect, QPen* pen) { +QGraphicsEllipseItem* QGraphicsScene_addEllipse3(QGraphicsScene* self, QRectF* rect, QPen* pen) { return self->addEllipse(*rect, *pen); } -QGraphicsEllipseItem* QGraphicsScene_addEllipse3(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush) { +QGraphicsEllipseItem* QGraphicsScene_addEllipse4(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush) { return self->addEllipse(*rect, *pen, *brush); } -QGraphicsLineItem* QGraphicsScene_addLine22(QGraphicsScene* self, QLineF* line, QPen* pen) { +QGraphicsLineItem* QGraphicsScene_addLine3(QGraphicsScene* self, QLineF* line, QPen* pen) { return self->addLine(*line, *pen); } @@ -1341,11 +1341,11 @@ QGraphicsPathItem* QGraphicsScene_addPath3(QGraphicsScene* self, QPainterPath* p return self->addPath(*path, *pen, *brush); } -QGraphicsRectItem* QGraphicsScene_addRect22(QGraphicsScene* self, QRectF* rect, QPen* pen) { +QGraphicsRectItem* QGraphicsScene_addRect3(QGraphicsScene* self, QRectF* rect, QPen* pen) { return self->addRect(*rect, *pen); } -QGraphicsRectItem* QGraphicsScene_addRect3(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush) { +QGraphicsRectItem* QGraphicsScene_addRect4(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush) { return self->addRect(*rect, *pen, *brush); } @@ -1371,7 +1371,7 @@ QGraphicsEllipseItem* QGraphicsScene_addEllipse6(QGraphicsScene* self, double x, return self->addEllipse(static_cast(x), static_cast(y), static_cast(w), static_cast(h), *pen, *brush); } -QGraphicsLineItem* QGraphicsScene_addLine5(QGraphicsScene* self, double x1, double y1, double x2, double y2, QPen* pen) { +QGraphicsLineItem* QGraphicsScene_addLine4(QGraphicsScene* self, double x1, double y1, double x2, double y2, QPen* pen) { return self->addLine(static_cast(x1), static_cast(y1), static_cast(x2), static_cast(y2), *pen); } @@ -1387,23 +1387,23 @@ void QGraphicsScene_setFocusItem2(QGraphicsScene* self, QGraphicsItem* item, int self->setFocusItem(item, static_cast(focusReason)); } -void QGraphicsScene_setFocus1(QGraphicsScene* self, int focusReason) { +void QGraphicsScene_setFocusWithFocusReason(QGraphicsScene* self, int focusReason) { self->setFocus(static_cast(focusReason)); } -void QGraphicsScene_invalidate5(QGraphicsScene* self, double x, double y, double w, double h, int layers) { +void QGraphicsScene_invalidate3(QGraphicsScene* self, double x, double y, double w, double h, int layers) { self->invalidate(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(layers)); } -void QGraphicsScene_update1(QGraphicsScene* self, QRectF* rect) { +void QGraphicsScene_updateWithRect(QGraphicsScene* self, QRectF* rect) { self->update(*rect); } -void QGraphicsScene_invalidate1(QGraphicsScene* self, QRectF* rect) { +void QGraphicsScene_invalidateWithRect(QGraphicsScene* self, QRectF* rect) { self->invalidate(*rect); } -void QGraphicsScene_invalidate22(QGraphicsScene* self, QRectF* rect, int layers) { +void QGraphicsScene_invalidate4(QGraphicsScene* self, QRectF* rect, int layers) { self->invalidate(*rect, static_cast(layers)); } diff --git a/qt6/gen_qgraphicsscene.go b/qt6/gen_qgraphicsscene.go index cf3a0c98..4ccdc78c 100644 --- a/qt6/gen_qgraphicsscene.go +++ b/qt6/gen_qgraphicsscene.go @@ -628,8 +628,8 @@ func (this *QGraphicsScene) Render4(painter *QPainter, target *QRectF, source *Q C.QGraphicsScene_render4(this.h, painter.cPointer(), target.cPointer(), source.cPointer(), (C.int)(aspectRatioMode)) } -func (this *QGraphicsScene) Items1(order SortOrder) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items1(this.h, (C.int)(order)) +func (this *QGraphicsScene) ItemsWithOrder(order SortOrder) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_itemsWithOrder(this.h, (C.int)(order)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -638,8 +638,8 @@ func (this *QGraphicsScene) Items1(order SortOrder) []*QGraphicsItem { return _ret } -func (this *QGraphicsScene) Items22(pos *QPointF, mode ItemSelectionMode) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items22(this.h, pos.cPointer(), (C.int)(mode)) +func (this *QGraphicsScene) Items3(pos *QPointF, mode ItemSelectionMode) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items3(this.h, pos.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -648,8 +648,8 @@ func (this *QGraphicsScene) Items22(pos *QPointF, mode ItemSelectionMode) []*QGr return _ret } -func (this *QGraphicsScene) Items3(pos *QPointF, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items3(this.h, pos.cPointer(), (C.int)(mode), (C.int)(order)) +func (this *QGraphicsScene) Items4(pos *QPointF, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items4(this.h, pos.cPointer(), (C.int)(mode), (C.int)(order)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -658,8 +658,8 @@ func (this *QGraphicsScene) Items3(pos *QPointF, mode ItemSelectionMode, order S return _ret } -func (this *QGraphicsScene) Items4(pos *QPointF, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items4(this.h, pos.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) +func (this *QGraphicsScene) Items5(pos *QPointF, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items5(this.h, pos.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -668,8 +668,8 @@ func (this *QGraphicsScene) Items4(pos *QPointF, mode ItemSelectionMode, order S return _ret } -func (this *QGraphicsScene) Items23(rect *QRectF, mode ItemSelectionMode) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items23(this.h, rect.cPointer(), (C.int)(mode)) +func (this *QGraphicsScene) Items6(rect *QRectF, mode ItemSelectionMode) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items6(this.h, rect.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -678,8 +678,8 @@ func (this *QGraphicsScene) Items23(rect *QRectF, mode ItemSelectionMode) []*QGr return _ret } -func (this *QGraphicsScene) Items32(rect *QRectF, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items32(this.h, rect.cPointer(), (C.int)(mode), (C.int)(order)) +func (this *QGraphicsScene) Items7(rect *QRectF, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items7(this.h, rect.cPointer(), (C.int)(mode), (C.int)(order)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -688,8 +688,8 @@ func (this *QGraphicsScene) Items32(rect *QRectF, mode ItemSelectionMode, order return _ret } -func (this *QGraphicsScene) Items42(rect *QRectF, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items42(this.h, rect.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) +func (this *QGraphicsScene) Items8(rect *QRectF, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items8(this.h, rect.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -698,8 +698,8 @@ func (this *QGraphicsScene) Items42(rect *QRectF, mode ItemSelectionMode, order return _ret } -func (this *QGraphicsScene) Items25(path *QPainterPath, mode ItemSelectionMode) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items25(this.h, path.cPointer(), (C.int)(mode)) +func (this *QGraphicsScene) Items12(path *QPainterPath, mode ItemSelectionMode) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items12(this.h, path.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -708,8 +708,8 @@ func (this *QGraphicsScene) Items25(path *QPainterPath, mode ItemSelectionMode) return _ret } -func (this *QGraphicsScene) Items34(path *QPainterPath, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items34(this.h, path.cPointer(), (C.int)(mode), (C.int)(order)) +func (this *QGraphicsScene) Items13(path *QPainterPath, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items13(this.h, path.cPointer(), (C.int)(mode), (C.int)(order)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -718,8 +718,8 @@ func (this *QGraphicsScene) Items34(path *QPainterPath, mode ItemSelectionMode, return _ret } -func (this *QGraphicsScene) Items44(path *QPainterPath, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items44(this.h, path.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) +func (this *QGraphicsScene) Items14(path *QPainterPath, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items14(this.h, path.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -728,8 +728,8 @@ func (this *QGraphicsScene) Items44(path *QPainterPath, mode ItemSelectionMode, return _ret } -func (this *QGraphicsScene) Items7(x float64, y float64, w float64, h float64, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsScene_items7(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) +func (this *QGraphicsScene) Items15(x float64, y float64, w float64, h float64, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsScene_items15(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -760,16 +760,16 @@ func (this *QGraphicsScene) SetSelectionArea4(path *QPainterPath, selectionOpera C.QGraphicsScene_setSelectionArea4(this.h, path.cPointer(), (C.int)(selectionOperation), (C.int)(mode), deviceTransform.cPointer()) } -func (this *QGraphicsScene) AddEllipse22(rect *QRectF, pen *QPen) *QGraphicsEllipseItem { - return newQGraphicsEllipseItem(C.QGraphicsScene_addEllipse22(this.h, rect.cPointer(), pen.cPointer())) +func (this *QGraphicsScene) AddEllipse3(rect *QRectF, pen *QPen) *QGraphicsEllipseItem { + return newQGraphicsEllipseItem(C.QGraphicsScene_addEllipse3(this.h, rect.cPointer(), pen.cPointer())) } -func (this *QGraphicsScene) AddEllipse3(rect *QRectF, pen *QPen, brush *QBrush) *QGraphicsEllipseItem { - return newQGraphicsEllipseItem(C.QGraphicsScene_addEllipse3(this.h, rect.cPointer(), pen.cPointer(), brush.cPointer())) +func (this *QGraphicsScene) AddEllipse4(rect *QRectF, pen *QPen, brush *QBrush) *QGraphicsEllipseItem { + return newQGraphicsEllipseItem(C.QGraphicsScene_addEllipse4(this.h, rect.cPointer(), pen.cPointer(), brush.cPointer())) } -func (this *QGraphicsScene) AddLine22(line *QLineF, pen *QPen) *QGraphicsLineItem { - return newQGraphicsLineItem(C.QGraphicsScene_addLine22(this.h, line.cPointer(), pen.cPointer())) +func (this *QGraphicsScene) AddLine3(line *QLineF, pen *QPen) *QGraphicsLineItem { + return newQGraphicsLineItem(C.QGraphicsScene_addLine3(this.h, line.cPointer(), pen.cPointer())) } func (this *QGraphicsScene) AddPath2(path *QPainterPath, pen *QPen) *QGraphicsPathItem { @@ -780,12 +780,12 @@ func (this *QGraphicsScene) AddPath3(path *QPainterPath, pen *QPen, brush *QBrus return newQGraphicsPathItem(C.QGraphicsScene_addPath3(this.h, path.cPointer(), pen.cPointer(), brush.cPointer())) } -func (this *QGraphicsScene) AddRect22(rect *QRectF, pen *QPen) *QGraphicsRectItem { - return newQGraphicsRectItem(C.QGraphicsScene_addRect22(this.h, rect.cPointer(), pen.cPointer())) +func (this *QGraphicsScene) AddRect3(rect *QRectF, pen *QPen) *QGraphicsRectItem { + return newQGraphicsRectItem(C.QGraphicsScene_addRect3(this.h, rect.cPointer(), pen.cPointer())) } -func (this *QGraphicsScene) AddRect3(rect *QRectF, pen *QPen, brush *QBrush) *QGraphicsRectItem { - return newQGraphicsRectItem(C.QGraphicsScene_addRect3(this.h, rect.cPointer(), pen.cPointer(), brush.cPointer())) +func (this *QGraphicsScene) AddRect4(rect *QRectF, pen *QPen, brush *QBrush) *QGraphicsRectItem { + return newQGraphicsRectItem(C.QGraphicsScene_addRect4(this.h, rect.cPointer(), pen.cPointer(), brush.cPointer())) } func (this *QGraphicsScene) AddText2(text string, font *QFont) *QGraphicsTextItem { @@ -816,8 +816,8 @@ func (this *QGraphicsScene) AddEllipse6(x float64, y float64, w float64, h float return newQGraphicsEllipseItem(C.QGraphicsScene_addEllipse6(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), pen.cPointer(), brush.cPointer())) } -func (this *QGraphicsScene) AddLine5(x1 float64, y1 float64, x2 float64, y2 float64, pen *QPen) *QGraphicsLineItem { - return newQGraphicsLineItem(C.QGraphicsScene_addLine5(this.h, (C.double)(x1), (C.double)(y1), (C.double)(x2), (C.double)(y2), pen.cPointer())) +func (this *QGraphicsScene) AddLine4(x1 float64, y1 float64, x2 float64, y2 float64, pen *QPen) *QGraphicsLineItem { + return newQGraphicsLineItem(C.QGraphicsScene_addLine4(this.h, (C.double)(x1), (C.double)(y1), (C.double)(x2), (C.double)(y2), pen.cPointer())) } func (this *QGraphicsScene) AddRect5(x float64, y float64, w float64, h float64, pen *QPen) *QGraphicsRectItem { @@ -832,24 +832,24 @@ func (this *QGraphicsScene) SetFocusItem2(item *QGraphicsItem, focusReason Focus C.QGraphicsScene_setFocusItem2(this.h, item.cPointer(), (C.int)(focusReason)) } -func (this *QGraphicsScene) SetFocus1(focusReason FocusReason) { - C.QGraphicsScene_setFocus1(this.h, (C.int)(focusReason)) +func (this *QGraphicsScene) SetFocusWithFocusReason(focusReason FocusReason) { + C.QGraphicsScene_setFocusWithFocusReason(this.h, (C.int)(focusReason)) } -func (this *QGraphicsScene) Invalidate5(x float64, y float64, w float64, h float64, layers QGraphicsScene__SceneLayer) { - C.QGraphicsScene_invalidate5(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(layers)) +func (this *QGraphicsScene) Invalidate3(x float64, y float64, w float64, h float64, layers QGraphicsScene__SceneLayer) { + C.QGraphicsScene_invalidate3(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(layers)) } -func (this *QGraphicsScene) Update1(rect *QRectF) { - C.QGraphicsScene_update1(this.h, rect.cPointer()) +func (this *QGraphicsScene) UpdateWithRect(rect *QRectF) { + C.QGraphicsScene_updateWithRect(this.h, rect.cPointer()) } -func (this *QGraphicsScene) Invalidate1(rect *QRectF) { - C.QGraphicsScene_invalidate1(this.h, rect.cPointer()) +func (this *QGraphicsScene) InvalidateWithRect(rect *QRectF) { + C.QGraphicsScene_invalidateWithRect(this.h, rect.cPointer()) } -func (this *QGraphicsScene) Invalidate22(rect *QRectF, layers QGraphicsScene__SceneLayer) { - C.QGraphicsScene_invalidate22(this.h, rect.cPointer(), (C.int)(layers)) +func (this *QGraphicsScene) Invalidate4(rect *QRectF, layers QGraphicsScene__SceneLayer) { + C.QGraphicsScene_invalidate4(this.h, rect.cPointer(), (C.int)(layers)) } // Sender can only be called from a QGraphicsScene that was directly constructed. diff --git a/qt6/gen_qgraphicsscene.h b/qt6/gen_qgraphicsscene.h index ea385f1e..59105663 100644 --- a/qt6/gen_qgraphicsscene.h +++ b/qt6/gen_qgraphicsscene.h @@ -219,42 +219,42 @@ struct miqt_string QGraphicsScene_tr3(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); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items1(const QGraphicsScene* self, int order); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items22(const QGraphicsScene* self, QPointF* pos, int mode); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items3(const QGraphicsScene* self, QPointF* pos, int mode, int order); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items4(const QGraphicsScene* self, QPointF* pos, int mode, int order, QTransform* deviceTransform); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items23(const QGraphicsScene* self, QRectF* rect, int mode); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items32(const QGraphicsScene* self, QRectF* rect, int mode, int order); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items42(const QGraphicsScene* self, QRectF* rect, int mode, int order, QTransform* deviceTransform); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items25(const QGraphicsScene* self, QPainterPath* path, int mode); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items34(const QGraphicsScene* self, QPainterPath* path, int mode, int order); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items44(const QGraphicsScene* self, QPainterPath* path, int mode, int order, QTransform* deviceTransform); -struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items7(const QGraphicsScene* self, double x, double y, double w, double h, int mode, int order, QTransform* deviceTransform); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_itemsWithOrder(const QGraphicsScene* self, int order); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items3(const QGraphicsScene* self, QPointF* pos, int mode); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items4(const QGraphicsScene* self, QPointF* pos, int mode, int order); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items5(const QGraphicsScene* self, QPointF* pos, int mode, int order, QTransform* deviceTransform); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items6(const QGraphicsScene* self, QRectF* rect, int mode); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items7(const QGraphicsScene* self, QRectF* rect, int mode, int order); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items8(const QGraphicsScene* self, QRectF* rect, int mode, int order, QTransform* deviceTransform); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items12(const QGraphicsScene* self, QPainterPath* path, int mode); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items13(const QGraphicsScene* self, QPainterPath* path, int mode, int order); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items14(const QGraphicsScene* self, QPainterPath* path, int mode, int order, QTransform* deviceTransform); +struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_items15(const QGraphicsScene* self, double x, double y, double w, double h, int mode, int order, QTransform* deviceTransform); struct miqt_array /* of QGraphicsItem* */ QGraphicsScene_collidingItems2(const QGraphicsScene* self, QGraphicsItem* item, int mode); void QGraphicsScene_setSelectionArea2(QGraphicsScene* self, QPainterPath* path, int selectionOperation); void QGraphicsScene_setSelectionArea3(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode); void QGraphicsScene_setSelectionArea4(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode, QTransform* deviceTransform); -QGraphicsEllipseItem* QGraphicsScene_addEllipse22(QGraphicsScene* self, QRectF* rect, QPen* pen); -QGraphicsEllipseItem* QGraphicsScene_addEllipse3(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush); -QGraphicsLineItem* QGraphicsScene_addLine22(QGraphicsScene* self, QLineF* line, QPen* pen); +QGraphicsEllipseItem* QGraphicsScene_addEllipse3(QGraphicsScene* self, QRectF* rect, QPen* pen); +QGraphicsEllipseItem* QGraphicsScene_addEllipse4(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush); +QGraphicsLineItem* QGraphicsScene_addLine3(QGraphicsScene* self, QLineF* line, QPen* pen); QGraphicsPathItem* QGraphicsScene_addPath2(QGraphicsScene* self, QPainterPath* path, QPen* pen); 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); +QGraphicsRectItem* QGraphicsScene_addRect3(QGraphicsScene* self, QRectF* rect, QPen* pen); +QGraphicsRectItem* QGraphicsScene_addRect4(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); 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); -QGraphicsLineItem* QGraphicsScene_addLine5(QGraphicsScene* self, double x1, double y1, double x2, double y2, QPen* pen); +QGraphicsLineItem* QGraphicsScene_addLine4(QGraphicsScene* self, double x1, double y1, double x2, double y2, QPen* pen); QGraphicsRectItem* QGraphicsScene_addRect5(QGraphicsScene* self, double x, double y, double w, double h, QPen* pen); QGraphicsRectItem* QGraphicsScene_addRect6(QGraphicsScene* self, double x, double y, double w, double h, QPen* pen, QBrush* brush); void QGraphicsScene_setFocusItem2(QGraphicsScene* self, QGraphicsItem* item, int focusReason); -void QGraphicsScene_setFocus1(QGraphicsScene* self, int focusReason); -void QGraphicsScene_invalidate5(QGraphicsScene* self, double x, double y, double w, double h, int layers); -void QGraphicsScene_update1(QGraphicsScene* self, QRectF* rect); -void QGraphicsScene_invalidate1(QGraphicsScene* self, QRectF* rect); -void QGraphicsScene_invalidate22(QGraphicsScene* self, QRectF* rect, int layers); +void QGraphicsScene_setFocusWithFocusReason(QGraphicsScene* self, int focusReason); +void QGraphicsScene_invalidate3(QGraphicsScene* self, double x, double y, double w, double h, int layers); +void QGraphicsScene_updateWithRect(QGraphicsScene* self, QRectF* rect); +void QGraphicsScene_invalidateWithRect(QGraphicsScene* self, QRectF* rect); +void QGraphicsScene_invalidate4(QGraphicsScene* self, QRectF* rect, int layers); bool QGraphicsScene_override_virtual_inputMethodQuery(void* self, intptr_t slot); QVariant* QGraphicsScene_virtualbase_inputMethodQuery(const void* self, int query); bool QGraphicsScene_override_virtual_event(void* self, intptr_t slot); diff --git a/qt6/gen_qgraphicsview.cpp b/qt6/gen_qgraphicsview.cpp index 435ebb00..60e453bf 100644 --- a/qt6/gen_qgraphicsview.cpp +++ b/qt6/gen_qgraphicsview.cpp @@ -1603,11 +1603,11 @@ void QGraphicsView_setTransform2(QGraphicsView* self, QTransform* matrix, bool c self->setTransform(*matrix, combine); } -void QGraphicsView_ensureVisible22(QGraphicsView* self, QRectF* rect, int xmargin) { +void QGraphicsView_ensureVisible3(QGraphicsView* self, QRectF* rect, int xmargin) { self->ensureVisible(*rect, static_cast(xmargin)); } -void QGraphicsView_ensureVisible3(QGraphicsView* self, QRectF* rect, int xmargin, int ymargin) { +void QGraphicsView_ensureVisible4(QGraphicsView* self, QRectF* rect, int xmargin, int ymargin) { self->ensureVisible(*rect, static_cast(xmargin), static_cast(ymargin)); } @@ -1619,23 +1619,23 @@ void QGraphicsView_ensureVisible6(QGraphicsView* self, double x, double y, doubl self->ensureVisible(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(xmargin), static_cast(ymargin)); } -void QGraphicsView_ensureVisible23(QGraphicsView* self, QGraphicsItem* item, int xmargin) { +void QGraphicsView_ensureVisible7(QGraphicsView* self, QGraphicsItem* item, int xmargin) { self->ensureVisible(item, static_cast(xmargin)); } -void QGraphicsView_ensureVisible32(QGraphicsView* self, QGraphicsItem* item, int xmargin, int ymargin) { +void QGraphicsView_ensureVisible8(QGraphicsView* self, QGraphicsItem* item, int xmargin, int ymargin) { self->ensureVisible(item, static_cast(xmargin), static_cast(ymargin)); } -void QGraphicsView_fitInView22(QGraphicsView* self, QRectF* rect, int aspectRadioMode) { +void QGraphicsView_fitInView3(QGraphicsView* self, QRectF* rect, int aspectRadioMode) { self->fitInView(*rect, static_cast(aspectRadioMode)); } -void QGraphicsView_fitInView5(QGraphicsView* self, double x, double y, double w, double h, int aspectRadioMode) { +void QGraphicsView_fitInView4(QGraphicsView* self, double x, double y, double w, double h, int aspectRadioMode) { self->fitInView(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(aspectRadioMode)); } -void QGraphicsView_fitInView23(QGraphicsView* self, QGraphicsItem* item, int aspectRadioMode) { +void QGraphicsView_fitInView5(QGraphicsView* self, QGraphicsItem* item, int aspectRadioMode) { self->fitInView(item, static_cast(aspectRadioMode)); } @@ -1651,7 +1651,7 @@ void QGraphicsView_render4(QGraphicsView* self, QPainter* painter, QRectF* targe self->render(painter, *target, *source, static_cast(aspectRatioMode)); } -struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items22(const QGraphicsView* self, QRect* rect, int mode) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items4(const QGraphicsView* self, QRect* rect, int mode) { QList _ret = self->items(*rect, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1677,7 +1677,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items5(const QGraphicsV return _out; } -struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items24(const QGraphicsView* self, QPainterPath* path, int mode) { +struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items7(const QGraphicsView* self, QPainterPath* path, int mode) { QList _ret = self->items(*path, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); @@ -1690,7 +1690,7 @@ struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items24(const QGraphics return _out; } -void QGraphicsView_invalidateScene1(QGraphicsView* self, QRectF* rect) { +void QGraphicsView_invalidateSceneWithRect(QGraphicsView* self, QRectF* rect) { self->invalidateScene(*rect); } diff --git a/qt6/gen_qgraphicsview.go b/qt6/gen_qgraphicsview.go index 8a25dd06..0d207ed6 100644 --- a/qt6/gen_qgraphicsview.go +++ b/qt6/gen_qgraphicsview.go @@ -552,12 +552,12 @@ func (this *QGraphicsView) SetTransform2(matrix *QTransform, combine bool) { C.QGraphicsView_setTransform2(this.h, matrix.cPointer(), (C.bool)(combine)) } -func (this *QGraphicsView) EnsureVisible22(rect *QRectF, xmargin int) { - C.QGraphicsView_ensureVisible22(this.h, rect.cPointer(), (C.int)(xmargin)) +func (this *QGraphicsView) EnsureVisible3(rect *QRectF, xmargin int) { + C.QGraphicsView_ensureVisible3(this.h, rect.cPointer(), (C.int)(xmargin)) } -func (this *QGraphicsView) EnsureVisible3(rect *QRectF, xmargin int, ymargin int) { - C.QGraphicsView_ensureVisible3(this.h, rect.cPointer(), (C.int)(xmargin), (C.int)(ymargin)) +func (this *QGraphicsView) EnsureVisible4(rect *QRectF, xmargin int, ymargin int) { + C.QGraphicsView_ensureVisible4(this.h, rect.cPointer(), (C.int)(xmargin), (C.int)(ymargin)) } func (this *QGraphicsView) EnsureVisible5(x float64, y float64, w float64, h float64, xmargin int) { @@ -568,24 +568,24 @@ func (this *QGraphicsView) EnsureVisible6(x float64, y float64, w float64, h flo C.QGraphicsView_ensureVisible6(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(xmargin), (C.int)(ymargin)) } -func (this *QGraphicsView) EnsureVisible23(item *QGraphicsItem, xmargin int) { - C.QGraphicsView_ensureVisible23(this.h, item.cPointer(), (C.int)(xmargin)) +func (this *QGraphicsView) EnsureVisible7(item *QGraphicsItem, xmargin int) { + C.QGraphicsView_ensureVisible7(this.h, item.cPointer(), (C.int)(xmargin)) } -func (this *QGraphicsView) EnsureVisible32(item *QGraphicsItem, xmargin int, ymargin int) { - C.QGraphicsView_ensureVisible32(this.h, item.cPointer(), (C.int)(xmargin), (C.int)(ymargin)) +func (this *QGraphicsView) EnsureVisible8(item *QGraphicsItem, xmargin int, ymargin int) { + C.QGraphicsView_ensureVisible8(this.h, item.cPointer(), (C.int)(xmargin), (C.int)(ymargin)) } -func (this *QGraphicsView) FitInView22(rect *QRectF, aspectRadioMode AspectRatioMode) { - C.QGraphicsView_fitInView22(this.h, rect.cPointer(), (C.int)(aspectRadioMode)) +func (this *QGraphicsView) FitInView3(rect *QRectF, aspectRadioMode AspectRatioMode) { + C.QGraphicsView_fitInView3(this.h, rect.cPointer(), (C.int)(aspectRadioMode)) } -func (this *QGraphicsView) FitInView5(x float64, y float64, w float64, h float64, aspectRadioMode AspectRatioMode) { - C.QGraphicsView_fitInView5(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(aspectRadioMode)) +func (this *QGraphicsView) FitInView4(x float64, y float64, w float64, h float64, aspectRadioMode AspectRatioMode) { + C.QGraphicsView_fitInView4(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(aspectRadioMode)) } -func (this *QGraphicsView) FitInView23(item *QGraphicsItem, aspectRadioMode AspectRatioMode) { - C.QGraphicsView_fitInView23(this.h, item.cPointer(), (C.int)(aspectRadioMode)) +func (this *QGraphicsView) FitInView5(item *QGraphicsItem, aspectRadioMode AspectRatioMode) { + C.QGraphicsView_fitInView5(this.h, item.cPointer(), (C.int)(aspectRadioMode)) } func (this *QGraphicsView) Render2(painter *QPainter, target *QRectF) { @@ -600,8 +600,8 @@ func (this *QGraphicsView) Render4(painter *QPainter, target *QRectF, source *QR C.QGraphicsView_render4(this.h, painter.cPointer(), target.cPointer(), source.cPointer(), (C.int)(aspectRatioMode)) } -func (this *QGraphicsView) Items22(rect *QRect, mode ItemSelectionMode) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsView_items22(this.h, rect.cPointer(), (C.int)(mode)) +func (this *QGraphicsView) Items4(rect *QRect, mode ItemSelectionMode) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsView_items4(this.h, rect.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -620,8 +620,8 @@ func (this *QGraphicsView) Items5(x int, y int, w int, h int, mode ItemSelection return _ret } -func (this *QGraphicsView) Items24(path *QPainterPath, mode ItemSelectionMode) []*QGraphicsItem { - var _ma C.struct_miqt_array = C.QGraphicsView_items24(this.h, path.cPointer(), (C.int)(mode)) +func (this *QGraphicsView) Items7(path *QPainterPath, mode ItemSelectionMode) []*QGraphicsItem { + var _ma C.struct_miqt_array = C.QGraphicsView_items7(this.h, path.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -630,8 +630,8 @@ func (this *QGraphicsView) Items24(path *QPainterPath, mode ItemSelectionMode) [ return _ret } -func (this *QGraphicsView) InvalidateScene1(rect *QRectF) { - C.QGraphicsView_invalidateScene1(this.h, rect.cPointer()) +func (this *QGraphicsView) InvalidateSceneWithRect(rect *QRectF) { + C.QGraphicsView_invalidateSceneWithRect(this.h, rect.cPointer()) } func (this *QGraphicsView) InvalidateScene2(rect *QRectF, layers QGraphicsScene__SceneLayer) { diff --git a/qt6/gen_qgraphicsview.h b/qt6/gen_qgraphicsview.h index ab9563c6..cfcbddc6 100644 --- a/qt6/gen_qgraphicsview.h +++ b/qt6/gen_qgraphicsview.h @@ -219,22 +219,22 @@ struct miqt_string QGraphicsView_tr3(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_setTransform2(QGraphicsView* self, QTransform* matrix, bool combine); -void QGraphicsView_ensureVisible22(QGraphicsView* self, QRectF* rect, int xmargin); -void QGraphicsView_ensureVisible3(QGraphicsView* self, QRectF* rect, int xmargin, int ymargin); +void QGraphicsView_ensureVisible3(QGraphicsView* self, QRectF* rect, int xmargin); +void QGraphicsView_ensureVisible4(QGraphicsView* self, QRectF* rect, int xmargin, int ymargin); void QGraphicsView_ensureVisible5(QGraphicsView* self, double x, double y, double w, double h, int xmargin); void QGraphicsView_ensureVisible6(QGraphicsView* self, double x, double y, double w, double h, int xmargin, int ymargin); -void QGraphicsView_ensureVisible23(QGraphicsView* self, QGraphicsItem* item, int xmargin); -void QGraphicsView_ensureVisible32(QGraphicsView* self, QGraphicsItem* item, int xmargin, int ymargin); -void QGraphicsView_fitInView22(QGraphicsView* self, QRectF* rect, int aspectRadioMode); -void QGraphicsView_fitInView5(QGraphicsView* self, double x, double y, double w, double h, int aspectRadioMode); -void QGraphicsView_fitInView23(QGraphicsView* self, QGraphicsItem* item, int aspectRadioMode); +void QGraphicsView_ensureVisible7(QGraphicsView* self, QGraphicsItem* item, int xmargin); +void QGraphicsView_ensureVisible8(QGraphicsView* self, QGraphicsItem* item, int xmargin, int ymargin); +void QGraphicsView_fitInView3(QGraphicsView* self, QRectF* rect, int aspectRadioMode); +void QGraphicsView_fitInView4(QGraphicsView* self, double x, double y, double w, double h, int aspectRadioMode); +void QGraphicsView_fitInView5(QGraphicsView* self, QGraphicsItem* item, int aspectRadioMode); void QGraphicsView_render2(QGraphicsView* self, QPainter* painter, QRectF* target); void QGraphicsView_render3(QGraphicsView* self, QPainter* painter, QRectF* target, QRect* source); void QGraphicsView_render4(QGraphicsView* self, QPainter* painter, QRectF* target, QRect* source, int aspectRatioMode); -struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items22(const QGraphicsView* self, QRect* rect, int mode); +struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items4(const QGraphicsView* self, QRect* rect, int mode); struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items5(const QGraphicsView* self, int x, int y, int w, int h, int mode); -struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items24(const QGraphicsView* self, QPainterPath* path, int mode); -void QGraphicsView_invalidateScene1(QGraphicsView* self, QRectF* rect); +struct miqt_array /* of QGraphicsItem* */ QGraphicsView_items7(const QGraphicsView* self, QPainterPath* path, int mode); +void QGraphicsView_invalidateSceneWithRect(QGraphicsView* self, QRectF* rect); void QGraphicsView_invalidateScene2(QGraphicsView* self, QRectF* rect, int layers); bool QGraphicsView_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QGraphicsView_virtualbase_sizeHint(const void* self); diff --git a/qt6/gen_qgridlayout.cpp b/qt6/gen_qgridlayout.cpp index c8fe8eb2..36fae3b4 100644 --- a/qt6/gen_qgridlayout.cpp +++ b/qt6/gen_qgridlayout.cpp @@ -839,27 +839,27 @@ void QGridLayout_addWidget4(QGridLayout* self, QWidget* param1, int row, int col self->addWidget(param1, static_cast(row), static_cast(column), static_cast(param4)); } -void QGridLayout_addWidget6(QGridLayout* self, QWidget* param1, int row, int column, int rowSpan, int columnSpan, int param6) { +void QGridLayout_addWidget5(QGridLayout* self, QWidget* param1, int row, int column, int rowSpan, int columnSpan, int param6) { self->addWidget(param1, static_cast(row), static_cast(column), static_cast(rowSpan), static_cast(columnSpan), static_cast(param6)); } -void QGridLayout_addLayout4(QGridLayout* self, QLayout* param1, int row, int column, int param4) { +void QGridLayout_addLayout3(QGridLayout* self, QLayout* param1, int row, int column, int param4) { self->addLayout(param1, static_cast(row), static_cast(column), static_cast(param4)); } -void QGridLayout_addLayout6(QGridLayout* self, QLayout* param1, int row, int column, int rowSpan, int columnSpan, int param6) { +void QGridLayout_addLayout4(QGridLayout* self, QLayout* param1, int row, int column, int rowSpan, int columnSpan, int param6) { self->addLayout(param1, static_cast(row), static_cast(column), static_cast(rowSpan), static_cast(columnSpan), static_cast(param6)); } -void QGridLayout_addItem4(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan) { +void QGridLayout_addItem2(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan) { self->addItem(item, static_cast(row), static_cast(column), static_cast(rowSpan)); } -void QGridLayout_addItem5(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan) { +void QGridLayout_addItem3(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan) { self->addItem(item, static_cast(row), static_cast(column), static_cast(rowSpan), static_cast(columnSpan)); } -void QGridLayout_addItem6(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int param6) { +void QGridLayout_addItem4(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int param6) { self->addItem(item, static_cast(row), static_cast(column), static_cast(rowSpan), static_cast(columnSpan), static_cast(param6)); } diff --git a/qt6/gen_qgridlayout.go b/qt6/gen_qgridlayout.go index 82be0124..bfa7e1ca 100644 --- a/qt6/gen_qgridlayout.go +++ b/qt6/gen_qgridlayout.go @@ -275,28 +275,28 @@ func (this *QGridLayout) AddWidget4(param1 *QWidget, row int, column int, param4 C.QGridLayout_addWidget4(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(param4)) } -func (this *QGridLayout) AddWidget6(param1 *QWidget, row int, column int, rowSpan int, columnSpan int, param6 AlignmentFlag) { - C.QGridLayout_addWidget6(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) +func (this *QGridLayout) AddWidget5(param1 *QWidget, row int, column int, rowSpan int, columnSpan int, param6 AlignmentFlag) { + C.QGridLayout_addWidget5(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) } -func (this *QGridLayout) AddLayout4(param1 *QLayout, row int, column int, param4 AlignmentFlag) { - C.QGridLayout_addLayout4(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(param4)) +func (this *QGridLayout) AddLayout3(param1 *QLayout, row int, column int, param4 AlignmentFlag) { + C.QGridLayout_addLayout3(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(param4)) } -func (this *QGridLayout) AddLayout6(param1 *QLayout, row int, column int, rowSpan int, columnSpan int, param6 AlignmentFlag) { - C.QGridLayout_addLayout6(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) +func (this *QGridLayout) AddLayout4(param1 *QLayout, row int, column int, rowSpan int, columnSpan int, param6 AlignmentFlag) { + C.QGridLayout_addLayout4(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) } -func (this *QGridLayout) AddItem4(item *QLayoutItem, row int, column int, rowSpan int) { - C.QGridLayout_addItem4(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan)) +func (this *QGridLayout) AddItem2(item *QLayoutItem, row int, column int, rowSpan int) { + C.QGridLayout_addItem2(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan)) } -func (this *QGridLayout) AddItem5(item *QLayoutItem, row int, column int, rowSpan int, columnSpan int) { - C.QGridLayout_addItem5(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan)) +func (this *QGridLayout) AddItem3(item *QLayoutItem, row int, column int, rowSpan int, columnSpan int) { + C.QGridLayout_addItem3(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan)) } -func (this *QGridLayout) AddItem6(item *QLayoutItem, row int, column int, rowSpan int, columnSpan int, param6 AlignmentFlag) { - C.QGridLayout_addItem6(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) +func (this *QGridLayout) AddItem4(item *QLayoutItem, row int, column int, rowSpan int, columnSpan int, param6 AlignmentFlag) { + C.QGridLayout_addItem4(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) } // WidgetEvent can only be called from a QGridLayout that was directly constructed. diff --git a/qt6/gen_qgridlayout.h b/qt6/gen_qgridlayout.h index bee747fd..e84a2fd1 100644 --- a/qt6/gen_qgridlayout.h +++ b/qt6/gen_qgridlayout.h @@ -94,12 +94,12 @@ void QGridLayout_addItemWithQLayoutItem(QGridLayout* self, QLayoutItem* param1); struct miqt_string QGridLayout_tr2(const char* s, const char* c); struct miqt_string QGridLayout_tr3(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); -void QGridLayout_addLayout6(QGridLayout* self, QLayout* param1, int row, int column, int rowSpan, int columnSpan, int param6); -void QGridLayout_addItem4(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan); -void QGridLayout_addItem5(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan); -void QGridLayout_addItem6(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int param6); +void QGridLayout_addWidget5(QGridLayout* self, QWidget* param1, int row, int column, int rowSpan, int columnSpan, int param6); +void QGridLayout_addLayout3(QGridLayout* self, QLayout* param1, int row, int column, int param4); +void QGridLayout_addLayout4(QGridLayout* self, QLayout* param1, int row, int column, int rowSpan, int columnSpan, int param6); +void QGridLayout_addItem2(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan); +void QGridLayout_addItem3(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan); +void QGridLayout_addItem4(QGridLayout* self, QLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int param6); bool QGridLayout_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QGridLayout_virtualbase_sizeHint(const void* self); bool QGridLayout_override_virtual_minimumSize(void* self, intptr_t slot); diff --git a/qt6/gen_qgroupbox.cpp b/qt6/gen_qgroupbox.cpp index 70c62ef3..32259980 100644 --- a/qt6/gen_qgroupbox.cpp +++ b/qt6/gen_qgroupbox.cpp @@ -45,7 +45,7 @@ extern "C" { void miqt_exec_callback_QGroupBox_clicked(intptr_t); void miqt_exec_callback_QGroupBox_toggled(intptr_t, bool); -void miqt_exec_callback_QGroupBox_clicked1(intptr_t, bool); +void miqt_exec_callback_QGroupBox_clickedWithChecked(intptr_t, bool); QSize* miqt_exec_callback_QGroupBox_minimumSizeHint(const QGroupBox*, intptr_t); bool miqt_exec_callback_QGroupBox_event(QGroupBox*, intptr_t, QEvent*); void miqt_exec_callback_QGroupBox_childEvent(QGroupBox*, intptr_t, QChildEvent*); @@ -1164,14 +1164,14 @@ struct miqt_string QGroupBox_tr3(const char* s, const char* c, int n) { return _ms; } -void QGroupBox_clicked1(QGroupBox* self, bool checked) { +void QGroupBox_clickedWithChecked(QGroupBox* self, bool checked) { self->clicked(checked); } -void QGroupBox_connect_clicked1(QGroupBox* self, intptr_t slot) { +void QGroupBox_connect_clickedWithChecked(QGroupBox* self, intptr_t slot) { MiqtVirtualQGroupBox::connect(self, static_cast(&QGroupBox::clicked), self, [=](bool checked) { bool sigval1 = checked; - miqt_exec_callback_QGroupBox_clicked1(slot, sigval1); + miqt_exec_callback_QGroupBox_clickedWithChecked(slot, sigval1); }); } diff --git a/qt6/gen_qgroupbox.go b/qt6/gen_qgroupbox.go index 477ac4fb..41ff9a37 100644 --- a/qt6/gen_qgroupbox.go +++ b/qt6/gen_qgroupbox.go @@ -213,15 +213,15 @@ func QGroupBox_Tr3(s string, c string, n int) string { return _ret } -func (this *QGroupBox) Clicked1(checked bool) { - C.QGroupBox_clicked1(this.h, (C.bool)(checked)) +func (this *QGroupBox) ClickedWithChecked(checked bool) { + C.QGroupBox_clickedWithChecked(this.h, (C.bool)(checked)) } -func (this *QGroupBox) OnClicked1(slot func(checked bool)) { - C.QGroupBox_connect_clicked1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QGroupBox) OnClickedWithChecked(slot func(checked bool)) { + C.QGroupBox_connect_clickedWithChecked(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QGroupBox_clicked1 -func miqt_exec_callback_QGroupBox_clicked1(cb C.intptr_t, checked C.bool) { +//export miqt_exec_callback_QGroupBox_clickedWithChecked +func miqt_exec_callback_QGroupBox_clickedWithChecked(cb C.intptr_t, checked C.bool) { gofunc, ok := cgo.Handle(cb).Value().(func(checked bool)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/gen_qgroupbox.h b/qt6/gen_qgroupbox.h index 32180970..dcf4efe0 100644 --- a/qt6/gen_qgroupbox.h +++ b/qt6/gen_qgroupbox.h @@ -121,8 +121,8 @@ void QGroupBox_mouseReleaseEvent(QGroupBox* self, QMouseEvent* event); void QGroupBox_initStyleOption(const QGroupBox* self, QStyleOptionGroupBox* option); struct miqt_string QGroupBox_tr2(const char* s, const char* c); struct miqt_string QGroupBox_tr3(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_clickedWithChecked(QGroupBox* self, bool checked); +void QGroupBox_connect_clickedWithChecked(QGroupBox* self, intptr_t slot); bool QGroupBox_override_virtual_minimumSizeHint(void* self, intptr_t slot); QSize* QGroupBox_virtualbase_minimumSizeHint(const void* self); bool QGroupBox_override_virtual_event(void* self, intptr_t slot); diff --git a/qt6/gen_qicon.cpp b/qt6/gen_qicon.cpp index 3d5a2837..37874216 100644 --- a/qt6/gen_qicon.cpp +++ b/qt6/gen_qicon.cpp @@ -257,59 +257,59 @@ void QIcon_setFallbackThemeName(struct miqt_string name) { QIcon::setFallbackThemeName(name_QString); } -QPixmap* QIcon_pixmap22(const QIcon* self, QSize* size, int mode) { +QPixmap* QIcon_pixmap5(const QIcon* self, QSize* size, int mode) { return new QPixmap(self->pixmap(*size, static_cast(mode))); } -QPixmap* QIcon_pixmap32(const QIcon* self, QSize* size, int mode, int state) { +QPixmap* QIcon_pixmap6(const QIcon* self, QSize* size, int mode, int state) { return new QPixmap(self->pixmap(*size, static_cast(mode), static_cast(state))); } -QPixmap* QIcon_pixmap33(const QIcon* self, int w, int h, int mode) { +QPixmap* QIcon_pixmap7(const QIcon* self, int w, int h, int mode) { return new QPixmap(self->pixmap(static_cast(w), static_cast(h), static_cast(mode))); } -QPixmap* QIcon_pixmap42(const QIcon* self, int w, int h, int mode, int state) { +QPixmap* QIcon_pixmap8(const QIcon* self, int w, int h, int mode, int state) { return new QPixmap(self->pixmap(static_cast(w), static_cast(h), static_cast(mode), static_cast(state))); } -QPixmap* QIcon_pixmap23(const QIcon* self, int extent, int mode) { +QPixmap* QIcon_pixmap9(const QIcon* self, int extent, int mode) { return new QPixmap(self->pixmap(static_cast(extent), static_cast(mode))); } -QPixmap* QIcon_pixmap34(const QIcon* self, int extent, int mode, int state) { +QPixmap* QIcon_pixmap10(const QIcon* self, int extent, int mode, int state) { return new QPixmap(self->pixmap(static_cast(extent), static_cast(mode), static_cast(state))); } -QPixmap* QIcon_pixmap35(const QIcon* self, QSize* size, double devicePixelRatio, int mode) { +QPixmap* QIcon_pixmap11(const QIcon* self, QSize* size, double devicePixelRatio, int mode) { return new QPixmap(self->pixmap(*size, static_cast(devicePixelRatio), static_cast(mode))); } -QPixmap* QIcon_pixmap43(const QIcon* self, QSize* size, double devicePixelRatio, int mode, int state) { +QPixmap* QIcon_pixmap12(const QIcon* self, QSize* size, double devicePixelRatio, int mode, int state) { return new QPixmap(self->pixmap(*size, static_cast(devicePixelRatio), static_cast(mode), static_cast(state))); } -QPixmap* QIcon_pixmap36(const QIcon* self, QWindow* window, QSize* size, int mode) { +QPixmap* QIcon_pixmap13(const QIcon* self, QWindow* window, QSize* size, int mode) { return new QPixmap(self->pixmap(window, *size, static_cast(mode))); } -QPixmap* QIcon_pixmap44(const QIcon* self, QWindow* window, QSize* size, int mode, int state) { +QPixmap* QIcon_pixmap14(const QIcon* self, QWindow* window, QSize* size, int mode, int state) { return new QPixmap(self->pixmap(window, *size, static_cast(mode), static_cast(state))); } -QSize* QIcon_actualSize22(const QIcon* self, QSize* size, int mode) { +QSize* QIcon_actualSize3(const QIcon* self, QSize* size, int mode) { return new QSize(self->actualSize(*size, static_cast(mode))); } -QSize* QIcon_actualSize3(const QIcon* self, QSize* size, int mode, int state) { +QSize* QIcon_actualSize4(const QIcon* self, QSize* size, int mode, int state) { return new QSize(self->actualSize(*size, static_cast(mode), static_cast(state))); } -QSize* QIcon_actualSize32(const QIcon* self, QWindow* window, QSize* size, int mode) { +QSize* QIcon_actualSize5(const QIcon* self, QWindow* window, QSize* size, int mode) { return new QSize(self->actualSize(window, *size, static_cast(mode))); } -QSize* QIcon_actualSize4(const QIcon* self, QWindow* window, QSize* size, int mode, int state) { +QSize* QIcon_actualSize6(const QIcon* self, QWindow* window, QSize* size, int mode, int state) { return new QSize(self->actualSize(window, *size, static_cast(mode), static_cast(state))); } @@ -360,7 +360,7 @@ void QIcon_addFile4(QIcon* self, struct miqt_string fileName, QSize* size, int m self->addFile(fileName_QString, *size, static_cast(mode), static_cast(state)); } -struct miqt_array /* of QSize* */ QIcon_availableSizes1(const QIcon* self, int mode) { +struct miqt_array /* of QSize* */ QIcon_availableSizesWithMode(const QIcon* self, int mode) { QList _ret = self->availableSizes(static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QSize** _arr = static_cast(malloc(sizeof(QSize*) * _ret.length())); diff --git a/qt6/gen_qicon.go b/qt6/gen_qicon.go index 8aed2d59..c3769fc8 100644 --- a/qt6/gen_qicon.go +++ b/qt6/gen_qicon.go @@ -326,86 +326,86 @@ func QIcon_SetFallbackThemeName(name string) { C.QIcon_setFallbackThemeName(name_ms) } -func (this *QIcon) Pixmap22(size *QSize, mode QIcon__Mode) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap22(this.h, size.cPointer(), (C.int)(mode))) +func (this *QIcon) Pixmap5(size *QSize, mode QIcon__Mode) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap5(this.h, size.cPointer(), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap32(size *QSize, mode QIcon__Mode, state QIcon__State) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap32(this.h, size.cPointer(), (C.int)(mode), (C.int)(state))) +func (this *QIcon) Pixmap6(size *QSize, mode QIcon__Mode, state QIcon__State) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap6(this.h, size.cPointer(), (C.int)(mode), (C.int)(state))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap33(w int, h int, mode QIcon__Mode) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap33(this.h, (C.int)(w), (C.int)(h), (C.int)(mode))) +func (this *QIcon) Pixmap7(w int, h int, mode QIcon__Mode) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap7(this.h, (C.int)(w), (C.int)(h), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap42(w int, h int, mode QIcon__Mode, state QIcon__State) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap42(this.h, (C.int)(w), (C.int)(h), (C.int)(mode), (C.int)(state))) +func (this *QIcon) Pixmap8(w int, h int, mode QIcon__Mode, state QIcon__State) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap8(this.h, (C.int)(w), (C.int)(h), (C.int)(mode), (C.int)(state))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap23(extent int, mode QIcon__Mode) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap23(this.h, (C.int)(extent), (C.int)(mode))) +func (this *QIcon) Pixmap9(extent int, mode QIcon__Mode) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap9(this.h, (C.int)(extent), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap34(extent int, mode QIcon__Mode, state QIcon__State) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap34(this.h, (C.int)(extent), (C.int)(mode), (C.int)(state))) +func (this *QIcon) Pixmap10(extent int, mode QIcon__Mode, state QIcon__State) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap10(this.h, (C.int)(extent), (C.int)(mode), (C.int)(state))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap35(size *QSize, devicePixelRatio float64, mode QIcon__Mode) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap35(this.h, size.cPointer(), (C.double)(devicePixelRatio), (C.int)(mode))) +func (this *QIcon) Pixmap11(size *QSize, devicePixelRatio float64, mode QIcon__Mode) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap11(this.h, size.cPointer(), (C.double)(devicePixelRatio), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap43(size *QSize, devicePixelRatio float64, mode QIcon__Mode, state QIcon__State) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap43(this.h, size.cPointer(), (C.double)(devicePixelRatio), (C.int)(mode), (C.int)(state))) +func (this *QIcon) Pixmap12(size *QSize, devicePixelRatio float64, mode QIcon__Mode, state QIcon__State) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap12(this.h, size.cPointer(), (C.double)(devicePixelRatio), (C.int)(mode), (C.int)(state))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap36(window *QWindow, size *QSize, mode QIcon__Mode) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap36(this.h, window.cPointer(), size.cPointer(), (C.int)(mode))) +func (this *QIcon) Pixmap13(window *QWindow, size *QSize, mode QIcon__Mode) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap13(this.h, window.cPointer(), size.cPointer(), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) Pixmap44(window *QWindow, size *QSize, mode QIcon__Mode, state QIcon__State) *QPixmap { - _goptr := newQPixmap(C.QIcon_pixmap44(this.h, window.cPointer(), size.cPointer(), (C.int)(mode), (C.int)(state))) +func (this *QIcon) Pixmap14(window *QWindow, size *QSize, mode QIcon__Mode, state QIcon__State) *QPixmap { + _goptr := newQPixmap(C.QIcon_pixmap14(this.h, window.cPointer(), size.cPointer(), (C.int)(mode), (C.int)(state))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) ActualSize22(size *QSize, mode QIcon__Mode) *QSize { - _goptr := newQSize(C.QIcon_actualSize22(this.h, size.cPointer(), (C.int)(mode))) +func (this *QIcon) ActualSize3(size *QSize, mode QIcon__Mode) *QSize { + _goptr := newQSize(C.QIcon_actualSize3(this.h, size.cPointer(), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) ActualSize3(size *QSize, mode QIcon__Mode, state QIcon__State) *QSize { - _goptr := newQSize(C.QIcon_actualSize3(this.h, size.cPointer(), (C.int)(mode), (C.int)(state))) +func (this *QIcon) ActualSize4(size *QSize, mode QIcon__Mode, state QIcon__State) *QSize { + _goptr := newQSize(C.QIcon_actualSize4(this.h, size.cPointer(), (C.int)(mode), (C.int)(state))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) ActualSize32(window *QWindow, size *QSize, mode QIcon__Mode) *QSize { - _goptr := newQSize(C.QIcon_actualSize32(this.h, window.cPointer(), size.cPointer(), (C.int)(mode))) +func (this *QIcon) ActualSize5(window *QWindow, size *QSize, mode QIcon__Mode) *QSize { + _goptr := newQSize(C.QIcon_actualSize5(this.h, window.cPointer(), size.cPointer(), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QIcon) ActualSize4(window *QWindow, size *QSize, mode QIcon__Mode, state QIcon__State) *QSize { - _goptr := newQSize(C.QIcon_actualSize4(this.h, window.cPointer(), size.cPointer(), (C.int)(mode), (C.int)(state))) +func (this *QIcon) ActualSize6(window *QWindow, size *QSize, mode QIcon__Mode, state QIcon__State) *QSize { + _goptr := newQSize(C.QIcon_actualSize6(this.h, window.cPointer(), size.cPointer(), (C.int)(mode), (C.int)(state))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -466,8 +466,8 @@ func (this *QIcon) AddFile4(fileName string, size *QSize, mode QIcon__Mode, stat C.QIcon_addFile4(this.h, fileName_ms, size.cPointer(), (C.int)(mode), (C.int)(state)) } -func (this *QIcon) AvailableSizes1(mode QIcon__Mode) []QSize { - var _ma C.struct_miqt_array = C.QIcon_availableSizes1(this.h, (C.int)(mode)) +func (this *QIcon) AvailableSizesWithMode(mode QIcon__Mode) []QSize { + var _ma C.struct_miqt_array = C.QIcon_availableSizesWithMode(this.h, (C.int)(mode)) _ret := make([]QSize, int(_ma.len)) _outCast := (*[0xffff]*C.QSize)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt6/gen_qicon.h b/qt6/gen_qicon.h index 9a96a1d8..99b72289 100644 --- a/qt6/gen_qicon.h +++ b/qt6/gen_qicon.h @@ -72,20 +72,20 @@ 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); -QPixmap* QIcon_pixmap42(const QIcon* self, int w, int h, int mode, int state); -QPixmap* QIcon_pixmap23(const QIcon* self, int extent, int mode); -QPixmap* QIcon_pixmap34(const QIcon* self, int extent, int mode, int state); -QPixmap* QIcon_pixmap35(const QIcon* self, QSize* size, double devicePixelRatio, int mode); -QPixmap* QIcon_pixmap43(const QIcon* self, QSize* size, double devicePixelRatio, int mode, int state); -QPixmap* QIcon_pixmap36(const QIcon* self, QWindow* window, QSize* size, int mode); -QPixmap* QIcon_pixmap44(const QIcon* self, QWindow* window, QSize* size, int mode, int state); -QSize* QIcon_actualSize22(const QIcon* self, QSize* size, int mode); -QSize* QIcon_actualSize3(const QIcon* self, QSize* size, int mode, int state); -QSize* QIcon_actualSize32(const QIcon* self, QWindow* window, QSize* size, int mode); -QSize* QIcon_actualSize4(const QIcon* self, QWindow* window, QSize* size, int mode, int state); +QPixmap* QIcon_pixmap5(const QIcon* self, QSize* size, int mode); +QPixmap* QIcon_pixmap6(const QIcon* self, QSize* size, int mode, int state); +QPixmap* QIcon_pixmap7(const QIcon* self, int w, int h, int mode); +QPixmap* QIcon_pixmap8(const QIcon* self, int w, int h, int mode, int state); +QPixmap* QIcon_pixmap9(const QIcon* self, int extent, int mode); +QPixmap* QIcon_pixmap10(const QIcon* self, int extent, int mode, int state); +QPixmap* QIcon_pixmap11(const QIcon* self, QSize* size, double devicePixelRatio, int mode); +QPixmap* QIcon_pixmap12(const QIcon* self, QSize* size, double devicePixelRatio, int mode, int state); +QPixmap* QIcon_pixmap13(const QIcon* self, QWindow* window, QSize* size, int mode); +QPixmap* QIcon_pixmap14(const QIcon* self, QWindow* window, QSize* size, int mode, int state); +QSize* QIcon_actualSize3(const QIcon* self, QSize* size, int mode); +QSize* QIcon_actualSize4(const QIcon* self, QSize* size, int mode, int state); +QSize* QIcon_actualSize5(const QIcon* self, QWindow* window, QSize* size, int mode); +QSize* QIcon_actualSize6(const QIcon* self, QWindow* window, QSize* size, int mode, int state); void QIcon_paint3(const QIcon* self, QPainter* painter, QRect* rect, int alignment); void QIcon_paint4(const QIcon* self, QPainter* painter, QRect* rect, int alignment, int mode); void QIcon_paint5(const QIcon* self, QPainter* painter, QRect* rect, int alignment, int mode, int state); @@ -97,7 +97,7 @@ 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); -struct miqt_array /* of QSize* */ QIcon_availableSizes1(const QIcon* self, int mode); +struct miqt_array /* of QSize* */ QIcon_availableSizesWithMode(const QIcon* self, int mode); struct miqt_array /* of QSize* */ QIcon_availableSizes2(const QIcon* self, int mode, int state); void QIcon_delete(QIcon* self); diff --git a/qt6/gen_qidentityproxymodel.cpp b/qt6/gen_qidentityproxymodel.cpp index 0072ff8a..ffe14915 100644 --- a/qt6/gen_qidentityproxymodel.cpp +++ b/qt6/gen_qidentityproxymodel.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qt6/gen_qimage.cpp b/qt6/gen_qimage.cpp index dc37afe0..b5549e56 100644 --- a/qt6/gen_qimage.cpp +++ b/qt6/gen_qimage.cpp @@ -168,7 +168,7 @@ public: friend bool QImage_protectedbase_convertToFormatInplace(bool* _dynamic_cast_ok, void* self, int format, int flags); friend QImage* QImage_protectedbase_smoothScaled(bool* _dynamic_cast_ok, const void* self, int w, int h); friend void QImage_protectedbase_detachMetadata(bool* _dynamic_cast_ok, void* self); - friend void QImage_protectedbase_detachMetadata1(bool* _dynamic_cast_ok, void* self, bool invalidateCache); + friend void QImage_protectedbase_detachMetadataWithInvalidateCache(bool* _dynamic_cast_ok, void* self, bool invalidateCache); }; QImage* QImage_new() { @@ -694,15 +694,15 @@ int QImage_toImageFormat(QPixelFormat* format) { return static_cast(_ret); } -QImage* QImage_copy1(const QImage* self, QRect* rect) { +QImage* QImage_copyWithRect(const QImage* self, QRect* rect) { return new QImage(self->copy(*rect)); } -QImage* QImage_convertToFormat22(const QImage* self, int f, int flags) { +QImage* QImage_convertToFormat3(const QImage* self, int f, int flags) { return new QImage(self->convertToFormat(static_cast(f), static_cast(flags))); } -QImage* QImage_convertToFormat3(const QImage* self, int f, struct miqt_array /* of unsigned int */ colorTable, int flags) { +QImage* QImage_convertToFormat4(const QImage* self, int f, struct miqt_array /* of unsigned int */ colorTable, int flags) { QList colorTable_QList; colorTable_QList.reserve(colorTable.len); unsigned int* colorTable_arr = static_cast(colorTable.data); @@ -720,11 +720,11 @@ void QImage_convertTo2(QImage* self, int f, int flags) { self->convertTo(static_cast(f), static_cast(flags)); } -QImage* QImage_createAlphaMask1(const QImage* self, int flags) { +QImage* QImage_createAlphaMaskWithFlags(const QImage* self, int flags) { return new QImage(self->createAlphaMask(static_cast(flags))); } -QImage* QImage_createHeuristicMask1(const QImage* self, bool clipTight) { +QImage* QImage_createHeuristicMaskWithClipTight(const QImage* self, bool clipTight) { return new QImage(self->createHeuristicMask(clipTight)); } @@ -732,19 +732,19 @@ QImage* QImage_createMaskFromColor2(const QImage* self, unsigned int color, int return new QImage(self->createMaskFromColor(static_cast(color), static_cast(mode))); } -QImage* QImage_scaled3(const QImage* self, int w, int h, int aspectMode) { +QImage* QImage_scaled2(const QImage* self, int w, int h, int aspectMode) { return new QImage(self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode))); } -QImage* QImage_scaled4(const QImage* self, int w, int h, int aspectMode, int mode) { +QImage* QImage_scaled3(const QImage* self, int w, int h, int aspectMode, int mode) { return new QImage(self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode), static_cast(mode))); } -QImage* QImage_scaled2(const QImage* self, QSize* s, int aspectMode) { +QImage* QImage_scaled4(const QImage* self, QSize* s, int aspectMode) { return new QImage(self->scaled(*s, static_cast(aspectMode))); } -QImage* QImage_scaled32(const QImage* self, QSize* s, int aspectMode, int mode) { +QImage* QImage_scaled5(const QImage* self, QSize* s, int aspectMode, int mode) { return new QImage(self->scaled(*s, static_cast(aspectMode), static_cast(mode))); } @@ -760,7 +760,7 @@ QImage* QImage_transformed2(const QImage* self, QTransform* matrix, int mode) { return new QImage(self->transformed(*matrix, static_cast(mode))); } -QImage* QImage_mirrored1(const QImage* self, bool horizontally) { +QImage* QImage_mirroredWithHorizontally(const QImage* self, bool horizontally) { return new QImage(self->mirrored(horizontally)); } @@ -768,7 +768,7 @@ QImage* QImage_mirrored2(const QImage* self, bool horizontally, bool vertically) return new QImage(self->mirrored(horizontally, vertically)); } -void QImage_mirror1(QImage* self, bool horizontally) { +void QImage_mirrorWithHorizontally(QImage* self, bool horizontally) { self->mirror(horizontally); } @@ -776,7 +776,7 @@ void QImage_mirror2(QImage* self, bool horizontally, bool vertically) { self->mirror(horizontally, vertically); } -void QImage_invertPixels1(QImage* self, int param1) { +void QImage_invertPixelsWithQImageInvertMode(QImage* self, int param1) { self->invertPixels(static_cast(param1)); } @@ -785,15 +785,15 @@ bool QImage_load2(QImage* self, struct miqt_string fileName, const char* format) return self->load(fileName_QString, format); } -bool QImage_loadFromData22(QImage* self, QByteArrayView* data, const char* format) { +bool QImage_loadFromData3(QImage* self, QByteArrayView* data, const char* format) { return self->loadFromData(*data, format); } -bool QImage_loadFromData3(QImage* self, const unsigned char* buf, int len, const char* format) { +bool QImage_loadFromData4(QImage* self, const unsigned char* buf, int len, const char* format) { return self->loadFromData(static_cast(buf), static_cast(len), format); } -bool QImage_loadFromData23(QImage* self, struct miqt_string data, const char* format) { +bool QImage_loadFromData5(QImage* self, struct miqt_string data, const char* format) { QByteArray data_QByteArray(data.data, data.len); return self->loadFromData(data_QByteArray, format); } @@ -808,28 +808,28 @@ bool QImage_save3(const QImage* self, struct miqt_string fileName, const char* f return self->save(fileName_QString, format, static_cast(quality)); } -bool QImage_save22(const QImage* self, QIODevice* device, const char* format) { +bool QImage_save4(const QImage* self, QIODevice* device, const char* format) { return self->save(device, format); } -bool QImage_save32(const QImage* self, QIODevice* device, const char* format, int quality) { +bool QImage_save5(const QImage* self, QIODevice* device, const char* format, int quality) { return self->save(device, format, static_cast(quality)); } -QImage* QImage_fromData22(QByteArrayView* data, const char* format) { +QImage* QImage_fromData3(QByteArrayView* data, const char* format) { return new QImage(QImage::fromData(*data, format)); } -QImage* QImage_fromData3(const unsigned char* data, int size, const char* format) { +QImage* QImage_fromData4(const unsigned char* data, int size, const char* format) { return new QImage(QImage::fromData(static_cast(data), static_cast(size), format)); } -QImage* QImage_fromData23(struct miqt_string data, const char* format) { +QImage* QImage_fromData5(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) { +struct miqt_string QImage_textWithKey(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 @@ -1041,7 +1041,7 @@ void QImage_protectedbase_detachMetadata(bool* _dynamic_cast_ok, void* self) { } -void QImage_protectedbase_detachMetadata1(bool* _dynamic_cast_ok, void* self, bool invalidateCache) { +void QImage_protectedbase_detachMetadataWithInvalidateCache(bool* _dynamic_cast_ok, void* self, bool invalidateCache) { MiqtVirtualQImage* self_cast = dynamic_cast( (QImage*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/gen_qimage.go b/qt6/gen_qimage.go index 45395ed0..1bb41cb1 100644 --- a/qt6/gen_qimage.go +++ b/qt6/gen_qimage.go @@ -705,26 +705,26 @@ func QImage_ToImageFormat(format QPixelFormat) QImage__Format { return (QImage__Format)(C.QImage_toImageFormat(format.cPointer())) } -func (this *QImage) Copy1(rect *QRect) *QImage { - _goptr := newQImage(C.QImage_copy1(this.h, rect.cPointer())) +func (this *QImage) CopyWithRect(rect *QRect) *QImage { + _goptr := newQImage(C.QImage_copyWithRect(this.h, rect.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) ConvertToFormat22(f QImage__Format, flags ImageConversionFlag) *QImage { - _goptr := newQImage(C.QImage_convertToFormat22(this.h, (C.int)(f), (C.int)(flags))) +func (this *QImage) ConvertToFormat3(f QImage__Format, flags ImageConversionFlag) *QImage { + _goptr := newQImage(C.QImage_convertToFormat3(this.h, (C.int)(f), (C.int)(flags))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) ConvertToFormat3(f QImage__Format, colorTable []uint, flags ImageConversionFlag) *QImage { +func (this *QImage) ConvertToFormat4(f QImage__Format, colorTable []uint, flags ImageConversionFlag) *QImage { colorTable_CArray := (*[0xffff]C.uint)(C.malloc(C.size_t(8 * len(colorTable)))) defer C.free(unsafe.Pointer(colorTable_CArray)) for i := range colorTable { colorTable_CArray[i] = (C.uint)(colorTable[i]) } colorTable_ma := C.struct_miqt_array{len: C.size_t(len(colorTable)), data: unsafe.Pointer(colorTable_CArray)} - _goptr := newQImage(C.QImage_convertToFormat3(this.h, (C.int)(f), colorTable_ma, (C.int)(flags))) + _goptr := newQImage(C.QImage_convertToFormat4(this.h, (C.int)(f), colorTable_ma, (C.int)(flags))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -739,14 +739,14 @@ func (this *QImage) ConvertTo2(f QImage__Format, flags ImageConversionFlag) { C.QImage_convertTo2(this.h, (C.int)(f), (C.int)(flags)) } -func (this *QImage) CreateAlphaMask1(flags ImageConversionFlag) *QImage { - _goptr := newQImage(C.QImage_createAlphaMask1(this.h, (C.int)(flags))) +func (this *QImage) CreateAlphaMaskWithFlags(flags ImageConversionFlag) *QImage { + _goptr := newQImage(C.QImage_createAlphaMaskWithFlags(this.h, (C.int)(flags))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) CreateHeuristicMask1(clipTight bool) *QImage { - _goptr := newQImage(C.QImage_createHeuristicMask1(this.h, (C.bool)(clipTight))) +func (this *QImage) CreateHeuristicMaskWithClipTight(clipTight bool) *QImage { + _goptr := newQImage(C.QImage_createHeuristicMaskWithClipTight(this.h, (C.bool)(clipTight))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -757,26 +757,26 @@ func (this *QImage) CreateMaskFromColor2(color uint, mode MaskMode) *QImage { return _goptr } -func (this *QImage) Scaled3(w int, h int, aspectMode AspectRatioMode) *QImage { - _goptr := newQImage(C.QImage_scaled3(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode))) +func (this *QImage) Scaled2(w int, h int, aspectMode AspectRatioMode) *QImage { + _goptr := newQImage(C.QImage_scaled2(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) Scaled4(w int, h int, aspectMode AspectRatioMode, mode TransformationMode) *QImage { - _goptr := newQImage(C.QImage_scaled4(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode), (C.int)(mode))) +func (this *QImage) Scaled3(w int, h int, aspectMode AspectRatioMode, mode TransformationMode) *QImage { + _goptr := newQImage(C.QImage_scaled3(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) Scaled2(s *QSize, aspectMode AspectRatioMode) *QImage { - _goptr := newQImage(C.QImage_scaled2(this.h, s.cPointer(), (C.int)(aspectMode))) +func (this *QImage) Scaled4(s *QSize, aspectMode AspectRatioMode) *QImage { + _goptr := newQImage(C.QImage_scaled4(this.h, s.cPointer(), (C.int)(aspectMode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) Scaled32(s *QSize, aspectMode AspectRatioMode, mode TransformationMode) *QImage { - _goptr := newQImage(C.QImage_scaled32(this.h, s.cPointer(), (C.int)(aspectMode), (C.int)(mode))) +func (this *QImage) Scaled5(s *QSize, aspectMode AspectRatioMode, mode TransformationMode) *QImage { + _goptr := newQImage(C.QImage_scaled5(this.h, s.cPointer(), (C.int)(aspectMode), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -799,8 +799,8 @@ func (this *QImage) Transformed2(matrix *QTransform, mode TransformationMode) *Q return _goptr } -func (this *QImage) Mirrored1(horizontally bool) *QImage { - _goptr := newQImage(C.QImage_mirrored1(this.h, (C.bool)(horizontally))) +func (this *QImage) MirroredWithHorizontally(horizontally bool) *QImage { + _goptr := newQImage(C.QImage_mirroredWithHorizontally(this.h, (C.bool)(horizontally))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -811,16 +811,16 @@ func (this *QImage) Mirrored2(horizontally bool, vertically bool) *QImage { return _goptr } -func (this *QImage) Mirror1(horizontally bool) { - C.QImage_mirror1(this.h, (C.bool)(horizontally)) +func (this *QImage) MirrorWithHorizontally(horizontally bool) { + C.QImage_mirrorWithHorizontally(this.h, (C.bool)(horizontally)) } func (this *QImage) Mirror2(horizontally bool, vertically bool) { C.QImage_mirror2(this.h, (C.bool)(horizontally), (C.bool)(vertically)) } -func (this *QImage) InvertPixels1(param1 QImage__InvertMode) { - C.QImage_invertPixels1(this.h, (C.int)(param1)) +func (this *QImage) InvertPixelsWithQImageInvertMode(param1 QImage__InvertMode) { + C.QImage_invertPixelsWithQImageInvertMode(this.h, (C.int)(param1)) } func (this *QImage) Load2(fileName string, format string) bool { @@ -833,19 +833,19 @@ func (this *QImage) Load2(fileName string, format string) bool { return (bool)(C.QImage_load2(this.h, fileName_ms, format_Cstring)) } -func (this *QImage) LoadFromData22(data QByteArrayView, format string) bool { +func (this *QImage) LoadFromData3(data QByteArrayView, format string) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QImage_loadFromData22(this.h, data.cPointer(), format_Cstring)) + return (bool)(C.QImage_loadFromData3(this.h, data.cPointer(), format_Cstring)) } -func (this *QImage) LoadFromData3(buf *byte, lenVal int, format string) bool { +func (this *QImage) LoadFromData4(buf *byte, lenVal int, format string) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QImage_loadFromData3(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.int)(lenVal), format_Cstring)) + return (bool)(C.QImage_loadFromData4(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.int)(lenVal), format_Cstring)) } -func (this *QImage) LoadFromData23(data []byte, format string) bool { +func (this *QImage) LoadFromData5(data []byte, format string) bool { data_alias := C.struct_miqt_string{} if len(data) > 0 { data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) @@ -855,7 +855,7 @@ func (this *QImage) LoadFromData23(data []byte, format string) bool { data_alias.len = C.size_t(len(data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QImage_loadFromData23(this.h, data_alias, format_Cstring)) + return (bool)(C.QImage_loadFromData5(this.h, data_alias, format_Cstring)) } func (this *QImage) Save2(fileName string, format string) bool { @@ -878,35 +878,35 @@ func (this *QImage) Save3(fileName string, format string, quality int) bool { return (bool)(C.QImage_save3(this.h, fileName_ms, format_Cstring, (C.int)(quality))) } -func (this *QImage) Save22(device *QIODevice, format string) bool { +func (this *QImage) Save4(device *QIODevice, format string) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QImage_save22(this.h, device.cPointer(), format_Cstring)) + return (bool)(C.QImage_save4(this.h, device.cPointer(), format_Cstring)) } -func (this *QImage) Save32(device *QIODevice, format string, quality int) bool { +func (this *QImage) Save5(device *QIODevice, format string, quality int) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QImage_save32(this.h, device.cPointer(), format_Cstring, (C.int)(quality))) + return (bool)(C.QImage_save5(this.h, device.cPointer(), format_Cstring, (C.int)(quality))) } -func QImage_FromData22(data QByteArrayView, format string) *QImage { +func QImage_FromData3(data QByteArrayView, format string) *QImage { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - _goptr := newQImage(C.QImage_fromData22(data.cPointer(), format_Cstring)) + _goptr := newQImage(C.QImage_fromData3(data.cPointer(), format_Cstring)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QImage_FromData3(data *byte, size int, format string) *QImage { +func QImage_FromData4(data *byte, size int, format string) *QImage { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - _goptr := newQImage(C.QImage_fromData3((*C.uchar)(unsafe.Pointer(data)), (C.int)(size), format_Cstring)) + _goptr := newQImage(C.QImage_fromData4((*C.uchar)(unsafe.Pointer(data)), (C.int)(size), format_Cstring)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QImage_FromData23(data []byte, format string) *QImage { +func QImage_FromData5(data []byte, format string) *QImage { data_alias := C.struct_miqt_string{} if len(data) > 0 { data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) @@ -916,17 +916,17 @@ func QImage_FromData23(data []byte, format string) *QImage { data_alias.len = C.size_t(len(data)) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - _goptr := newQImage(C.QImage_fromData23(data_alias, format_Cstring)) + _goptr := newQImage(C.QImage_fromData5(data_alias, format_Cstring)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QImage) Text1(key string) string { +func (this *QImage) TextWithKey(key string) string { 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) + var _ms C.struct_miqt_string = C.QImage_textWithKey(this.h, key_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1046,11 +1046,11 @@ func (this *QImage) DetachMetadata() { } -// DetachMetadata1 can only be called from a QImage that was directly constructed. -func (this *QImage) DetachMetadata1(invalidateCache bool) { +// DetachMetadataWithInvalidateCache can only be called from a QImage that was directly constructed. +func (this *QImage) DetachMetadataWithInvalidateCache(invalidateCache bool) { var _dynamic_cast_ok C.bool = false - C.QImage_protectedbase_detachMetadata1(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.bool)(invalidateCache)) + C.QImage_protectedbase_detachMetadataWithInvalidateCache(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.bool)(invalidateCache)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") diff --git a/qt6/gen_qimage.h b/qt6/gen_qimage.h index ea3e7074..b26b1c58 100644 --- a/qt6/gen_qimage.h +++ b/qt6/gen_qimage.h @@ -165,38 +165,38 @@ QPixelFormat* QImage_pixelFormat(const QImage* self); QPixelFormat* QImage_toPixelFormat(int format); int QImage_toImageFormat(QPixelFormat* format); int QImage_metric(const QImage* self, int metric); -QImage* QImage_copy1(const QImage* self, QRect* rect); -QImage* QImage_convertToFormat22(const QImage* self, int f, int flags); -QImage* QImage_convertToFormat3(const QImage* self, int f, struct miqt_array /* of unsigned int */ colorTable, int flags); +QImage* QImage_copyWithRect(const QImage* self, QRect* rect); +QImage* QImage_convertToFormat3(const QImage* self, int f, int flags); +QImage* QImage_convertToFormat4(const QImage* self, int f, struct miqt_array /* of unsigned int */ colorTable, int flags); QImage* QImage_convertedTo2(const QImage* self, int f, int flags); void QImage_convertTo2(QImage* self, int f, int flags); -QImage* QImage_createAlphaMask1(const QImage* self, int flags); -QImage* QImage_createHeuristicMask1(const QImage* self, bool clipTight); +QImage* QImage_createAlphaMaskWithFlags(const QImage* self, int flags); +QImage* QImage_createHeuristicMaskWithClipTight(const QImage* self, bool clipTight); QImage* QImage_createMaskFromColor2(const QImage* self, unsigned int color, int mode); -QImage* QImage_scaled3(const QImage* self, int w, int h, int aspectMode); -QImage* QImage_scaled4(const QImage* self, int w, int h, int aspectMode, int mode); -QImage* QImage_scaled2(const QImage* self, QSize* s, int aspectMode); -QImage* QImage_scaled32(const QImage* self, QSize* s, int aspectMode, int mode); +QImage* QImage_scaled2(const QImage* self, int w, int h, int aspectMode); +QImage* QImage_scaled3(const QImage* self, int w, int h, int aspectMode, int mode); +QImage* QImage_scaled4(const QImage* self, QSize* s, int aspectMode); +QImage* QImage_scaled5(const QImage* self, QSize* s, int aspectMode, int mode); QImage* QImage_scaledToWidth2(const QImage* self, int w, int mode); QImage* QImage_scaledToHeight2(const QImage* self, int h, int mode); QImage* QImage_transformed2(const QImage* self, QTransform* matrix, int mode); -QImage* QImage_mirrored1(const QImage* self, bool horizontally); +QImage* QImage_mirroredWithHorizontally(const QImage* self, bool horizontally); QImage* QImage_mirrored2(const QImage* self, bool horizontally, bool vertically); -void QImage_mirror1(QImage* self, bool horizontally); +void QImage_mirrorWithHorizontally(QImage* self, bool horizontally); void QImage_mirror2(QImage* self, bool horizontally, bool vertically); -void QImage_invertPixels1(QImage* self, int param1); +void QImage_invertPixelsWithQImageInvertMode(QImage* self, int param1); bool QImage_load2(QImage* self, struct miqt_string fileName, const char* format); -bool QImage_loadFromData22(QImage* self, QByteArrayView* data, const char* format); -bool QImage_loadFromData3(QImage* self, const unsigned char* buf, int len, const char* format); -bool QImage_loadFromData23(QImage* self, struct miqt_string data, const char* format); +bool QImage_loadFromData3(QImage* self, QByteArrayView* data, const char* format); +bool QImage_loadFromData4(QImage* self, const unsigned char* buf, int len, const char* format); +bool QImage_loadFromData5(QImage* self, struct miqt_string data, const char* format); 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_fromData22(QByteArrayView* data, const char* format); -QImage* QImage_fromData3(const unsigned char* data, int size, const char* format); -QImage* QImage_fromData23(struct miqt_string data, const char* format); -struct miqt_string QImage_text1(const QImage* self, struct miqt_string key); +bool QImage_save4(const QImage* self, QIODevice* device, const char* format); +bool QImage_save5(const QImage* self, QIODevice* device, const char* format, int quality); +QImage* QImage_fromData3(QByteArrayView* data, const char* format); +QImage* QImage_fromData4(const unsigned char* data, int size, const char* format); +QImage* QImage_fromData5(struct miqt_string data, const char* format); +struct miqt_string QImage_textWithKey(const QImage* self, struct miqt_string key); bool QImage_override_virtual_devType(void* self, intptr_t slot); int QImage_virtualbase_devType(const void* self); bool QImage_override_virtual_paintEngine(void* self, intptr_t slot); @@ -217,7 +217,7 @@ QImage* QImage_protectedbase_convertToFormatHelper(bool* _dynamic_cast_ok, const bool QImage_protectedbase_convertToFormatInplace(bool* _dynamic_cast_ok, void* self, int format, int flags); QImage* QImage_protectedbase_smoothScaled(bool* _dynamic_cast_ok, const void* self, int w, int h); void QImage_protectedbase_detachMetadata(bool* _dynamic_cast_ok, void* self); -void QImage_protectedbase_detachMetadata1(bool* _dynamic_cast_ok, void* self, bool invalidateCache); +void QImage_protectedbase_detachMetadataWithInvalidateCache(bool* _dynamic_cast_ok, void* self, bool invalidateCache); void QImage_delete(QImage* self); #ifdef __cplusplus diff --git a/qt6/gen_qinputdevice.cpp b/qt6/gen_qinputdevice.cpp index 92ae600a..70cc0a4d 100644 --- a/qt6/gen_qinputdevice.cpp +++ b/qt6/gen_qinputdevice.cpp @@ -350,7 +350,7 @@ struct miqt_string QInputDevice_tr3(const char* s, const char* c, int n) { return _ms; } -QInputDevice* QInputDevice_primaryKeyboard1(struct miqt_string seatName) { +QInputDevice* QInputDevice_primaryKeyboardWithSeatName(struct miqt_string seatName) { QString seatName_QString = QString::fromUtf8(seatName.data, seatName.len); return (QInputDevice*) QInputDevice::primaryKeyboard(seatName_QString); } diff --git a/qt6/gen_qinputdevice.go b/qt6/gen_qinputdevice.go index ef50a481..f41a81e3 100644 --- a/qt6/gen_qinputdevice.go +++ b/qt6/gen_qinputdevice.go @@ -265,12 +265,12 @@ func QInputDevice_Tr3(s string, c string, n int) string { return _ret } -func QInputDevice_PrimaryKeyboard1(seatName string) *QInputDevice { +func QInputDevice_PrimaryKeyboardWithSeatName(seatName string) *QInputDevice { seatName_ms := C.struct_miqt_string{} seatName_ms.data = C.CString(seatName) seatName_ms.len = C.size_t(len(seatName)) defer C.free(unsafe.Pointer(seatName_ms.data)) - return newQInputDevice(C.QInputDevice_primaryKeyboard1(seatName_ms)) + return newQInputDevice(C.QInputDevice_primaryKeyboardWithSeatName(seatName_ms)) } // Sender can only be called from a QInputDevice that was directly constructed. diff --git a/qt6/gen_qinputdevice.h b/qt6/gen_qinputdevice.h index ba66df40..7b4b101e 100644 --- a/qt6/gen_qinputdevice.h +++ b/qt6/gen_qinputdevice.h @@ -58,7 +58,7 @@ void QInputDevice_availableVirtualGeometryChanged(QInputDevice* self, QRect* are void QInputDevice_connect_availableVirtualGeometryChanged(QInputDevice* self, intptr_t slot); struct miqt_string QInputDevice_tr2(const char* s, const char* c); struct miqt_string QInputDevice_tr3(const char* s, const char* c, int n); -QInputDevice* QInputDevice_primaryKeyboard1(struct miqt_string seatName); +QInputDevice* QInputDevice_primaryKeyboardWithSeatName(struct miqt_string seatName); bool QInputDevice_override_virtual_event(void* self, intptr_t slot); bool QInputDevice_virtualbase_event(void* self, QEvent* event); bool QInputDevice_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt6/gen_qinputdialog.cpp b/qt6/gen_qinputdialog.cpp index ca486916..32772c7a 100644 --- a/qt6/gen_qinputdialog.cpp +++ b/qt6/gen_qinputdialog.cpp @@ -1541,7 +1541,7 @@ 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) { +struct miqt_string QInputDialog_getText2(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)); @@ -1554,7 +1554,7 @@ struct miqt_string QInputDialog_getText4(QWidget* parent, struct miqt_string tit return _ms; } -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_getText3(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); @@ -1568,7 +1568,7 @@ struct miqt_string QInputDialog_getText5(QWidget* parent, struct miqt_string tit 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) { +struct miqt_string QInputDialog_getText4(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); @@ -1582,7 +1582,7 @@ struct miqt_string QInputDialog_getText6(QWidget* parent, struct miqt_string tit 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) { +struct miqt_string QInputDialog_getText5(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); @@ -1596,7 +1596,7 @@ struct miqt_string QInputDialog_getText7(QWidget* parent, struct miqt_string tit 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) { +struct miqt_string QInputDialog_getText6(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); @@ -1610,7 +1610,7 @@ struct miqt_string QInputDialog_getText8(QWidget* parent, struct miqt_string tit return _ms; } -struct miqt_string QInputDialog_getMultiLineText4(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text) { +struct miqt_string QInputDialog_getMultiLineText2(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); @@ -1624,7 +1624,7 @@ struct miqt_string QInputDialog_getMultiLineText4(QWidget* parent, struct miqt_s return _ms; } -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_getMultiLineText3(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); @@ -1638,7 +1638,7 @@ struct miqt_string QInputDialog_getMultiLineText5(QWidget* parent, struct miqt_s 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) { +struct miqt_string QInputDialog_getMultiLineText4(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); @@ -1652,7 +1652,7 @@ struct miqt_string QInputDialog_getMultiLineText6(QWidget* parent, struct miqt_s 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) { +struct miqt_string QInputDialog_getMultiLineText5(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); @@ -1666,7 +1666,7 @@ struct miqt_string QInputDialog_getMultiLineText7(QWidget* parent, struct miqt_s 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) { +struct miqt_string QInputDialog_getItem2(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; @@ -1686,7 +1686,7 @@ struct miqt_string QInputDialog_getItem5(QWidget* parent, struct miqt_string tit 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) { +struct miqt_string QInputDialog_getItem3(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; @@ -1706,7 +1706,7 @@ struct miqt_string QInputDialog_getItem6(QWidget* parent, struct miqt_string tit 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) { +struct miqt_string QInputDialog_getItem4(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; @@ -1726,7 +1726,7 @@ struct miqt_string QInputDialog_getItem7(QWidget* parent, struct miqt_string tit 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) { +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, 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; @@ -1746,7 +1746,7 @@ struct miqt_string QInputDialog_getItem8(QWidget* parent, struct miqt_string tit 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) { +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, 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; @@ -1766,79 +1766,79 @@ struct miqt_string QInputDialog_getItem9(QWidget* parent, struct miqt_string tit return _ms; } -int QInputDialog_getInt4(QWidget* parent, struct miqt_string title, struct miqt_string label, int value) { +int QInputDialog_getInt2(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) { +int QInputDialog_getInt3(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) { +int QInputDialog_getInt4(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) { +int QInputDialog_getInt5(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) { +int QInputDialog_getInt6(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) { +int QInputDialog_getInt7(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) { +double QInputDialog_getDouble2(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) { +double QInputDialog_getDouble3(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) { +double QInputDialog_getDouble4(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) { +double QInputDialog_getDouble5(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) { +double QInputDialog_getDouble6(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) { +double QInputDialog_getDouble7(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)); } -double QInputDialog_getDouble10(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags, double step) { +double QInputDialog_getDouble8(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)); diff --git a/qt6/gen_qinputdialog.go b/qt6/gen_qinputdialog.go index af645a3b..d76e8cce 100644 --- a/qt6/gen_qinputdialog.go +++ b/qt6/gen_qinputdialog.go @@ -569,7 +569,7 @@ func (this *QInputDialog) SetOption2(option QInputDialog__InputDialogOption, on C.QInputDialog_setOption2(this.h, (C.int)(option), (C.bool)(on)) } -func QInputDialog_GetText4(parent *QWidget, title string, label string, echo QLineEdit__EchoMode) string { +func QInputDialog_GetText2(parent *QWidget, title string, label string, echo QLineEdit__EchoMode) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -578,13 +578,13 @@ func QInputDialog_GetText4(parent *QWidget, title string, label string, echo QLi 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)) + var _ms C.struct_miqt_string = C.QInputDialog_getText2(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 { +func QInputDialog_GetText3(parent *QWidget, title string, label string, echo QLineEdit__EchoMode, text string) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -597,13 +597,13 @@ func QInputDialog_GetText5(parent *QWidget, title string, label string, echo QLi 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) + var _ms C.struct_miqt_string = C.QInputDialog_getText3(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 { +func QInputDialog_GetText4(parent *QWidget, title string, label string, echo QLineEdit__EchoMode, text string, ok *bool) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -616,13 +616,13 @@ func QInputDialog_GetText6(parent *QWidget, title string, label string, echo QLi 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))) + var _ms C.struct_miqt_string = C.QInputDialog_getText4(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 { +func QInputDialog_GetText5(parent *QWidget, title string, label string, echo QLineEdit__EchoMode, text string, ok *bool, flags WindowType) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -635,13 +635,13 @@ func QInputDialog_GetText7(parent *QWidget, title string, label string, echo QLi 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)) + var _ms C.struct_miqt_string = C.QInputDialog_getText5(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 { +func QInputDialog_GetText6(parent *QWidget, title string, label string, echo QLineEdit__EchoMode, text string, ok *bool, flags WindowType, inputMethodHints InputMethodHint) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -654,13 +654,13 @@ func QInputDialog_GetText8(parent *QWidget, title string, label string, echo QLi 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)) + 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)), (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 { +func QInputDialog_GetMultiLineText2(parent *QWidget, title string, label string, text string) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -673,13 +673,13 @@ func QInputDialog_GetMultiLineText4(parent *QWidget, title string, label 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) + var _ms C.struct_miqt_string = C.QInputDialog_getMultiLineText2(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 { +func QInputDialog_GetMultiLineText3(parent *QWidget, title string, label string, text string, ok *bool) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -692,13 +692,13 @@ func QInputDialog_GetMultiLineText5(parent *QWidget, title string, label 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))) + var _ms C.struct_miqt_string = C.QInputDialog_getMultiLineText3(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 { +func QInputDialog_GetMultiLineText4(parent *QWidget, title string, label string, text string, ok *bool, flags WindowType) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -711,13 +711,13 @@ func QInputDialog_GetMultiLineText6(parent *QWidget, title string, label 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)) + var _ms C.struct_miqt_string = C.QInputDialog_getMultiLineText4(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 { +func QInputDialog_GetMultiLineText5(parent *QWidget, title string, label string, text string, ok *bool, flags WindowType, inputMethodHints InputMethodHint) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -730,13 +730,13 @@ func QInputDialog_GetMultiLineText7(parent *QWidget, title string, label 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)) + var _ms C.struct_miqt_string = C.QInputDialog_getMultiLineText5(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 { +func QInputDialog_GetItem2(parent *QWidget, title string, label string, items []string, current int) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -755,13 +755,13 @@ func QInputDialog_GetItem5(parent *QWidget, title string, label string, items [] items_CArray[i] = items_i_ms } items_ma := C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} - var _ms C.struct_miqt_string = C.QInputDialog_getItem5(parent.cPointer(), title_ms, label_ms, items_ma, (C.int)(current)) + var _ms C.struct_miqt_string = C.QInputDialog_getItem2(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 { +func QInputDialog_GetItem3(parent *QWidget, title string, label string, items []string, current int, editable bool) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -780,13 +780,13 @@ func QInputDialog_GetItem6(parent *QWidget, title string, label string, items [] items_CArray[i] = items_i_ms } items_ma := C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} - var _ms C.struct_miqt_string = C.QInputDialog_getItem6(parent.cPointer(), title_ms, label_ms, items_ma, (C.int)(current), (C.bool)(editable)) + var _ms C.struct_miqt_string = C.QInputDialog_getItem3(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 { +func QInputDialog_GetItem4(parent *QWidget, title string, label string, items []string, current int, editable bool, ok *bool) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -805,13 +805,13 @@ func QInputDialog_GetItem7(parent *QWidget, title string, label string, items [] items_CArray[i] = items_i_ms } items_ma := C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} - 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))) + var _ms C.struct_miqt_string = C.QInputDialog_getItem4(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 { +func QInputDialog_GetItem5(parent *QWidget, title string, label string, items []string, current int, editable bool, ok *bool, flags WindowType) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -830,13 +830,13 @@ func QInputDialog_GetItem8(parent *QWidget, title string, label string, items [] items_CArray[i] = items_i_ms } items_ma := C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} - 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)) + var _ms C.struct_miqt_string = C.QInputDialog_getItem5(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 { +func QInputDialog_GetItem6(parent *QWidget, title string, label string, items []string, current int, editable bool, ok *bool, flags WindowType, inputMethodHints InputMethodHint) string { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -855,13 +855,13 @@ func QInputDialog_GetItem9(parent *QWidget, title string, label string, items [] items_CArray[i] = items_i_ms } items_ma := C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} - 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)) + var _ms C.struct_miqt_string = C.QInputDialog_getItem6(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 { +func QInputDialog_GetInt2(parent *QWidget, title string, label string, value int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -870,10 +870,10 @@ func QInputDialog_GetInt4(parent *QWidget, title string, label string, value int 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))) + return (int)(C.QInputDialog_getInt2(parent.cPointer(), title_ms, label_ms, (C.int)(value))) } -func QInputDialog_GetInt5(parent *QWidget, title string, label string, value int, minValue int) int { +func QInputDialog_GetInt3(parent *QWidget, title string, label string, value int, minValue int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -882,10 +882,10 @@ func QInputDialog_GetInt5(parent *QWidget, title string, label string, value int 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))) + return (int)(C.QInputDialog_getInt3(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 { +func QInputDialog_GetInt4(parent *QWidget, title string, label string, value int, minValue int, maxValue int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -894,10 +894,10 @@ func QInputDialog_GetInt6(parent *QWidget, title string, label string, value int 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))) + return (int)(C.QInputDialog_getInt4(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 { +func QInputDialog_GetInt5(parent *QWidget, title string, label string, value int, minValue int, maxValue int, step int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -906,10 +906,10 @@ func QInputDialog_GetInt7(parent *QWidget, title string, label string, value int 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))) + return (int)(C.QInputDialog_getInt5(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 { +func QInputDialog_GetInt6(parent *QWidget, title string, label string, value int, minValue int, maxValue int, step int, ok *bool) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -918,10 +918,10 @@ func QInputDialog_GetInt8(parent *QWidget, title string, label string, value int 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)))) + return (int)(C.QInputDialog_getInt6(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 { +func QInputDialog_GetInt7(parent *QWidget, title string, label string, value int, minValue int, maxValue int, step int, ok *bool, flags WindowType) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -930,10 +930,10 @@ func QInputDialog_GetInt9(parent *QWidget, title string, label string, value int 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))) + return (int)(C.QInputDialog_getInt7(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 { +func QInputDialog_GetDouble2(parent *QWidget, title string, label string, value float64) float64 { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -942,10 +942,10 @@ func QInputDialog_GetDouble4(parent *QWidget, title string, label string, value 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))) + return (float64)(C.QInputDialog_getDouble2(parent.cPointer(), title_ms, label_ms, (C.double)(value))) } -func QInputDialog_GetDouble5(parent *QWidget, title string, label string, value float64, minValue float64) float64 { +func QInputDialog_GetDouble3(parent *QWidget, title string, label string, value float64, minValue float64) float64 { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -954,10 +954,10 @@ func QInputDialog_GetDouble5(parent *QWidget, title string, label string, value 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))) + return (float64)(C.QInputDialog_getDouble3(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 { +func QInputDialog_GetDouble4(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64) float64 { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -966,10 +966,10 @@ func QInputDialog_GetDouble6(parent *QWidget, title string, label string, value 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))) + return (float64)(C.QInputDialog_getDouble4(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 { +func QInputDialog_GetDouble5(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int) float64 { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -978,10 +978,10 @@ func QInputDialog_GetDouble7(parent *QWidget, title string, label string, value 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))) + return (float64)(C.QInputDialog_getDouble5(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 { +func QInputDialog_GetDouble6(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int, ok *bool) float64 { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -990,10 +990,10 @@ func QInputDialog_GetDouble8(parent *QWidget, title string, label string, value 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)))) + return (float64)(C.QInputDialog_getDouble6(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 { +func QInputDialog_GetDouble7(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int, ok *bool, flags WindowType) float64 { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1002,10 +1002,10 @@ func QInputDialog_GetDouble9(parent *QWidget, title string, label string, value 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))) + return (float64)(C.QInputDialog_getDouble7(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))) } -func QInputDialog_GetDouble10(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int, ok *bool, flags WindowType, step float64) float64 { +func QInputDialog_GetDouble8(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int, ok *bool, flags WindowType, step float64) float64 { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1014,7 +1014,7 @@ func QInputDialog_GetDouble10(parent *QWidget, title string, label string, value 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_getDouble10(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))) + 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)), (C.int)(flags), (C.double)(step))) } // AdjustPosition can only be called from a QInputDialog that was directly constructed. diff --git a/qt6/gen_qinputdialog.h b/qt6/gen_qinputdialog.h index ff4ea1b5..9d9d5fb7 100644 --- a/qt6/gen_qinputdialog.h +++ b/qt6/gen_qinputdialog.h @@ -157,33 +157,33 @@ 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); 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); -double QInputDialog_getDouble10(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_getText2(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo); +struct miqt_string QInputDialog_getText3(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text); +struct miqt_string QInputDialog_getText4(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text, bool* ok); +struct miqt_string QInputDialog_getText5(QWidget* parent, struct miqt_string title, struct miqt_string label, int echo, struct miqt_string text, bool* ok, int flags); +struct miqt_string QInputDialog_getText6(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_getMultiLineText2(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text); +struct miqt_string QInputDialog_getMultiLineText3(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text, bool* ok); +struct miqt_string QInputDialog_getMultiLineText4(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text, bool* ok, int flags); +struct miqt_string QInputDialog_getMultiLineText5(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_string text, bool* ok, int flags, int inputMethodHints); +struct miqt_string QInputDialog_getItem2(QWidget* parent, struct miqt_string title, struct miqt_string label, struct miqt_array /* of struct miqt_string */ items, int current); +struct miqt_string QInputDialog_getItem3(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_getItem4(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_getItem5(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_getItem6(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_getInt2(QWidget* parent, struct miqt_string title, struct miqt_string label, int value); +int QInputDialog_getInt3(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue); +int QInputDialog_getInt4(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue); +int QInputDialog_getInt5(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue, int step); +int QInputDialog_getInt6(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue, int step, bool* ok); +int QInputDialog_getInt7(QWidget* parent, struct miqt_string title, struct miqt_string label, int value, int minValue, int maxValue, int step, bool* ok, int flags); +double QInputDialog_getDouble2(QWidget* parent, struct miqt_string title, struct miqt_string label, double value); +double QInputDialog_getDouble3(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue); +double QInputDialog_getDouble4(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue); +double QInputDialog_getDouble5(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals); +double QInputDialog_getDouble6(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals, bool* ok); +double QInputDialog_getDouble7(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags); +double QInputDialog_getDouble8(QWidget* parent, struct miqt_string title, struct miqt_string label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags, double step); bool QInputDialog_override_virtual_minimumSizeHint(void* self, intptr_t slot); QSize* QInputDialog_virtualbase_minimumSizeHint(const void* self); bool QInputDialog_override_virtual_sizeHint(void* self, intptr_t slot); diff --git a/qt6/gen_qiodevice.cpp b/qt6/gen_qiodevice.cpp index 356f530b..791980c6 100644 --- a/qt6/gen_qiodevice.cpp +++ b/qt6/gen_qiodevice.cpp @@ -843,7 +843,7 @@ struct miqt_string QIODevice_tr3(const char* s, const char* c, int n) { return _ms; } -struct miqt_string QIODevice_readLine1(QIODevice* self, long long maxlen) { +struct miqt_string QIODevice_readLineWithMaxlen(QIODevice* self, long long maxlen) { QByteArray _qb = self->readLine(static_cast(maxlen)); struct miqt_string _ms; _ms.len = _qb.length(); diff --git a/qt6/gen_qiodevice.go b/qt6/gen_qiodevice.go index 3b7cd795..1ffeb11c 100644 --- a/qt6/gen_qiodevice.go +++ b/qt6/gen_qiodevice.go @@ -429,8 +429,8 @@ func QIODevice_Tr3(s string, c string, n int) string { return _ret } -func (this *QIODevice) ReadLine1(maxlen int64) []byte { - var _bytearray C.struct_miqt_string = C.QIODevice_readLine1(this.h, (C.longlong)(maxlen)) +func (this *QIODevice) ReadLineWithMaxlen(maxlen int64) []byte { + var _bytearray C.struct_miqt_string = C.QIODevice_readLineWithMaxlen(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 diff --git a/qt6/gen_qiodevice.h b/qt6/gen_qiodevice.h index 4e186aab..90543481 100644 --- a/qt6/gen_qiodevice.h +++ b/qt6/gen_qiodevice.h @@ -102,7 +102,7 @@ long long QIODevice_skipData(QIODevice* self, long long maxSize); long long QIODevice_writeData(QIODevice* self, const char* data, long long len); 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_readLine1(QIODevice* self, long long maxlen); +struct miqt_string QIODevice_readLineWithMaxlen(QIODevice* self, long long maxlen); bool QIODevice_override_virtual_isSequential(void* self, intptr_t slot); bool QIODevice_virtualbase_isSequential(const void* self); bool QIODevice_override_virtual_open(void* self, intptr_t slot); diff --git a/qt6/gen_qitemselectionmodel.cpp b/qt6/gen_qitemselectionmodel.cpp index b6266814..accdff47 100644 --- a/qt6/gen_qitemselectionmodel.cpp +++ b/qt6/gen_qitemselectionmodel.cpp @@ -691,7 +691,7 @@ bool QItemSelectionModel_columnIntersectsSelection2(const QItemSelectionModel* s return self->columnIntersectsSelection(static_cast(column), *parent); } -struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedRows1(const QItemSelectionModel* self, int column) { +struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedRowsWithColumn(const QItemSelectionModel* self, int column) { QModelIndexList _ret = self->selectedRows(static_cast(column)); // Convert QList<> from C++ memory to manually-managed C memory QModelIndex** _arr = static_cast(malloc(sizeof(QModelIndex*) * _ret.length())); @@ -704,7 +704,7 @@ struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedRows1(const return _out; } -struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedColumns1(const QItemSelectionModel* self, int row) { +struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedColumnsWithRow(const QItemSelectionModel* self, int row) { QModelIndexList _ret = self->selectedColumns(static_cast(row)); // Convert QList<> from C++ memory to manually-managed C memory QModelIndex** _arr = static_cast(malloc(sizeof(QModelIndex*) * _ret.length())); diff --git a/qt6/gen_qitemselectionmodel.go b/qt6/gen_qitemselectionmodel.go index b2c6f542..82201461 100644 --- a/qt6/gen_qitemselectionmodel.go +++ b/qt6/gen_qitemselectionmodel.go @@ -523,8 +523,8 @@ func (this *QItemSelectionModel) ColumnIntersectsSelection2(column int, parent * return (bool)(C.QItemSelectionModel_columnIntersectsSelection2(this.h, (C.int)(column), parent.cPointer())) } -func (this *QItemSelectionModel) SelectedRows1(column int) []QModelIndex { - var _ma C.struct_miqt_array = C.QItemSelectionModel_selectedRows1(this.h, (C.int)(column)) +func (this *QItemSelectionModel) SelectedRowsWithColumn(column int) []QModelIndex { + var _ma C.struct_miqt_array = C.QItemSelectionModel_selectedRowsWithColumn(this.h, (C.int)(column)) _ret := make([]QModelIndex, int(_ma.len)) _outCast := (*[0xffff]*C.QModelIndex)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -535,8 +535,8 @@ func (this *QItemSelectionModel) SelectedRows1(column int) []QModelIndex { return _ret } -func (this *QItemSelectionModel) SelectedColumns1(row int) []QModelIndex { - var _ma C.struct_miqt_array = C.QItemSelectionModel_selectedColumns1(this.h, (C.int)(row)) +func (this *QItemSelectionModel) SelectedColumnsWithRow(row int) []QModelIndex { + var _ma C.struct_miqt_array = C.QItemSelectionModel_selectedColumnsWithRow(this.h, (C.int)(row)) _ret := make([]QModelIndex, int(_ma.len)) _outCast := (*[0xffff]*C.QModelIndex)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt6/gen_qitemselectionmodel.h b/qt6/gen_qitemselectionmodel.h index b6a8a09c..f9a3f98b 100644 --- a/qt6/gen_qitemselectionmodel.h +++ b/qt6/gen_qitemselectionmodel.h @@ -112,8 +112,8 @@ bool QItemSelectionModel_isRowSelected2(const QItemSelectionModel* self, int row bool QItemSelectionModel_isColumnSelected2(const QItemSelectionModel* self, int column, QModelIndex* parent); bool QItemSelectionModel_rowIntersectsSelection2(const QItemSelectionModel* self, int row, QModelIndex* parent); bool QItemSelectionModel_columnIntersectsSelection2(const QItemSelectionModel* self, int column, QModelIndex* parent); -struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedRows1(const QItemSelectionModel* self, int column); -struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedColumns1(const QItemSelectionModel* self, int row); +struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedRowsWithColumn(const QItemSelectionModel* self, int column); +struct miqt_array /* of QModelIndex* */ QItemSelectionModel_selectedColumnsWithRow(const QItemSelectionModel* self, int row); bool QItemSelectionModel_override_virtual_setCurrentIndex(void* self, intptr_t slot); void QItemSelectionModel_virtualbase_setCurrentIndex(void* self, QModelIndex* index, int command); bool QItemSelectionModel_override_virtual_select(void* self, intptr_t slot); diff --git a/qt6/gen_qjsonarray.cpp b/qt6/gen_qjsonarray.cpp index 3b3f37e2..57c5be5a 100644 --- a/qt6/gen_qjsonarray.cpp +++ b/qt6/gen_qjsonarray.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "gen_qjsonarray.h" @@ -42,6 +43,29 @@ QJsonArray* QJsonArray_fromStringList(struct miqt_array /* of struct miqt_string return new QJsonArray(QJsonArray::fromStringList(list_QList)); } +QJsonArray* QJsonArray_fromVariantList(struct miqt_array /* of QVariant* */ list) { + QVariantList list_QList; + list_QList.reserve(list.len); + QVariant** list_arr = static_cast(list.data); + for(size_t i = 0; i < list.len; ++i) { + list_QList.push_back(*(list_arr[i])); + } + return new QJsonArray(QJsonArray::fromVariantList(list_QList)); +} + +struct miqt_array /* of QVariant* */ QJsonArray_toVariantList(const QJsonArray* self) { + QVariantList _ret = self->toVariantList(); + // Convert QList<> from C++ memory to manually-managed C memory + QVariant** _arr = static_cast(malloc(sizeof(QVariant*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = new QVariant(_ret[i]); + } + struct miqt_array _out; + _out.len = _ret.length(); + _out.data = static_cast(_arr); + return _out; +} + ptrdiff_t QJsonArray_size(const QJsonArray* self) { qsizetype _ret = self->size(); return static_cast(_ret); diff --git a/qt6/gen_qjsonarray.go b/qt6/gen_qjsonarray.go index a22ba98d..d7645f29 100644 --- a/qt6/gen_qjsonarray.go +++ b/qt6/gen_qjsonarray.go @@ -77,6 +77,30 @@ func QJsonArray_FromStringList(list []string) *QJsonArray { return _goptr } +func QJsonArray_FromVariantList(list []QVariant) *QJsonArray { + list_CArray := (*[0xffff]*C.QVariant)(C.malloc(C.size_t(8 * len(list)))) + defer C.free(unsafe.Pointer(list_CArray)) + for i := range list { + list_CArray[i] = list[i].cPointer() + } + list_ma := C.struct_miqt_array{len: C.size_t(len(list)), data: unsafe.Pointer(list_CArray)} + _goptr := newQJsonArray(C.QJsonArray_fromVariantList(list_ma)) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QJsonArray) ToVariantList() []QVariant { + var _ma C.struct_miqt_array = C.QJsonArray_toVariantList(this.h) + _ret := make([]QVariant, int(_ma.len)) + _outCast := (*[0xffff]*C.QVariant)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _lv_goptr := newQVariant(_outCast[i]) + _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + _ret[i] = *_lv_goptr + } + return _ret +} + func (this *QJsonArray) Size() int64 { return (int64)(C.QJsonArray_size(this.h)) } diff --git a/qt6/gen_qjsonarray.h b/qt6/gen_qjsonarray.h index 96a95c91..c56bc79e 100644 --- a/qt6/gen_qjsonarray.h +++ b/qt6/gen_qjsonarray.h @@ -29,6 +29,7 @@ class QJsonArray__iterator; class QJsonValue; class QJsonValueConstRef; class QJsonValueRef; +class QVariant; #else typedef struct QJsonArray QJsonArray; typedef struct QJsonArray__const_iterator QJsonArray__const_iterator; @@ -36,12 +37,15 @@ typedef struct QJsonArray__iterator QJsonArray__iterator; typedef struct QJsonValue QJsonValue; typedef struct QJsonValueConstRef QJsonValueConstRef; typedef struct QJsonValueRef QJsonValueRef; +typedef struct QVariant QVariant; #endif 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_fromVariantList(struct miqt_array /* of QVariant* */ list); +struct miqt_array /* of QVariant* */ QJsonArray_toVariantList(const QJsonArray* self); ptrdiff_t QJsonArray_size(const QJsonArray* self); ptrdiff_t QJsonArray_count(const QJsonArray* self); bool QJsonArray_isEmpty(const QJsonArray* self); diff --git a/qt6/gen_qjsondocument.cpp b/qt6/gen_qjsondocument.cpp index 46f09100..da28f737 100644 --- a/qt6/gen_qjsondocument.cpp +++ b/qt6/gen_qjsondocument.cpp @@ -134,7 +134,7 @@ QJsonDocument* QJsonDocument_fromJson2(struct miqt_string json, QJsonParseError* return new QJsonDocument(QJsonDocument::fromJson(json_QByteArray, error)); } -struct miqt_string QJsonDocument_toJson1(const QJsonDocument* self, int 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(); diff --git a/qt6/gen_qjsondocument.go b/qt6/gen_qjsondocument.go index 71f9d40e..3cb0fd9f 100644 --- a/qt6/gen_qjsondocument.go +++ b/qt6/gen_qjsondocument.go @@ -262,8 +262,8 @@ func QJsonDocument_FromJson2(json []byte, error *QJsonParseError) *QJsonDocument return _goptr } -func (this *QJsonDocument) ToJson1(format QJsonDocument__JsonFormat) []byte { - var _bytearray C.struct_miqt_string = C.QJsonDocument_toJson1(this.h, (C.int)(format)) +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 diff --git a/qt6/gen_qjsondocument.h b/qt6/gen_qjsondocument.h index 93f4bbf9..7cc1d250 100644 --- a/qt6/gen_qjsondocument.h +++ b/qt6/gen_qjsondocument.h @@ -56,7 +56,7 @@ bool QJsonDocument_operatorEqual(const QJsonDocument* self, QJsonDocument* other bool QJsonDocument_operatorNotEqual(const QJsonDocument* self, QJsonDocument* other); bool QJsonDocument_isNull(const QJsonDocument* self); QJsonDocument* QJsonDocument_fromJson2(struct miqt_string json, QJsonParseError* error); -struct miqt_string QJsonDocument_toJson1(const QJsonDocument* self, int format); +struct miqt_string QJsonDocument_toJsonWithFormat(const QJsonDocument* self, int format); void QJsonDocument_delete(QJsonDocument* self); #ifdef __cplusplus diff --git a/qt6/gen_qjsonobject.cpp b/qt6/gen_qjsonobject.cpp index 7400650e..107c21bd 100644 --- a/qt6/gen_qjsonobject.cpp +++ b/qt6/gen_qjsonobject.cpp @@ -1,3 +1,4 @@ +#include #include #define WORKAROUND_INNER_CLASS_DEFINITION_QJsonObject__const_iterator #define WORKAROUND_INNER_CLASS_DEFINITION_QJsonObject__iterator diff --git a/qt6/gen_qjsonvalue.cpp b/qt6/gen_qjsonvalue.cpp index 5497152e..7ccee51e 100644 --- a/qt6/gen_qjsonvalue.cpp +++ b/qt6/gen_qjsonvalue.cpp @@ -185,20 +185,20 @@ bool QJsonValue_operatorNotEqual(const QJsonValue* self, QJsonValue* other) { return (*self != *other); } -bool QJsonValue_toBool1(const QJsonValue* self, bool defaultValue) { +bool QJsonValue_toBoolWithDefaultValue(const QJsonValue* self, bool defaultValue) { return self->toBool(defaultValue); } -int QJsonValue_toInt1(const QJsonValue* self, int defaultValue) { +int QJsonValue_toIntWithDefaultValue(const QJsonValue* self, int defaultValue) { return self->toInt(static_cast(defaultValue)); } -long long QJsonValue_toInteger1(const QJsonValue* self, long long defaultValue) { +long long QJsonValue_toIntegerWithDefaultValue(const QJsonValue* self, long long defaultValue) { qint64 _ret = self->toInteger(static_cast(defaultValue)); return static_cast(_ret); } -double QJsonValue_toDouble1(const QJsonValue* self, double defaultValue) { +double QJsonValue_toDoubleWithDefaultValue(const QJsonValue* self, double defaultValue) { return self->toDouble(static_cast(defaultValue)); } @@ -299,24 +299,24 @@ bool QJsonValueConstRef_operatorNotEqual(const QJsonValueConstRef* self, QJsonVa return (*self != *other); } -bool QJsonValueConstRef_toBool1(const QJsonValueConstRef* self, bool defaultValue) { +bool QJsonValueConstRef_toBoolWithDefaultValue(const QJsonValueConstRef* self, bool defaultValue) { return self->toBool(defaultValue); } -int QJsonValueConstRef_toInt1(const QJsonValueConstRef* self, int defaultValue) { +int QJsonValueConstRef_toIntWithDefaultValue(const QJsonValueConstRef* self, int defaultValue) { return self->toInt(static_cast(defaultValue)); } -long long QJsonValueConstRef_toInteger1(const QJsonValueConstRef* self, long long defaultValue) { +long long QJsonValueConstRef_toIntegerWithDefaultValue(const QJsonValueConstRef* self, long long defaultValue) { qint64 _ret = self->toInteger(static_cast(defaultValue)); return static_cast(_ret); } -double QJsonValueConstRef_toDouble1(const QJsonValueConstRef* self, double defaultValue) { +double QJsonValueConstRef_toDoubleWithDefaultValue(const QJsonValueConstRef* self, double defaultValue) { return self->toDouble(static_cast(defaultValue)); } -struct miqt_string QJsonValueConstRef_toString1(const QJsonValueConstRef* self, struct miqt_string defaultValue) { +struct miqt_string QJsonValueConstRef_toStringWithDefaultValue(const QJsonValueConstRef* 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 @@ -445,24 +445,24 @@ bool QJsonValueRef_operatorNotEqual(const QJsonValueRef* self, QJsonValue* other return (*self != *other); } -bool QJsonValueRef_toBool1(const QJsonValueRef* self, bool defaultValue) { +bool QJsonValueRef_toBoolWithDefaultValue(const QJsonValueRef* self, bool defaultValue) { return self->toBool(defaultValue); } -int QJsonValueRef_toInt1(const QJsonValueRef* self, int defaultValue) { +int QJsonValueRef_toIntWithDefaultValue(const QJsonValueRef* self, int defaultValue) { return self->toInt(static_cast(defaultValue)); } -long long QJsonValueRef_toInteger1(const QJsonValueRef* self, long long defaultValue) { +long long QJsonValueRef_toIntegerWithDefaultValue(const QJsonValueRef* self, long long defaultValue) { qint64 _ret = self->toInteger(static_cast(defaultValue)); return static_cast(_ret); } -double QJsonValueRef_toDouble1(const QJsonValueRef* self, double defaultValue) { +double QJsonValueRef_toDoubleWithDefaultValue(const QJsonValueRef* self, double defaultValue) { return self->toDouble(static_cast(defaultValue)); } -struct miqt_string QJsonValueRef_toString1(const QJsonValueRef* self, struct miqt_string defaultValue) { +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 diff --git a/qt6/gen_qjsonvalue.go b/qt6/gen_qjsonvalue.go index aafbd70e..ac89f89f 100644 --- a/qt6/gen_qjsonvalue.go +++ b/qt6/gen_qjsonvalue.go @@ -263,20 +263,20 @@ func (this *QJsonValue) OperatorNotEqual(other *QJsonValue) bool { return (bool)(C.QJsonValue_operatorNotEqual(this.h, other.cPointer())) } -func (this *QJsonValue) ToBool1(defaultValue bool) bool { - return (bool)(C.QJsonValue_toBool1(this.h, (C.bool)(defaultValue))) +func (this *QJsonValue) ToBoolWithDefaultValue(defaultValue bool) bool { + return (bool)(C.QJsonValue_toBoolWithDefaultValue(this.h, (C.bool)(defaultValue))) } -func (this *QJsonValue) ToInt1(defaultValue int) int { - return (int)(C.QJsonValue_toInt1(this.h, (C.int)(defaultValue))) +func (this *QJsonValue) ToIntWithDefaultValue(defaultValue int) int { + return (int)(C.QJsonValue_toIntWithDefaultValue(this.h, (C.int)(defaultValue))) } -func (this *QJsonValue) ToInteger1(defaultValue int64) int64 { - return (int64)(C.QJsonValue_toInteger1(this.h, (C.longlong)(defaultValue))) +func (this *QJsonValue) ToIntegerWithDefaultValue(defaultValue int64) int64 { + return (int64)(C.QJsonValue_toIntegerWithDefaultValue(this.h, (C.longlong)(defaultValue))) } -func (this *QJsonValue) ToDouble1(defaultValue float64) float64 { - return (float64)(C.QJsonValue_toDouble1(this.h, (C.double)(defaultValue))) +func (this *QJsonValue) ToDoubleWithDefaultValue(defaultValue float64) float64 { + return (float64)(C.QJsonValue_toDoubleWithDefaultValue(this.h, (C.double)(defaultValue))) } // Delete this object from C++ memory. @@ -424,28 +424,28 @@ func (this *QJsonValueConstRef) OperatorNotEqual(other *QJsonValue) bool { return (bool)(C.QJsonValueConstRef_operatorNotEqual(this.h, other.cPointer())) } -func (this *QJsonValueConstRef) ToBool1(defaultValue bool) bool { - return (bool)(C.QJsonValueConstRef_toBool1(this.h, (C.bool)(defaultValue))) +func (this *QJsonValueConstRef) ToBoolWithDefaultValue(defaultValue bool) bool { + return (bool)(C.QJsonValueConstRef_toBoolWithDefaultValue(this.h, (C.bool)(defaultValue))) } -func (this *QJsonValueConstRef) ToInt1(defaultValue int) int { - return (int)(C.QJsonValueConstRef_toInt1(this.h, (C.int)(defaultValue))) +func (this *QJsonValueConstRef) ToIntWithDefaultValue(defaultValue int) int { + return (int)(C.QJsonValueConstRef_toIntWithDefaultValue(this.h, (C.int)(defaultValue))) } -func (this *QJsonValueConstRef) ToInteger1(defaultValue int64) int64 { - return (int64)(C.QJsonValueConstRef_toInteger1(this.h, (C.longlong)(defaultValue))) +func (this *QJsonValueConstRef) ToIntegerWithDefaultValue(defaultValue int64) int64 { + return (int64)(C.QJsonValueConstRef_toIntegerWithDefaultValue(this.h, (C.longlong)(defaultValue))) } -func (this *QJsonValueConstRef) ToDouble1(defaultValue float64) float64 { - return (float64)(C.QJsonValueConstRef_toDouble1(this.h, (C.double)(defaultValue))) +func (this *QJsonValueConstRef) ToDoubleWithDefaultValue(defaultValue float64) float64 { + return (float64)(C.QJsonValueConstRef_toDoubleWithDefaultValue(this.h, (C.double)(defaultValue))) } -func (this *QJsonValueConstRef) ToString1(defaultValue string) string { +func (this *QJsonValueConstRef) ToStringWithDefaultValue(defaultValue string) string { 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.QJsonValueConstRef_toString1(this.h, defaultValue_ms) + var _ms C.struct_miqt_string = C.QJsonValueConstRef_toStringWithDefaultValue(this.h, defaultValue_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -620,28 +620,28 @@ func (this *QJsonValueRef) OperatorNotEqual(other *QJsonValue) bool { return (bool)(C.QJsonValueRef_operatorNotEqual(this.h, other.cPointer())) } -func (this *QJsonValueRef) ToBool1(defaultValue bool) bool { - return (bool)(C.QJsonValueRef_toBool1(this.h, (C.bool)(defaultValue))) +func (this *QJsonValueRef) ToBoolWithDefaultValue(defaultValue bool) bool { + return (bool)(C.QJsonValueRef_toBoolWithDefaultValue(this.h, (C.bool)(defaultValue))) } -func (this *QJsonValueRef) ToInt1(defaultValue int) int { - return (int)(C.QJsonValueRef_toInt1(this.h, (C.int)(defaultValue))) +func (this *QJsonValueRef) ToIntWithDefaultValue(defaultValue int) int { + return (int)(C.QJsonValueRef_toIntWithDefaultValue(this.h, (C.int)(defaultValue))) } -func (this *QJsonValueRef) ToInteger1(defaultValue int64) int64 { - return (int64)(C.QJsonValueRef_toInteger1(this.h, (C.longlong)(defaultValue))) +func (this *QJsonValueRef) ToIntegerWithDefaultValue(defaultValue int64) int64 { + return (int64)(C.QJsonValueRef_toIntegerWithDefaultValue(this.h, (C.longlong)(defaultValue))) } -func (this *QJsonValueRef) ToDouble1(defaultValue float64) float64 { - return (float64)(C.QJsonValueRef_toDouble1(this.h, (C.double)(defaultValue))) +func (this *QJsonValueRef) ToDoubleWithDefaultValue(defaultValue float64) float64 { + return (float64)(C.QJsonValueRef_toDoubleWithDefaultValue(this.h, (C.double)(defaultValue))) } -func (this *QJsonValueRef) ToString1(defaultValue string) string { +func (this *QJsonValueRef) ToStringWithDefaultValue(defaultValue string) string { 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_toString1(this.h, defaultValue_ms) + 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/qt6/gen_qjsonvalue.h b/qt6/gen_qjsonvalue.h index fc61a390..eb842b29 100644 --- a/qt6/gen_qjsonvalue.h +++ b/qt6/gen_qjsonvalue.h @@ -67,10 +67,10 @@ QJsonValue* QJsonValue_operatorSubscript(const QJsonValue* self, struct miqt_str QJsonValue* QJsonValue_operatorSubscriptWithQsizetype(const QJsonValue* self, ptrdiff_t i); bool QJsonValue_operatorEqual(const QJsonValue* self, QJsonValue* other); bool QJsonValue_operatorNotEqual(const QJsonValue* self, QJsonValue* other); -bool QJsonValue_toBool1(const QJsonValue* self, bool defaultValue); -int QJsonValue_toInt1(const QJsonValue* self, int defaultValue); -long long QJsonValue_toInteger1(const QJsonValue* self, long long defaultValue); -double QJsonValue_toDouble1(const QJsonValue* self, double defaultValue); +bool QJsonValue_toBoolWithDefaultValue(const QJsonValue* self, bool defaultValue); +int QJsonValue_toIntWithDefaultValue(const QJsonValue* self, int defaultValue); +long long QJsonValue_toIntegerWithDefaultValue(const QJsonValue* self, long long defaultValue); +double QJsonValue_toDoubleWithDefaultValue(const QJsonValue* self, double defaultValue); void QJsonValue_delete(QJsonValue* self); QJsonValueConstRef* QJsonValueConstRef_new(QJsonValueConstRef* param1); @@ -94,11 +94,11 @@ QJsonObject* QJsonValueConstRef_toObject(const QJsonValueConstRef* self); QJsonValue* QJsonValueConstRef_operatorSubscriptWithQsizetype(const QJsonValueConstRef* self, ptrdiff_t i); bool QJsonValueConstRef_operatorEqual(const QJsonValueConstRef* self, QJsonValue* other); bool QJsonValueConstRef_operatorNotEqual(const QJsonValueConstRef* self, QJsonValue* other); -bool QJsonValueConstRef_toBool1(const QJsonValueConstRef* self, bool defaultValue); -int QJsonValueConstRef_toInt1(const QJsonValueConstRef* self, int defaultValue); -long long QJsonValueConstRef_toInteger1(const QJsonValueConstRef* self, long long defaultValue); -double QJsonValueConstRef_toDouble1(const QJsonValueConstRef* self, double defaultValue); -struct miqt_string QJsonValueConstRef_toString1(const QJsonValueConstRef* self, struct miqt_string defaultValue); +bool QJsonValueConstRef_toBoolWithDefaultValue(const QJsonValueConstRef* self, bool defaultValue); +int QJsonValueConstRef_toIntWithDefaultValue(const QJsonValueConstRef* self, int defaultValue); +long long QJsonValueConstRef_toIntegerWithDefaultValue(const QJsonValueConstRef* self, long long defaultValue); +double QJsonValueConstRef_toDoubleWithDefaultValue(const QJsonValueConstRef* self, double defaultValue); +struct miqt_string QJsonValueConstRef_toStringWithDefaultValue(const QJsonValueConstRef* self, struct miqt_string defaultValue); void QJsonValueConstRef_delete(QJsonValueConstRef* self); QJsonValueRef* QJsonValueRef_new(QJsonValueRef* param1); @@ -127,11 +127,11 @@ QJsonObject* QJsonValueRef_toObject(const QJsonValueRef* self); QJsonValue* QJsonValueRef_operatorSubscriptWithQsizetype(const QJsonValueRef* self, ptrdiff_t i); bool QJsonValueRef_operatorEqual(const QJsonValueRef* self, QJsonValue* other); bool QJsonValueRef_operatorNotEqual(const QJsonValueRef* self, QJsonValue* other); -bool QJsonValueRef_toBool1(const QJsonValueRef* self, bool defaultValue); -int QJsonValueRef_toInt1(const QJsonValueRef* self, int defaultValue); -long long QJsonValueRef_toInteger1(const QJsonValueRef* self, long long defaultValue); -double QJsonValueRef_toDouble1(const QJsonValueRef* self, double defaultValue); -struct miqt_string QJsonValueRef_toString1(const QJsonValueRef* self, struct miqt_string defaultValue); +bool QJsonValueRef_toBoolWithDefaultValue(const QJsonValueRef* self, bool defaultValue); +int QJsonValueRef_toIntWithDefaultValue(const QJsonValueRef* self, int defaultValue); +long long QJsonValueRef_toIntegerWithDefaultValue(const QJsonValueRef* self, long long defaultValue); +double QJsonValueRef_toDoubleWithDefaultValue(const QJsonValueRef* self, double defaultValue); +struct miqt_string QJsonValueRef_toStringWithDefaultValue(const QJsonValueRef* self, struct miqt_string defaultValue); void QJsonValueRef_delete(QJsonValueRef* self); #ifdef __cplusplus diff --git a/qt6/gen_qkeysequence.cpp b/qt6/gen_qkeysequence.cpp index 344cc95f..baa8c4d5 100644 --- a/qt6/gen_qkeysequence.cpp +++ b/qt6/gen_qkeysequence.cpp @@ -192,7 +192,7 @@ bool QKeySequence_isDetached(const QKeySequence* self) { return self->isDetached(); } -struct miqt_string QKeySequence_toString1(const QKeySequence* self, int format) { +struct miqt_string QKeySequence_toStringWithFormat(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(); diff --git a/qt6/gen_qkeysequence.go b/qt6/gen_qkeysequence.go index a64b3955..c10707e7 100644 --- a/qt6/gen_qkeysequence.go +++ b/qt6/gen_qkeysequence.go @@ -350,8 +350,8 @@ func (this *QKeySequence) IsDetached() bool { return (bool)(C.QKeySequence_isDetached(this.h)) } -func (this *QKeySequence) ToString1(format QKeySequence__SequenceFormat) string { - var _ms C.struct_miqt_string = C.QKeySequence_toString1(this.h, (C.int)(format)) +func (this *QKeySequence) ToStringWithFormat(format QKeySequence__SequenceFormat) string { + var _ms C.struct_miqt_string = C.QKeySequence_toStringWithFormat(this.h, (C.int)(format)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret diff --git a/qt6/gen_qkeysequence.h b/qt6/gen_qkeysequence.h index 003584dc..617f9499 100644 --- a/qt6/gen_qkeysequence.h +++ b/qt6/gen_qkeysequence.h @@ -57,7 +57,7 @@ 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); +struct miqt_string QKeySequence_toStringWithFormat(const QKeySequence* self, int format); QKeySequence* QKeySequence_fromString2(struct miqt_string str, int format); struct miqt_array /* of QKeySequence* */ QKeySequence_listFromString2(struct miqt_string str, int format); struct miqt_string QKeySequence_listToString2(struct miqt_array /* of QKeySequence* */ list, int format); diff --git a/qt6/gen_qlayoutitem.cpp b/qt6/gen_qlayoutitem.cpp index 6135a5a5..b9fa3d2c 100644 --- a/qt6/gen_qlayoutitem.cpp +++ b/qt6/gen_qlayoutitem.cpp @@ -957,11 +957,11 @@ QSizePolicy* QSpacerItem_sizePolicy(const QSpacerItem* self) { return new QSizePolicy(self->sizePolicy()); } -void QSpacerItem_changeSize3(QSpacerItem* self, int w, int h, int hData) { +void QSpacerItem_changeSize2(QSpacerItem* self, int w, int h, int hData) { self->changeSize(static_cast(w), static_cast(h), static_cast(hData)); } -void QSpacerItem_changeSize4(QSpacerItem* self, int w, int h, int hData, int vData) { +void QSpacerItem_changeSize3(QSpacerItem* self, int w, int h, int hData, int vData) { self->changeSize(static_cast(w), static_cast(h), static_cast(hData), static_cast(vData)); } diff --git a/qt6/gen_qlayoutitem.go b/qt6/gen_qlayoutitem.go index 69ddffb7..9210af23 100644 --- a/qt6/gen_qlayoutitem.go +++ b/qt6/gen_qlayoutitem.go @@ -602,12 +602,12 @@ func (this *QSpacerItem) SizePolicy() *QSizePolicy { return _goptr } -func (this *QSpacerItem) ChangeSize3(w int, h int, hData QSizePolicy__Policy) { - C.QSpacerItem_changeSize3(this.h, (C.int)(w), (C.int)(h), (C.int)(hData)) +func (this *QSpacerItem) ChangeSize2(w int, h int, hData QSizePolicy__Policy) { + C.QSpacerItem_changeSize2(this.h, (C.int)(w), (C.int)(h), (C.int)(hData)) } -func (this *QSpacerItem) ChangeSize4(w int, h int, hData QSizePolicy__Policy, vData QSizePolicy__Policy) { - C.QSpacerItem_changeSize4(this.h, (C.int)(w), (C.int)(h), (C.int)(hData), (C.int)(vData)) +func (this *QSpacerItem) ChangeSize3(w int, h int, hData QSizePolicy__Policy, vData QSizePolicy__Policy) { + C.QSpacerItem_changeSize3(this.h, (C.int)(w), (C.int)(h), (C.int)(hData), (C.int)(vData)) } func (this *QSpacerItem) callVirtualBase_SizeHint() *QSize { diff --git a/qt6/gen_qlayoutitem.h b/qt6/gen_qlayoutitem.h index b08f4481..380dc239 100644 --- a/qt6/gen_qlayoutitem.h +++ b/qt6/gen_qlayoutitem.h @@ -103,8 +103,8 @@ void QSpacerItem_setGeometry(QSpacerItem* self, QRect* geometry); QRect* QSpacerItem_geometry(const QSpacerItem* self); QSpacerItem* QSpacerItem_spacerItem(QSpacerItem* self); QSizePolicy* QSpacerItem_sizePolicy(const QSpacerItem* self); -void QSpacerItem_changeSize3(QSpacerItem* self, int w, int h, int hData); -void QSpacerItem_changeSize4(QSpacerItem* self, int w, int h, int hData, int vData); +void QSpacerItem_changeSize2(QSpacerItem* self, int w, int h, int hData); +void QSpacerItem_changeSize3(QSpacerItem* self, int w, int h, int hData, int vData); bool QSpacerItem_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QSpacerItem_virtualbase_sizeHint(const void* self); bool QSpacerItem_override_virtual_minimumSize(void* self, intptr_t slot); diff --git a/qt6/gen_qlistwidget.cpp b/qt6/gen_qlistwidget.cpp index 81b4fa9e..35538008 100644 --- a/qt6/gen_qlistwidget.cpp +++ b/qt6/gen_qlistwidget.cpp @@ -2900,7 +2900,7 @@ struct miqt_string QListWidget_tr3(const char* s, const char* c, int n) { return _ms; } -void QListWidget_sortItems1(QListWidget* self, int order) { +void QListWidget_sortItemsWithOrder(QListWidget* self, int order) { self->sortItems(static_cast(order)); } diff --git a/qt6/gen_qlistwidget.go b/qt6/gen_qlistwidget.go index 5ffc74dc..70dbd30d 100644 --- a/qt6/gen_qlistwidget.go +++ b/qt6/gen_qlistwidget.go @@ -1007,8 +1007,8 @@ func QListWidget_Tr3(s string, c string, n int) string { return _ret } -func (this *QListWidget) SortItems1(order SortOrder) { - C.QListWidget_sortItems1(this.h, (C.int)(order)) +func (this *QListWidget) SortItemsWithOrder(order SortOrder) { + C.QListWidget_sortItemsWithOrder(this.h, (C.int)(order)) } func (this *QListWidget) ScrollToItem2(item *QListWidgetItem, hint QAbstractItemView__ScrollHint) { diff --git a/qt6/gen_qlistwidget.h b/qt6/gen_qlistwidget.h index 825b74c8..784e32bb 100644 --- a/qt6/gen_qlistwidget.h +++ b/qt6/gen_qlistwidget.h @@ -256,7 +256,7 @@ bool QListWidget_dropMimeData(QListWidget* self, int index, QMimeData* data, int int QListWidget_supportedDropActions(const QListWidget* self); struct miqt_string QListWidget_tr2(const char* s, const char* c); struct miqt_string QListWidget_tr3(const char* s, const char* c, int n); -void QListWidget_sortItems1(QListWidget* self, int order); +void QListWidget_sortItemsWithOrder(QListWidget* self, int order); void QListWidget_scrollToItem2(QListWidget* self, QListWidgetItem* item, int hint); bool QListWidget_override_virtual_setSelectionModel(void* self, intptr_t slot); void QListWidget_virtualbase_setSelectionModel(void* self, QItemSelectionModel* selectionModel); diff --git a/qt6/gen_qlocale.cpp b/qt6/gen_qlocale.cpp index ff1270f4..68e6e6ef 100644 --- a/qt6/gen_qlocale.cpp +++ b/qt6/gen_qlocale.cpp @@ -27,11 +27,11 @@ QLocale* QLocale_new2(struct miqt_string name) { return new QLocale(name_QString); } -QLocale* QLocale_new3(uint16_t language, uint16_t territory) { +QLocale* QLocale_new3(unsigned short language, unsigned short territory) { return new QLocale(static_cast(language), static_cast(territory)); } -QLocale* QLocale_new4(uint16_t language) { +QLocale* QLocale_new4(unsigned short language) { return new QLocale(static_cast(language)); } @@ -39,11 +39,11 @@ QLocale* QLocale_new5(QLocale* other) { return new QLocale(*other); } -QLocale* QLocale_new6(uint16_t language, uint16_t script) { +QLocale* QLocale_new6(unsigned short language, unsigned short script) { return new QLocale(static_cast(language), static_cast(script)); } -QLocale* QLocale_new7(uint16_t language, uint16_t script, uint16_t territory) { +QLocale* QLocale_new7(unsigned short language, unsigned short script, unsigned short territory) { return new QLocale(static_cast(language), static_cast(script), static_cast(territory)); } @@ -55,24 +55,24 @@ void QLocale_swap(QLocale* self, QLocale* other) { self->swap(*other); } -uint16_t QLocale_language(const QLocale* self) { +unsigned short QLocale_language(const QLocale* self) { QLocale::Language _ret = self->language(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QLocale_script(const QLocale* self) { +unsigned short QLocale_script(const QLocale* self) { QLocale::Script _ret = self->script(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QLocale_territory(const QLocale* self) { +unsigned short QLocale_territory(const QLocale* self) { QLocale::Territory _ret = self->territory(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QLocale_country(const QLocale* self) { +unsigned short QLocale_country(const QLocale* self) { QLocale::Country _ret = self->country(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string QLocale_name(const QLocale* self) { @@ -130,15 +130,15 @@ struct miqt_string QLocale_nativeCountryName(const QLocale* self) { return _ms; } -int16_t QLocale_toShort(const QLocale* self, struct miqt_string s) { +short 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) { +unsigned short 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); + return static_cast(_ret); } int QLocale_toInt(const QLocale* self, struct miqt_string s) { @@ -229,7 +229,7 @@ struct miqt_string QLocale_toStringWithUlong(const QLocale* self, unsigned long return _ms; } -struct miqt_string QLocale_toStringWithShort(const QLocale* self, int16_t i) { +struct miqt_string QLocale_toStringWithShort(const QLocale* self, short 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(); @@ -240,7 +240,7 @@ struct miqt_string QLocale_toStringWithShort(const QLocale* self, int16_t i) { return _ms; } -struct miqt_string QLocale_toStringWithUshort(const QLocale* self, uint16_t i) { +struct miqt_string QLocale_toStringWithUshort(const QLocale* self, unsigned short 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(); @@ -707,7 +707,7 @@ struct miqt_string QLocale_toCurrencyStringWithQulonglong(const QLocale* self, u return _ms; } -struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, int16_t i) { +struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, short 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(); @@ -718,7 +718,7 @@ struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, int16_ return _ms; } -struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, uint16_t i) { +struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, unsigned short 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(); @@ -804,7 +804,7 @@ struct miqt_array /* of struct miqt_string */ QLocale_uiLanguages(const QLocale return _out; } -struct miqt_string QLocale_languageToCode(uint16_t language) { +struct miqt_string QLocale_languageToCode(unsigned short language) { QString _ret = QLocale::languageToCode(static_cast(language)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -815,7 +815,7 @@ struct miqt_string QLocale_languageToCode(uint16_t language) { return _ms; } -struct miqt_string QLocale_territoryToCode(uint16_t territory) { +struct miqt_string QLocale_territoryToCode(unsigned short territory) { QString _ret = QLocale::territoryToCode(static_cast(territory)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -826,7 +826,7 @@ struct miqt_string QLocale_territoryToCode(uint16_t territory) { return _ms; } -struct miqt_string QLocale_countryToCode(uint16_t country) { +struct miqt_string QLocale_countryToCode(unsigned short country) { QString _ret = QLocale::countryToCode(static_cast(country)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -837,7 +837,7 @@ struct miqt_string QLocale_countryToCode(uint16_t country) { return _ms; } -struct miqt_string QLocale_scriptToCode(uint16_t script) { +struct miqt_string QLocale_scriptToCode(unsigned short script) { QString _ret = QLocale::scriptToCode(static_cast(script)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -848,7 +848,7 @@ struct miqt_string QLocale_scriptToCode(uint16_t script) { return _ms; } -struct miqt_string QLocale_languageToString(uint16_t language) { +struct miqt_string QLocale_languageToString(unsigned short 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(); @@ -859,7 +859,7 @@ struct miqt_string QLocale_languageToString(uint16_t language) { return _ms; } -struct miqt_string QLocale_territoryToString(uint16_t territory) { +struct miqt_string QLocale_territoryToString(unsigned short territory) { QString _ret = QLocale::territoryToString(static_cast(territory)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -870,7 +870,7 @@ struct miqt_string QLocale_territoryToString(uint16_t territory) { return _ms; } -struct miqt_string QLocale_countryToString(uint16_t country) { +struct miqt_string QLocale_countryToString(unsigned short 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(); @@ -881,7 +881,7 @@ struct miqt_string QLocale_countryToString(uint16_t country) { return _ms; } -struct miqt_string QLocale_scriptToString(uint16_t script) { +struct miqt_string QLocale_scriptToString(unsigned short 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(); @@ -904,7 +904,7 @@ QLocale* QLocale_system() { return new QLocale(QLocale::system()); } -struct miqt_array /* of QLocale* */ QLocale_matchingLocales(uint16_t language, uint16_t script, uint16_t territory) { +struct miqt_array /* of QLocale* */ QLocale_matchingLocales(unsigned short language, unsigned short script, unsigned short territory) { QList _ret = QLocale::matchingLocales(static_cast(language), static_cast(script), static_cast(territory)); // Convert QList<> from C++ memory to manually-managed C memory QLocale** _arr = static_cast(malloc(sizeof(QLocale*) * _ret.length())); @@ -917,13 +917,13 @@ struct miqt_array /* of QLocale* */ QLocale_matchingLocales(uint16_t language, return _out; } -struct miqt_array /* of uint16_t */ QLocale_countriesForLanguage(uint16_t lang) { +struct miqt_array /* of unsigned short */ QLocale_countriesForLanguage(unsigned short lang) { QList _ret = QLocale::countriesForLanguage(static_cast(lang)); // Convert QList<> from C++ memory to manually-managed C memory - uint16_t* _arr = static_cast(malloc(sizeof(uint16_t) * _ret.length())); + unsigned short* _arr = static_cast(malloc(sizeof(unsigned short) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QLocale::Country _lv_ret = _ret[i]; - _arr[i] = static_cast(_lv_ret); + _arr[i] = static_cast(_lv_ret); } struct miqt_array _out; _out.len = _ret.length(); @@ -970,15 +970,15 @@ struct miqt_string QLocale_createSeparatedList(const QLocale* self, struct miqt_ return _ms; } -int16_t QLocale_toShort2(const QLocale* self, struct miqt_string s, bool* ok) { +short 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) { +unsigned short 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); + return static_cast(_ret); } int QLocale_toInt2(const QLocale* self, struct miqt_string s, bool* ok) { @@ -1025,7 +1025,7 @@ double QLocale_toDouble2(const QLocale* self, struct miqt_string s, bool* ok) { return self->toDouble(s_QString, ok); } -struct miqt_string QLocale_toString22(const QLocale* self, double f, char format) { +struct miqt_string QLocale_toString12(const QLocale* self, double f, char format) { QString _ret = self->toString(static_cast(f), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -1036,7 +1036,7 @@ struct miqt_string QLocale_toString22(const QLocale* self, double f, char format return _ms; } -struct miqt_string QLocale_toString32(const QLocale* self, double f, char format, int precision) { +struct miqt_string QLocale_toString13(const QLocale* self, double f, char format, int precision) { QString _ret = self->toString(static_cast(f), static_cast(format), static_cast(precision)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -1047,7 +1047,7 @@ struct miqt_string QLocale_toString32(const QLocale* self, double f, char format return _ms; } -struct miqt_string QLocale_toString23(const QLocale* self, float f, char format) { +struct miqt_string QLocale_toString14(const QLocale* self, float f, char format) { QString _ret = self->toString(static_cast(f), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -1058,7 +1058,7 @@ struct miqt_string QLocale_toString23(const QLocale* self, float f, char format) return _ms; } -struct miqt_string QLocale_toString33(const QLocale* self, float f, char format, int precision) { +struct miqt_string QLocale_toString15(const QLocale* self, float f, char format, int precision) { QString _ret = self->toString(static_cast(f), static_cast(format), static_cast(precision)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -1069,7 +1069,7 @@ struct miqt_string QLocale_toString33(const QLocale* self, float f, char format, return _ms; } -struct miqt_string QLocale_toString24(const QLocale* self, QDate* date, int format) { +struct miqt_string QLocale_toString16(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(); @@ -1080,7 +1080,7 @@ struct miqt_string QLocale_toString24(const QLocale* self, QDate* date, int form return _ms; } -struct miqt_string QLocale_toString25(const QLocale* self, QTime* time, int format) { +struct miqt_string QLocale_toString17(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(); @@ -1091,7 +1091,7 @@ struct miqt_string QLocale_toString25(const QLocale* self, QTime* time, int form return _ms; } -struct miqt_string QLocale_toString26(const QLocale* self, QDateTime* dateTime, int format) { +struct miqt_string QLocale_toString18(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(); @@ -1102,7 +1102,7 @@ struct miqt_string QLocale_toString26(const QLocale* self, QDateTime* dateTime, return _ms; } -struct miqt_string QLocale_dateFormat1(const QLocale* self, int format) { +struct miqt_string QLocale_dateFormatWithFormat(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(); @@ -1113,7 +1113,7 @@ struct miqt_string QLocale_dateFormat1(const QLocale* self, int format) { return _ms; } -struct miqt_string QLocale_timeFormat1(const QLocale* self, int format) { +struct miqt_string QLocale_timeFormatWithFormat(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(); @@ -1124,7 +1124,7 @@ struct miqt_string QLocale_timeFormat1(const QLocale* self, int format) { return _ms; } -struct miqt_string QLocale_dateTimeFormat1(const QLocale* self, int format) { +struct miqt_string QLocale_dateTimeFormatWithFormat(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(); @@ -1135,17 +1135,17 @@ struct miqt_string QLocale_dateTimeFormat1(const QLocale* self, int format) { return _ms; } -QDate* QLocale_toDate22(const QLocale* self, struct miqt_string string, int param2) { +QDate* QLocale_toDate5(const QLocale* self, struct miqt_string string, int param2) { QString string_QString = QString::fromUtf8(string.data, string.len); return new QDate(self->toDate(string_QString, static_cast(param2))); } -QTime* QLocale_toTime22(const QLocale* self, struct miqt_string string, int param2) { +QTime* QLocale_toTime3(const QLocale* self, struct miqt_string string, int param2) { QString string_QString = QString::fromUtf8(string.data, string.len); return new QTime(self->toTime(string_QString, static_cast(param2))); } -QDateTime* QLocale_toDateTime22(const QLocale* self, struct miqt_string string, int format) { +QDateTime* QLocale_toDateTime5(const QLocale* self, struct miqt_string string, int format) { QString string_QString = QString::fromUtf8(string.data, string.len); return new QDateTime(self->toDateTime(string_QString, static_cast(format))); } @@ -1194,7 +1194,7 @@ struct miqt_string QLocale_standaloneDayName2(const QLocale* self, int param1, i return _ms; } -struct miqt_string QLocale_currencySymbol1(const QLocale* self, int param1) { +struct miqt_string QLocale_currencySymbolWithQLocaleCurrencySymbolFormat(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(); @@ -1217,7 +1217,7 @@ struct miqt_string QLocale_toCurrencyString2(const QLocale* self, long long para return _ms; } -struct miqt_string QLocale_toCurrencyString22(const QLocale* self, unsigned long long param1, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString3(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 @@ -1229,7 +1229,7 @@ struct miqt_string QLocale_toCurrencyString22(const QLocale* self, unsigned long return _ms; } -struct miqt_string QLocale_toCurrencyString23(const QLocale* self, int16_t i, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString4(const QLocale* self, short 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 @@ -1241,7 +1241,7 @@ struct miqt_string QLocale_toCurrencyString23(const QLocale* self, int16_t i, st return _ms; } -struct miqt_string QLocale_toCurrencyString24(const QLocale* self, uint16_t i, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString5(const QLocale* self, unsigned short 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 @@ -1253,7 +1253,7 @@ struct miqt_string QLocale_toCurrencyString24(const QLocale* self, uint16_t i, s return _ms; } -struct miqt_string QLocale_toCurrencyString25(const QLocale* self, int i, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString6(const QLocale* self, int 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 @@ -1265,7 +1265,7 @@ struct miqt_string QLocale_toCurrencyString25(const QLocale* self, int i, struct return _ms; } -struct miqt_string QLocale_toCurrencyString26(const QLocale* self, unsigned int i, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString7(const QLocale* self, unsigned int 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 @@ -1277,7 +1277,7 @@ struct miqt_string QLocale_toCurrencyString26(const QLocale* self, unsigned int return _ms; } -struct miqt_string QLocale_toCurrencyString27(const QLocale* self, double param1, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString8(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 @@ -1289,7 +1289,7 @@ struct miqt_string QLocale_toCurrencyString27(const QLocale* self, double param1 return _ms; } -struct miqt_string QLocale_toCurrencyString3(const QLocale* self, double param1, struct miqt_string symbol, int precision) { +struct miqt_string QLocale_toCurrencyString9(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 @@ -1301,7 +1301,7 @@ struct miqt_string QLocale_toCurrencyString3(const QLocale* self, double param1, return _ms; } -struct miqt_string QLocale_toCurrencyString28(const QLocale* self, float i, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString10(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 @@ -1313,7 +1313,7 @@ struct miqt_string QLocale_toCurrencyString28(const QLocale* self, float i, stru return _ms; } -struct miqt_string QLocale_toCurrencyString32(const QLocale* self, float i, struct miqt_string symbol, int precision) { +struct miqt_string QLocale_toCurrencyString11(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 @@ -1347,7 +1347,7 @@ struct miqt_string QLocale_formattedDataSize3(const QLocale* self, long long byt return _ms; } -struct miqt_string QLocale_languageToCode2(uint16_t language, int codeTypes) { +struct miqt_string QLocale_languageToCode2(unsigned short language, int codeTypes) { QString _ret = QLocale::languageToCode(static_cast(language), static_cast(codeTypes)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); diff --git a/qt6/gen_qlocale.go b/qt6/gen_qlocale.go index b58e24d8..f0240bbc 100644 --- a/qt6/gen_qlocale.go +++ b/qt6/gen_qlocale.go @@ -940,13 +940,13 @@ func NewQLocale2(name string) *QLocale { // NewQLocale3 constructs a new QLocale object. func NewQLocale3(language QLocale__Language, territory QLocale__Country) *QLocale { - return newQLocale(C.QLocale_new3((C.uint16_t)(language), (C.uint16_t)(territory))) + return newQLocale(C.QLocale_new3((C.ushort)(language), (C.ushort)(territory))) } // NewQLocale4 constructs a new QLocale object. func NewQLocale4(language QLocale__Language) *QLocale { - return newQLocale(C.QLocale_new4((C.uint16_t)(language))) + return newQLocale(C.QLocale_new4((C.ushort)(language))) } // NewQLocale5 constructs a new QLocale object. @@ -958,13 +958,13 @@ func NewQLocale5(other *QLocale) *QLocale { // NewQLocale6 constructs a new QLocale object. func NewQLocale6(language QLocale__Language, script QLocale__Script) *QLocale { - return newQLocale(C.QLocale_new6((C.uint16_t)(language), (C.uint16_t)(script))) + return newQLocale(C.QLocale_new6((C.ushort)(language), (C.ushort)(script))) } // NewQLocale7 constructs a new QLocale object. func NewQLocale7(language QLocale__Language, script QLocale__Script, territory QLocale__Country) *QLocale { - return newQLocale(C.QLocale_new7((C.uint16_t)(language), (C.uint16_t)(script), (C.uint16_t)(territory))) + return newQLocale(C.QLocale_new7((C.ushort)(language), (C.ushort)(script), (C.ushort)(territory))) } func (this *QLocale) OperatorAssign(other *QLocale) { @@ -1135,14 +1135,14 @@ func (this *QLocale) ToStringWithUlong(i uint64) string { } func (this *QLocale) ToStringWithShort(i int16) string { - var _ms C.struct_miqt_string = C.QLocale_toStringWithShort(this.h, (C.int16_t)(i)) + var _ms C.struct_miqt_string = C.QLocale_toStringWithShort(this.h, (C.short)(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)) + var _ms C.struct_miqt_string = C.QLocale_toStringWithUshort(this.h, (C.ushort)(i)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1548,14 +1548,14 @@ func (this *QLocale) ToCurrencyStringWithQulonglong(param1 uint64) string { } func (this *QLocale) ToCurrencyStringWithShort(i int16) string { - var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithShort(this.h, (C.int16_t)(i)) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithShort(this.h, (C.short)(i)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyStringWithUshort(i uint16) string { - var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithUshort(this.h, (C.uint16_t)(i)) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithUshort(this.h, (C.ushort)(i)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1610,56 +1610,56 @@ func (this *QLocale) UiLanguages() []string { } func QLocale_LanguageToCode(language QLocale__Language) string { - var _ms C.struct_miqt_string = C.QLocale_languageToCode((C.uint16_t)(language)) + var _ms C.struct_miqt_string = C.QLocale_languageToCode((C.ushort)(language)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_TerritoryToCode(territory QLocale__Country) string { - var _ms C.struct_miqt_string = C.QLocale_territoryToCode((C.uint16_t)(territory)) + var _ms C.struct_miqt_string = C.QLocale_territoryToCode((C.ushort)(territory)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_CountryToCode(country QLocale__Country) string { - var _ms C.struct_miqt_string = C.QLocale_countryToCode((C.uint16_t)(country)) + var _ms C.struct_miqt_string = C.QLocale_countryToCode((C.ushort)(country)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_ScriptToCode(script QLocale__Script) string { - var _ms C.struct_miqt_string = C.QLocale_scriptToCode((C.uint16_t)(script)) + var _ms C.struct_miqt_string = C.QLocale_scriptToCode((C.ushort)(script)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_LanguageToString(language QLocale__Language) string { - var _ms C.struct_miqt_string = C.QLocale_languageToString((C.uint16_t)(language)) + var _ms C.struct_miqt_string = C.QLocale_languageToString((C.ushort)(language)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_TerritoryToString(territory QLocale__Country) string { - var _ms C.struct_miqt_string = C.QLocale_territoryToString((C.uint16_t)(territory)) + var _ms C.struct_miqt_string = C.QLocale_territoryToString((C.ushort)(territory)) _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.uint16_t)(country)) + var _ms C.struct_miqt_string = C.QLocale_countryToString((C.ushort)(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.uint16_t)(script)) + var _ms C.struct_miqt_string = C.QLocale_scriptToString((C.ushort)(script)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1682,7 +1682,7 @@ func QLocale_System() *QLocale { } func QLocale_MatchingLocales(language QLocale__Language, script QLocale__Script, territory QLocale__Country) []QLocale { - var _ma C.struct_miqt_array = C.QLocale_matchingLocales((C.uint16_t)(language), (C.uint16_t)(script), (C.uint16_t)(territory)) + var _ma C.struct_miqt_array = C.QLocale_matchingLocales((C.ushort)(language), (C.ushort)(script), (C.ushort)(territory)) _ret := make([]QLocale, int(_ma.len)) _outCast := (*[0xffff]*C.QLocale)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1694,9 +1694,9 @@ func QLocale_MatchingLocales(language QLocale__Language, script QLocale__Script, } func QLocale_CountriesForLanguage(lang QLocale__Language) []QLocale__Country { - var _ma C.struct_miqt_array = C.QLocale_countriesForLanguage((C.uint16_t)(lang)) + var _ma C.struct_miqt_array = C.QLocale_countriesForLanguage((C.ushort)(lang)) _ret := make([]QLocale__Country, int(_ma.len)) - _outCast := (*[0xffff]C.uint16_t)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.ushort)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { _ret[i] = (QLocale__Country)(_outCast[i]) } @@ -1819,102 +1819,102 @@ func (this *QLocale) ToDouble2(s string, ok *bool) float64 { return (float64)(C.QLocale_toDouble2(this.h, s_ms, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QLocale) ToString22(f float64, format int8) string { - var _ms C.struct_miqt_string = C.QLocale_toString22(this.h, (C.double)(f), (C.char)(format)) +func (this *QLocale) ToString12(f float64, format int8) string { + var _ms C.struct_miqt_string = C.QLocale_toString12(this.h, (C.double)(f), (C.char)(format)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QLocale) ToString32(f float64, format int8, precision int) string { - var _ms C.struct_miqt_string = C.QLocale_toString32(this.h, (C.double)(f), (C.char)(format), (C.int)(precision)) +func (this *QLocale) ToString13(f float64, format int8, precision int) string { + var _ms C.struct_miqt_string = C.QLocale_toString13(this.h, (C.double)(f), (C.char)(format), (C.int)(precision)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QLocale) ToString23(f float32, format int8) string { - var _ms C.struct_miqt_string = C.QLocale_toString23(this.h, (C.float)(f), (C.char)(format)) +func (this *QLocale) ToString14(f float32, format int8) string { + var _ms C.struct_miqt_string = C.QLocale_toString14(this.h, (C.float)(f), (C.char)(format)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QLocale) ToString33(f float32, format int8, precision int) string { - var _ms C.struct_miqt_string = C.QLocale_toString33(this.h, (C.float)(f), (C.char)(format), (C.int)(precision)) +func (this *QLocale) ToString15(f float32, format int8, precision int) string { + var _ms C.struct_miqt_string = C.QLocale_toString15(this.h, (C.float)(f), (C.char)(format), (C.int)(precision)) _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)) +func (this *QLocale) ToString16(date QDate, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QLocale_toString16(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)) +func (this *QLocale) ToString17(time QTime, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QLocale_toString17(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)) +func (this *QLocale) ToString18(dateTime *QDateTime, format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QLocale_toString18(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)) +func (this *QLocale) DateFormatWithFormat(format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QLocale_dateFormatWithFormat(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)) +func (this *QLocale) TimeFormatWithFormat(format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QLocale_timeFormatWithFormat(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)) +func (this *QLocale) DateTimeFormatWithFormat(format QLocale__FormatType) string { + var _ms C.struct_miqt_string = C.QLocale_dateTimeFormatWithFormat(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 { +func (this *QLocale) ToDate5(stringVal string, param2 QLocale__FormatType) *QDate { 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)) - _goptr := newQDate(C.QLocale_toDate22(this.h, stringVal_ms, (C.int)(param2))) + _goptr := newQDate(C.QLocale_toDate5(this.h, stringVal_ms, (C.int)(param2))) _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 { +func (this *QLocale) ToTime3(stringVal string, param2 QLocale__FormatType) *QTime { 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)) - _goptr := newQTime(C.QLocale_toTime22(this.h, stringVal_ms, (C.int)(param2))) + _goptr := newQTime(C.QLocale_toTime3(this.h, stringVal_ms, (C.int)(param2))) _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 { +func (this *QLocale) ToDateTime5(stringVal string, format QLocale__FormatType) *QDateTime { 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)) - _goptr := newQDateTime(C.QLocale_toDateTime22(this.h, stringVal_ms, (C.int)(format))) + _goptr := newQDateTime(C.QLocale_toDateTime5(this.h, stringVal_ms, (C.int)(format))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1947,8 +1947,8 @@ func (this *QLocale) StandaloneDayName2(param1 int, format QLocale__FormatType) return _ret } -func (this *QLocale) CurrencySymbol1(param1 QLocale__CurrencySymbolFormat) string { - var _ms C.struct_miqt_string = C.QLocale_currencySymbol1(this.h, (C.int)(param1)) +func (this *QLocale) CurrencySymbolWithQLocaleCurrencySymbolFormat(param1 QLocale__CurrencySymbolFormat) string { + var _ms C.struct_miqt_string = C.QLocale_currencySymbolWithQLocaleCurrencySymbolFormat(this.h, (C.int)(param1)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1965,100 +1965,100 @@ func (this *QLocale) ToCurrencyString2(param1 int64, symbol string) string { return _ret } -func (this *QLocale) ToCurrencyString22(param1 uint64, symbol string) string { +func (this *QLocale) ToCurrencyString3(param1 uint64, symbol string) string { 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.ulonglong)(param1), symbol_ms) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString3(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) ToCurrencyString23(i int16, symbol string) string { +func (this *QLocale) ToCurrencyString4(i int16, symbol string) string { 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.int16_t)(i), symbol_ms) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString4(this.h, (C.short)(i), symbol_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QLocale) ToCurrencyString24(i uint16, symbol string) string { +func (this *QLocale) ToCurrencyString5(i uint16, symbol string) string { 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.uint16_t)(i), symbol_ms) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString5(this.h, (C.ushort)(i), symbol_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QLocale) ToCurrencyString25(i int, symbol string) string { +func (this *QLocale) ToCurrencyString6(i int, symbol string) string { 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.int)(i), symbol_ms) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString6(this.h, (C.int)(i), symbol_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QLocale) ToCurrencyString26(i uint, symbol string) string { +func (this *QLocale) ToCurrencyString7(i uint, symbol string) string { 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.uint)(i), symbol_ms) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString7(this.h, (C.uint)(i), 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 float64, symbol string) string { +func (this *QLocale) ToCurrencyString8(param1 float64, symbol string) string { 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.double)(param1), symbol_ms) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString8(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) ToCurrencyString3(param1 float64, symbol string, precision int) string { +func (this *QLocale) ToCurrencyString9(param1 float64, symbol string, precision int) string { 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.double)(param1), symbol_ms, (C.int)(precision)) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString9(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) ToCurrencyString28(i float32, symbol string) string { +func (this *QLocale) ToCurrencyString10(i float32, symbol string) string { 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.float)(i), symbol_ms) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString10(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) ToCurrencyString32(i float32, symbol string, precision int) string { +func (this *QLocale) ToCurrencyString11(i float32, symbol string, precision int) string { 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_toCurrencyString32(this.h, (C.float)(i), symbol_ms, (C.int)(precision)) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString11(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 @@ -2079,7 +2079,7 @@ func (this *QLocale) FormattedDataSize3(bytes int64, precision int, format QLoca } func QLocale_LanguageToCode2(language QLocale__Language, codeTypes QLocale__LanguageCodeType) string { - var _ms C.struct_miqt_string = C.QLocale_languageToCode2((C.uint16_t)(language), (C.int)(codeTypes)) + var _ms C.struct_miqt_string = C.QLocale_languageToCode2((C.ushort)(language), (C.int)(codeTypes)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret diff --git a/qt6/gen_qlocale.h b/qt6/gen_qlocale.h index 2baa7c53..428607b3 100644 --- a/qt6/gen_qlocale.h +++ b/qt6/gen_qlocale.h @@ -30,24 +30,24 @@ typedef struct QTime QTime; QLocale* QLocale_new(); QLocale* QLocale_new2(struct miqt_string name); -QLocale* QLocale_new3(uint16_t language, uint16_t territory); -QLocale* QLocale_new4(uint16_t language); +QLocale* QLocale_new3(unsigned short language, unsigned short territory); +QLocale* QLocale_new4(unsigned short language); QLocale* QLocale_new5(QLocale* other); -QLocale* QLocale_new6(uint16_t language, uint16_t script); -QLocale* QLocale_new7(uint16_t language, uint16_t script, uint16_t territory); +QLocale* QLocale_new6(unsigned short language, unsigned short script); +QLocale* QLocale_new7(unsigned short language, unsigned short script, unsigned short territory); void QLocale_operatorAssign(QLocale* self, QLocale* other); void QLocale_swap(QLocale* self, QLocale* other); -uint16_t QLocale_language(const QLocale* self); -uint16_t QLocale_script(const QLocale* self); -uint16_t QLocale_territory(const QLocale* self); -uint16_t QLocale_country(const QLocale* self); +unsigned short QLocale_language(const QLocale* self); +unsigned short QLocale_script(const QLocale* self); +unsigned short QLocale_territory(const QLocale* self); +unsigned short 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_nativeTerritoryName(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); +short QLocale_toShort(const QLocale* self, struct miqt_string s); +unsigned short 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); @@ -60,8 +60,8 @@ 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_toStringWithShort(const QLocale* self, short i); +struct miqt_string QLocale_toStringWithUshort(const QLocale* self, unsigned short 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 f); @@ -110,33 +110,33 @@ 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 i); -struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, uint16_t i); +struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, short i); +struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, unsigned short i); struct miqt_string QLocale_toCurrencyStringWithInt(const QLocale* self, int i); struct miqt_string QLocale_toCurrencyStringWithUint(const QLocale* self, unsigned int i); struct miqt_string QLocale_toCurrencyStringWithDouble(const QLocale* self, double param1); struct miqt_string QLocale_toCurrencyStringWithFloat(const QLocale* self, float i); struct miqt_string QLocale_formattedDataSize(const QLocale* self, long long bytes); struct miqt_array /* of struct miqt_string */ QLocale_uiLanguages(const QLocale* self); -struct miqt_string QLocale_languageToCode(uint16_t language); -struct miqt_string QLocale_territoryToCode(uint16_t territory); -struct miqt_string QLocale_countryToCode(uint16_t country); -struct miqt_string QLocale_scriptToCode(uint16_t script); -struct miqt_string QLocale_languageToString(uint16_t language); -struct miqt_string QLocale_territoryToString(uint16_t territory); -struct miqt_string QLocale_countryToString(uint16_t country); -struct miqt_string QLocale_scriptToString(uint16_t script); +struct miqt_string QLocale_languageToCode(unsigned short language); +struct miqt_string QLocale_territoryToCode(unsigned short territory); +struct miqt_string QLocale_countryToCode(unsigned short country); +struct miqt_string QLocale_scriptToCode(unsigned short script); +struct miqt_string QLocale_languageToString(unsigned short language); +struct miqt_string QLocale_territoryToString(unsigned short territory); +struct miqt_string QLocale_countryToString(unsigned short country); +struct miqt_string QLocale_scriptToString(unsigned short script); void QLocale_setDefault(QLocale* locale); QLocale* QLocale_c(); QLocale* QLocale_system(); -struct miqt_array /* of QLocale* */ QLocale_matchingLocales(uint16_t language, uint16_t script, uint16_t territory); -struct miqt_array /* of uint16_t */ QLocale_countriesForLanguage(uint16_t lang); +struct miqt_array /* of QLocale* */ QLocale_matchingLocales(unsigned short language, unsigned short script, unsigned short territory); +struct miqt_array /* of unsigned short */ QLocale_countriesForLanguage(unsigned short 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); +short QLocale_toShort2(const QLocale* self, struct miqt_string s, bool* ok); +unsigned short 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); @@ -145,37 +145,37 @@ long long QLocale_toLongLong2(const QLocale* self, struct miqt_string s, bool* o 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 f, char format); -struct miqt_string QLocale_toString32(const QLocale* self, double f, char format, int precision); -struct miqt_string QLocale_toString23(const QLocale* self, float f, char format); -struct miqt_string QLocale_toString33(const QLocale* self, float f, char format, int precision); -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 string, int param2); -QTime* QLocale_toTime22(const QLocale* self, struct miqt_string string, int param2); -QDateTime* QLocale_toDateTime22(const QLocale* self, struct miqt_string string, int format); +struct miqt_string QLocale_toString12(const QLocale* self, double f, char format); +struct miqt_string QLocale_toString13(const QLocale* self, double f, char format, int precision); +struct miqt_string QLocale_toString14(const QLocale* self, float f, char format); +struct miqt_string QLocale_toString15(const QLocale* self, float f, char format, int precision); +struct miqt_string QLocale_toString16(const QLocale* self, QDate* date, int format); +struct miqt_string QLocale_toString17(const QLocale* self, QTime* time, int format); +struct miqt_string QLocale_toString18(const QLocale* self, QDateTime* dateTime, int format); +struct miqt_string QLocale_dateFormatWithFormat(const QLocale* self, int format); +struct miqt_string QLocale_timeFormatWithFormat(const QLocale* self, int format); +struct miqt_string QLocale_dateTimeFormatWithFormat(const QLocale* self, int format); +QDate* QLocale_toDate5(const QLocale* self, struct miqt_string string, int param2); +QTime* QLocale_toTime3(const QLocale* self, struct miqt_string string, int param2); +QDateTime* QLocale_toDateTime5(const QLocale* self, struct miqt_string string, 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_currencySymbolWithQLocaleCurrencySymbolFormat(const QLocale* self, int param1); struct miqt_string QLocale_toCurrencyString2(const QLocale* self, long long param1, struct miqt_string symbol); -struct miqt_string QLocale_toCurrencyString22(const QLocale* self, unsigned long long param1, struct miqt_string symbol); -struct miqt_string QLocale_toCurrencyString23(const QLocale* self, int16_t i, struct miqt_string symbol); -struct miqt_string QLocale_toCurrencyString24(const QLocale* self, uint16_t i, struct miqt_string symbol); -struct miqt_string QLocale_toCurrencyString25(const QLocale* self, int i, struct miqt_string symbol); -struct miqt_string QLocale_toCurrencyString26(const QLocale* self, unsigned int i, struct miqt_string symbol); -struct miqt_string QLocale_toCurrencyString27(const QLocale* self, double param1, struct miqt_string symbol); -struct miqt_string QLocale_toCurrencyString3(const QLocale* self, double param1, struct miqt_string symbol, int precision); -struct miqt_string QLocale_toCurrencyString28(const QLocale* self, float i, struct miqt_string symbol); -struct miqt_string QLocale_toCurrencyString32(const QLocale* self, float i, struct miqt_string symbol, int precision); +struct miqt_string QLocale_toCurrencyString3(const QLocale* self, unsigned long long param1, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString4(const QLocale* self, short i, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString5(const QLocale* self, unsigned short i, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString6(const QLocale* self, int i, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString7(const QLocale* self, unsigned int i, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString8(const QLocale* self, double param1, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString9(const QLocale* self, double param1, struct miqt_string symbol, int precision); +struct miqt_string QLocale_toCurrencyString10(const QLocale* self, float i, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString11(const QLocale* self, float i, struct miqt_string symbol, int precision); struct miqt_string QLocale_formattedDataSize2(const QLocale* self, long long bytes, int precision); struct miqt_string QLocale_formattedDataSize3(const QLocale* self, long long bytes, int precision, int format); -struct miqt_string QLocale_languageToCode2(uint16_t language, int codeTypes); +struct miqt_string QLocale_languageToCode2(unsigned short language, int codeTypes); struct miqt_string QLocale_quoteString2(const QLocale* self, struct miqt_string str, int style); void QLocale_delete(QLocale* self); diff --git a/qt6/gen_qlockfile.cpp b/qt6/gen_qlockfile.cpp index 91ed80e7..bb3753d7 100644 --- a/qt6/gen_qlockfile.cpp +++ b/qt6/gen_qlockfile.cpp @@ -62,7 +62,7 @@ int QLockFile_error(const QLockFile* self) { return static_cast(_ret); } -bool QLockFile_tryLock1(QLockFile* self, int timeout) { +bool QLockFile_tryLock2(QLockFile* self, int timeout) { return self->tryLock(static_cast(timeout)); } diff --git a/qt6/gen_qlockfile.go b/qt6/gen_qlockfile.go index 77f28d84..1f6d60bb 100644 --- a/qt6/gen_qlockfile.go +++ b/qt6/gen_qlockfile.go @@ -103,8 +103,8 @@ func (this *QLockFile) Error() QLockFile__LockError { return (QLockFile__LockError)(C.QLockFile_error(this.h)) } -func (this *QLockFile) TryLock1(timeout int) bool { - return (bool)(C.QLockFile_tryLock1(this.h, (C.int)(timeout))) +func (this *QLockFile) TryLock2(timeout int) bool { + return (bool)(C.QLockFile_tryLock2(this.h, (C.int)(timeout))) } // Delete this object from C++ memory. diff --git a/qt6/gen_qlockfile.h b/qt6/gen_qlockfile.h index 38545033..c2ae4049 100644 --- a/qt6/gen_qlockfile.h +++ b/qt6/gen_qlockfile.h @@ -30,7 +30,7 @@ int QLockFile_staleLockTime(const QLockFile* self); bool QLockFile_isLocked(const QLockFile* self); bool QLockFile_removeStaleLockFile(QLockFile* self); int QLockFile_error(const QLockFile* self); -bool QLockFile_tryLock1(QLockFile* self, int timeout); +bool QLockFile_tryLock2(QLockFile* self, int timeout); void QLockFile_delete(QLockFile* self); #ifdef __cplusplus diff --git a/qt6/gen_qmainwindow.cpp b/qt6/gen_qmainwindow.cpp index 1ccde2fd..1333aad8 100644 --- a/qt6/gen_qmainwindow.cpp +++ b/qt6/gen_qmainwindow.cpp @@ -1365,11 +1365,11 @@ struct miqt_string QMainWindow_tr3(const char* s, const char* c, int n) { return _ms; } -void QMainWindow_addToolBarBreak1(QMainWindow* self, int area) { +void QMainWindow_addToolBarBreakWithArea(QMainWindow* self, int area) { self->addToolBarBreak(static_cast(area)); } -struct miqt_string QMainWindow_saveState1(const QMainWindow* self, int version) { +struct miqt_string QMainWindow_saveStateWithVersion(const QMainWindow* self, int version) { QByteArray _qb = self->saveState(static_cast(version)); struct miqt_string _ms; _ms.len = _qb.length(); diff --git a/qt6/gen_qmainwindow.go b/qt6/gen_qmainwindow.go index 57f2690f..1fce8819 100644 --- a/qt6/gen_qmainwindow.go +++ b/qt6/gen_qmainwindow.go @@ -422,12 +422,12 @@ func QMainWindow_Tr3(s string, c string, n int) string { return _ret } -func (this *QMainWindow) AddToolBarBreak1(area ToolBarArea) { - C.QMainWindow_addToolBarBreak1(this.h, (C.int)(area)) +func (this *QMainWindow) AddToolBarBreakWithArea(area ToolBarArea) { + C.QMainWindow_addToolBarBreakWithArea(this.h, (C.int)(area)) } -func (this *QMainWindow) SaveState1(version int) []byte { - var _bytearray C.struct_miqt_string = C.QMainWindow_saveState1(this.h, (C.int)(version)) +func (this *QMainWindow) SaveStateWithVersion(version int) []byte { + var _bytearray C.struct_miqt_string = C.QMainWindow_saveStateWithVersion(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 diff --git a/qt6/gen_qmainwindow.h b/qt6/gen_qmainwindow.h index 732e88d7..b5580b19 100644 --- a/qt6/gen_qmainwindow.h +++ b/qt6/gen_qmainwindow.h @@ -163,8 +163,8 @@ void QMainWindow_contextMenuEvent(QMainWindow* self, QContextMenuEvent* event); bool QMainWindow_event(QMainWindow* self, QEvent* event); struct miqt_string QMainWindow_tr2(const char* s, const char* c); struct miqt_string QMainWindow_tr3(const char* s, const char* c, int n); -void QMainWindow_addToolBarBreak1(QMainWindow* self, int area); -struct miqt_string QMainWindow_saveState1(const QMainWindow* self, int version); +void QMainWindow_addToolBarBreakWithArea(QMainWindow* self, int area); +struct miqt_string QMainWindow_saveStateWithVersion(const QMainWindow* self, int version); bool QMainWindow_restoreState2(QMainWindow* self, struct miqt_string state, int version); bool QMainWindow_override_virtual_createPopupMenu(void* self, intptr_t slot); QMenu* QMainWindow_virtualbase_createPopupMenu(void* self); diff --git a/qt6/gen_qmatrix4x4.cpp b/qt6/gen_qmatrix4x4.cpp index aa9d1d30..9047eecb 100644 --- a/qt6/gen_qmatrix4x4.cpp +++ b/qt6/gen_qmatrix4x4.cpp @@ -274,19 +274,19 @@ int QMatrix4x4_flags(const QMatrix4x4* self) { return static_cast(_ret); } -QMatrix4x4* QMatrix4x4_inverted1(const QMatrix4x4* self, bool* invertible) { +QMatrix4x4* QMatrix4x4_invertedWithInvertible(const QMatrix4x4* self, bool* invertible) { return new QMatrix4x4(self->inverted(invertible)); } -void QMatrix4x4_rotate4(QMatrix4x4* self, float angle, float x, float y, float z) { +void QMatrix4x4_rotate3(QMatrix4x4* self, float angle, float x, float y, float z) { self->rotate(static_cast(angle), static_cast(x), static_cast(y), static_cast(z)); } -void QMatrix4x4_viewport5(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane) { +void QMatrix4x4_viewport3(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane) { self->viewport(static_cast(left), static_cast(bottom), static_cast(width), static_cast(height), static_cast(nearPlane)); } -void QMatrix4x4_viewport6(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane, float farPlane) { +void QMatrix4x4_viewport4(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane, float farPlane) { self->viewport(static_cast(left), static_cast(bottom), static_cast(width), static_cast(height), static_cast(nearPlane), static_cast(farPlane)); } diff --git a/qt6/gen_qmatrix4x4.go b/qt6/gen_qmatrix4x4.go index 3138e0a0..a7a83f24 100644 --- a/qt6/gen_qmatrix4x4.go +++ b/qt6/gen_qmatrix4x4.go @@ -343,22 +343,22 @@ func (this *QMatrix4x4) Flags() QMatrix4x4__Flag { return (QMatrix4x4__Flag)(C.QMatrix4x4_flags(this.h)) } -func (this *QMatrix4x4) Inverted1(invertible *bool) *QMatrix4x4 { - _goptr := newQMatrix4x4(C.QMatrix4x4_inverted1(this.h, (*C.bool)(unsafe.Pointer(invertible)))) +func (this *QMatrix4x4) InvertedWithInvertible(invertible *bool) *QMatrix4x4 { + _goptr := newQMatrix4x4(C.QMatrix4x4_invertedWithInvertible(this.h, (*C.bool)(unsafe.Pointer(invertible)))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QMatrix4x4) Rotate4(angle float32, x float32, y float32, z float32) { - C.QMatrix4x4_rotate4(this.h, (C.float)(angle), (C.float)(x), (C.float)(y), (C.float)(z)) +func (this *QMatrix4x4) Rotate3(angle float32, x float32, y float32, z float32) { + C.QMatrix4x4_rotate3(this.h, (C.float)(angle), (C.float)(x), (C.float)(y), (C.float)(z)) } -func (this *QMatrix4x4) Viewport5(left float32, bottom float32, width float32, height float32, nearPlane float32) { - C.QMatrix4x4_viewport5(this.h, (C.float)(left), (C.float)(bottom), (C.float)(width), (C.float)(height), (C.float)(nearPlane)) +func (this *QMatrix4x4) Viewport3(left float32, bottom float32, width float32, height float32, nearPlane float32) { + C.QMatrix4x4_viewport3(this.h, (C.float)(left), (C.float)(bottom), (C.float)(width), (C.float)(height), (C.float)(nearPlane)) } -func (this *QMatrix4x4) Viewport6(left float32, bottom float32, width float32, height float32, nearPlane float32, farPlane float32) { - C.QMatrix4x4_viewport6(this.h, (C.float)(left), (C.float)(bottom), (C.float)(width), (C.float)(height), (C.float)(nearPlane), (C.float)(farPlane)) +func (this *QMatrix4x4) Viewport4(left float32, bottom float32, width float32, height float32, nearPlane float32, farPlane float32) { + C.QMatrix4x4_viewport4(this.h, (C.float)(left), (C.float)(bottom), (C.float)(width), (C.float)(height), (C.float)(nearPlane), (C.float)(farPlane)) } // Delete this object from C++ memory. diff --git a/qt6/gen_qmatrix4x4.h b/qt6/gen_qmatrix4x4.h index 4d83be70..06bdf98d 100644 --- a/qt6/gen_qmatrix4x4.h +++ b/qt6/gen_qmatrix4x4.h @@ -99,10 +99,10 @@ void QMatrix4x4_optimize(QMatrix4x4* self); QVariant* QMatrix4x4_ToQVariant(const QMatrix4x4* self); void QMatrix4x4_projectedRotate(QMatrix4x4* self, float angle, float x, float y, float z); int QMatrix4x4_flags(const QMatrix4x4* self); -QMatrix4x4* QMatrix4x4_inverted1(const QMatrix4x4* self, bool* invertible); -void QMatrix4x4_rotate4(QMatrix4x4* self, float angle, float x, float y, float z); -void QMatrix4x4_viewport5(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane); -void QMatrix4x4_viewport6(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane, float farPlane); +QMatrix4x4* QMatrix4x4_invertedWithInvertible(const QMatrix4x4* self, bool* invertible); +void QMatrix4x4_rotate3(QMatrix4x4* self, float angle, float x, float y, float z); +void QMatrix4x4_viewport3(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane); +void QMatrix4x4_viewport4(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane, float farPlane); void QMatrix4x4_delete(QMatrix4x4* self); #ifdef __cplusplus diff --git a/qt6/gen_qmdiarea.cpp b/qt6/gen_qmdiarea.cpp index 5caa1dff..88ef2f57 100644 --- a/qt6/gen_qmdiarea.cpp +++ b/qt6/gen_qmdiarea.cpp @@ -1315,7 +1315,7 @@ struct miqt_string QMdiArea_tr3(const char* s, const char* c, int n) { return _ms; } -struct miqt_array /* of QMdiSubWindow* */ QMdiArea_subWindowList1(const QMdiArea* self, int order) { +struct miqt_array /* of QMdiSubWindow* */ QMdiArea_subWindowListWithOrder(const QMdiArea* self, int order) { QList _ret = self->subWindowList(static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QMdiSubWindow** _arr = static_cast(malloc(sizeof(QMdiSubWindow*) * _ret.length())); diff --git a/qt6/gen_qmdiarea.go b/qt6/gen_qmdiarea.go index 8655a8e1..e69611f1 100644 --- a/qt6/gen_qmdiarea.go +++ b/qt6/gen_qmdiarea.go @@ -284,8 +284,8 @@ func QMdiArea_Tr3(s string, c string, n int) string { return _ret } -func (this *QMdiArea) SubWindowList1(order QMdiArea__WindowOrder) []*QMdiSubWindow { - var _ma C.struct_miqt_array = C.QMdiArea_subWindowList1(this.h, (C.int)(order)) +func (this *QMdiArea) SubWindowListWithOrder(order QMdiArea__WindowOrder) []*QMdiSubWindow { + var _ma C.struct_miqt_array = C.QMdiArea_subWindowListWithOrder(this.h, (C.int)(order)) _ret := make([]*QMdiSubWindow, int(_ma.len)) _outCast := (*[0xffff]*C.QMdiSubWindow)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt6/gen_qmdiarea.h b/qt6/gen_qmdiarea.h index 0653337c..42e0e9c9 100644 --- a/qt6/gen_qmdiarea.h +++ b/qt6/gen_qmdiarea.h @@ -148,7 +148,7 @@ bool QMdiArea_viewportEvent(QMdiArea* self, QEvent* event); void QMdiArea_scrollContentsBy(QMdiArea* self, int dx, int dy); 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_array /* of QMdiSubWindow* */ QMdiArea_subWindowList1(const QMdiArea* self, int order); +struct miqt_array /* of QMdiSubWindow* */ QMdiArea_subWindowListWithOrder(const QMdiArea* self, int order); QMdiSubWindow* QMdiArea_addSubWindow2(QMdiArea* self, QWidget* widget, int flags); void QMdiArea_setOption2(QMdiArea* self, int option, bool on); bool QMdiArea_override_virtual_sizeHint(void* self, intptr_t slot); diff --git a/qt6/gen_qmenu.cpp b/qt6/gen_qmenu.cpp index 6423aeb2..f2a0e4bc 100644 --- a/qt6/gen_qmenu.cpp +++ b/qt6/gen_qmenu.cpp @@ -1323,11 +1323,11 @@ void QMenu_popup2(QMenu* self, QPoint* pos, QAction* at) { self->popup(*pos, at); } -QAction* QMenu_exec22(QMenu* self, QPoint* pos, QAction* at) { +QAction* QMenu_exec3(QMenu* self, QPoint* pos, QAction* at) { return self->exec(*pos, at); } -QAction* QMenu_exec3(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at) { +QAction* QMenu_exec4(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at) { QList actions_QList; actions_QList.reserve(actions.len); QAction** actions_arr = static_cast(actions.data); @@ -1337,7 +1337,7 @@ QAction* QMenu_exec3(struct miqt_array /* of QAction* */ actions, QPoint* pos, return QMenu::exec(actions_QList, *pos, at); } -QAction* QMenu_exec4(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at, QWidget* parent) { +QAction* QMenu_exec5(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at, QWidget* parent) { QList actions_QList; actions_QList.reserve(actions.len); QAction** actions_arr = static_cast(actions.data); diff --git a/qt6/gen_qmenu.go b/qt6/gen_qmenu.go index ffc5ff90..2e71f7ca 100644 --- a/qt6/gen_qmenu.go +++ b/qt6/gen_qmenu.go @@ -404,28 +404,28 @@ func (this *QMenu) Popup2(pos *QPoint, at *QAction) { C.QMenu_popup2(this.h, pos.cPointer(), at.cPointer()) } -func (this *QMenu) Exec22(pos *QPoint, at *QAction) *QAction { - return newQAction(C.QMenu_exec22(this.h, pos.cPointer(), at.cPointer())) +func (this *QMenu) Exec3(pos *QPoint, at *QAction) *QAction { + return newQAction(C.QMenu_exec3(this.h, pos.cPointer(), at.cPointer())) } -func QMenu_Exec3(actions []*QAction, pos *QPoint, at *QAction) *QAction { +func QMenu_Exec4(actions []*QAction, pos *QPoint, at *QAction) *QAction { actions_CArray := (*[0xffff]*C.QAction)(C.malloc(C.size_t(8 * len(actions)))) defer C.free(unsafe.Pointer(actions_CArray)) for i := range actions { actions_CArray[i] = actions[i].cPointer() } actions_ma := C.struct_miqt_array{len: C.size_t(len(actions)), data: unsafe.Pointer(actions_CArray)} - return newQAction(C.QMenu_exec3(actions_ma, pos.cPointer(), at.cPointer())) + return newQAction(C.QMenu_exec4(actions_ma, pos.cPointer(), at.cPointer())) } -func QMenu_Exec4(actions []*QAction, pos *QPoint, at *QAction, parent *QWidget) *QAction { +func QMenu_Exec5(actions []*QAction, pos *QPoint, at *QAction, parent *QWidget) *QAction { actions_CArray := (*[0xffff]*C.QAction)(C.malloc(C.size_t(8 * len(actions)))) defer C.free(unsafe.Pointer(actions_CArray)) for i := range actions { actions_CArray[i] = actions[i].cPointer() } actions_ma := C.struct_miqt_array{len: C.size_t(len(actions)), data: unsafe.Pointer(actions_CArray)} - return newQAction(C.QMenu_exec4(actions_ma, pos.cPointer(), at.cPointer(), parent.cPointer())) + return newQAction(C.QMenu_exec5(actions_ma, pos.cPointer(), at.cPointer(), parent.cPointer())) } // ColumnCount can only be called from a QMenu that was directly constructed. diff --git a/qt6/gen_qmenu.h b/qt6/gen_qmenu.h index 1aff7db1..1deb1eed 100644 --- a/qt6/gen_qmenu.h +++ b/qt6/gen_qmenu.h @@ -166,9 +166,9 @@ void QMenu_initStyleOption(const QMenu* self, QStyleOptionMenuItem* option, QAct struct miqt_string QMenu_tr2(const char* s, const char* c); struct miqt_string QMenu_tr3(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); -QAction* QMenu_exec4(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at, QWidget* parent); +QAction* QMenu_exec3(QMenu* self, QPoint* pos, QAction* at); +QAction* QMenu_exec4(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at); +QAction* QMenu_exec5(struct miqt_array /* of QAction* */ actions, QPoint* pos, QAction* at, QWidget* parent); bool QMenu_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QMenu_virtualbase_sizeHint(const void* self); bool QMenu_override_virtual_changeEvent(void* self, intptr_t slot); diff --git a/qt6/gen_qmenubar.cpp b/qt6/gen_qmenubar.cpp index 44514b36..1cd3d043 100644 --- a/qt6/gen_qmenubar.cpp +++ b/qt6/gen_qmenubar.cpp @@ -1194,7 +1194,7 @@ void QMenuBar_setCornerWidget2(QMenuBar* self, QWidget* w, int corner) { self->setCornerWidget(w, static_cast(corner)); } -QWidget* QMenuBar_cornerWidget1(const QMenuBar* self, int corner) { +QWidget* QMenuBar_cornerWidgetWithCorner(const QMenuBar* self, int corner) { return self->cornerWidget(static_cast(corner)); } diff --git a/qt6/gen_qmenubar.go b/qt6/gen_qmenubar.go index a54e9136..977b8011 100644 --- a/qt6/gen_qmenubar.go +++ b/qt6/gen_qmenubar.go @@ -245,8 +245,8 @@ func (this *QMenuBar) SetCornerWidget2(w *QWidget, corner Corner) { C.QMenuBar_setCornerWidget2(this.h, w.cPointer(), (C.int)(corner)) } -func (this *QMenuBar) CornerWidget1(corner Corner) *QWidget { - return newQWidget(C.QMenuBar_cornerWidget1(this.h, (C.int)(corner))) +func (this *QMenuBar) CornerWidgetWithCorner(corner Corner) *QWidget { + return newQWidget(C.QMenuBar_cornerWidgetWithCorner(this.h, (C.int)(corner))) } // UpdateMicroFocus can only be called from a QMenuBar that was directly constructed. diff --git a/qt6/gen_qmenubar.h b/qt6/gen_qmenubar.h index 88722f98..a0059922 100644 --- a/qt6/gen_qmenubar.h +++ b/qt6/gen_qmenubar.h @@ -143,7 +143,7 @@ void QMenuBar_initStyleOption(const QMenuBar* self, QStyleOptionMenuItem* option struct miqt_string QMenuBar_tr2(const char* s, const char* c); struct miqt_string QMenuBar_tr3(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); +QWidget* QMenuBar_cornerWidgetWithCorner(const QMenuBar* self, int corner); bool QMenuBar_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QMenuBar_virtualbase_sizeHint(const void* self); bool QMenuBar_override_virtual_minimumSizeHint(void* self, intptr_t slot); diff --git a/qt6/gen_qmessagebox.cpp b/qt6/gen_qmessagebox.cpp index 98be02ea..4d2b3634 100644 --- a/qt6/gen_qmessagebox.cpp +++ b/qt6/gen_qmessagebox.cpp @@ -1533,63 +1533,63 @@ struct miqt_string QMessageBox_tr3(const char* s, const char* c, int n) { return _ms; } -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) { 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) { +int QMessageBox_information6(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_information52(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1) { +int QMessageBox_information7(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_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) { 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) { +int QMessageBox_question6(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) { +int QMessageBox_warning5(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) { +int QMessageBox_warning6(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) { +int QMessageBox_critical5(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) { +int QMessageBox_critical6(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)); @@ -1601,19 +1601,19 @@ void QMessageBox_aboutQt2(QWidget* parent, struct miqt_string title) { QMessageBox::aboutQt(parent, title_QString); } -int QMessageBox_information53(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1) { +int QMessageBox_information8(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) { +int QMessageBox_information9(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_information54(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text) { +int QMessageBox_information10(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); @@ -1621,7 +1621,7 @@ int QMessageBox_information54(QWidget* parent, struct miqt_string title, struct 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) { +int QMessageBox_information11(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); @@ -1630,7 +1630,7 @@ int QMessageBox_information62(QWidget* parent, struct miqt_string title, struct 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) { +int QMessageBox_information12(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); @@ -1639,7 +1639,7 @@ int QMessageBox_information7(QWidget* parent, struct miqt_string title, struct m 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) { +int QMessageBox_information13(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); @@ -1648,19 +1648,19 @@ int QMessageBox_information8(QWidget* parent, struct miqt_string title, struct m return QMessageBox::information(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString, static_cast(defaultButtonNumber), static_cast(escapeButtonNumber)); } -int QMessageBox_question52(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1) { +int QMessageBox_question7(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) { +int QMessageBox_question8(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) { +int QMessageBox_question9(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); @@ -1668,7 +1668,7 @@ int QMessageBox_question53(QWidget* parent, struct miqt_string title, struct miq 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) { +int QMessageBox_question10(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); @@ -1677,7 +1677,7 @@ int QMessageBox_question62(QWidget* parent, struct miqt_string title, struct miq 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) { +int QMessageBox_question11(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); @@ -1686,7 +1686,7 @@ int QMessageBox_question7(QWidget* parent, struct miqt_string title, struct miqt 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) { +int QMessageBox_question12(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); @@ -1695,13 +1695,13 @@ int QMessageBox_question8(QWidget* parent, struct miqt_string title, struct miqt 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) { +int QMessageBox_warning7(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) { +int QMessageBox_warning8(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); @@ -1709,7 +1709,7 @@ int QMessageBox_warning52(QWidget* parent, struct miqt_string title, struct miqt 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) { +int QMessageBox_warning9(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); @@ -1718,7 +1718,7 @@ int QMessageBox_warning62(QWidget* parent, struct miqt_string title, struct miqt 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) { +int QMessageBox_warning10(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); @@ -1727,7 +1727,7 @@ int QMessageBox_warning7(QWidget* parent, struct miqt_string title, struct miqt_ 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) { +int QMessageBox_warning11(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); @@ -1736,13 +1736,13 @@ int QMessageBox_warning8(QWidget* parent, struct miqt_string title, struct miqt_ 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) { +int QMessageBox_critical7(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) { +int QMessageBox_critical8(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); @@ -1750,7 +1750,7 @@ int QMessageBox_critical52(QWidget* parent, struct miqt_string title, struct miq 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) { +int QMessageBox_critical9(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); @@ -1759,7 +1759,7 @@ int QMessageBox_critical62(QWidget* parent, struct miqt_string title, struct miq 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) { +int QMessageBox_critical10(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); @@ -1768,7 +1768,7 @@ int QMessageBox_critical7(QWidget* parent, struct miqt_string title, struct miqt 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) { +int QMessageBox_critical11(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); diff --git a/qt6/gen_qmessagebox.go b/qt6/gen_qmessagebox.go index 3d24d035..55f40dc8 100644 --- a/qt6/gen_qmessagebox.go +++ b/qt6/gen_qmessagebox.go @@ -701,7 +701,7 @@ func QMessageBox_Tr3(s string, c string, n int) string { return _ret } -func QMessageBox_Information42(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { +func QMessageBox_Information5(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -710,10 +710,10 @@ func QMessageBox_Information42(parent *QWidget, title string, text string, butto 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_information5(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 { +func QMessageBox_Information6(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -722,10 +722,10 @@ func QMessageBox_Information5(parent *QWidget, title string, text string, button 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_information6(parent.cPointer(), title_ms, text_ms, (C.int)(buttons), (C.int)(defaultButton))) } -func QMessageBox_Information52(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) QMessageBox__StandardButton { +func QMessageBox_Information7(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -734,10 +734,10 @@ func QMessageBox_Information52(parent *QWidget, title string, text string, butto 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_information52(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1))) + return (QMessageBox__StandardButton)(C.QMessageBox_information7(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1))) } -func QMessageBox_Question42(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { +func QMessageBox_Question5(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -746,10 +746,10 @@ func QMessageBox_Question42(parent *QWidget, title string, text string, buttons 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_question5(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 { +func QMessageBox_Question6(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -758,10 +758,10 @@ func QMessageBox_Question5(parent *QWidget, title string, text string, buttons Q 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_question6(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 { +func QMessageBox_Warning5(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -770,10 +770,10 @@ func QMessageBox_Warning42(parent *QWidget, title string, text string, buttons Q 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_warning5(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 { +func QMessageBox_Warning6(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -782,10 +782,10 @@ func QMessageBox_Warning5(parent *QWidget, title string, text string, buttons QM 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_warning6(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 { +func QMessageBox_Critical5(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -794,10 +794,10 @@ func QMessageBox_Critical42(parent *QWidget, title string, text string, buttons 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_critical5(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 { +func QMessageBox_Critical6(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -806,7 +806,7 @@ func QMessageBox_Critical5(parent *QWidget, title string, text string, buttons Q 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))) + return (QMessageBox__StandardButton)(C.QMessageBox_critical6(parent.cPointer(), title_ms, text_ms, (C.int)(buttons), (C.int)(defaultButton))) } func QMessageBox_AboutQt2(parent *QWidget, title string) { @@ -817,7 +817,7 @@ func QMessageBox_AboutQt2(parent *QWidget, title string) { C.QMessageBox_aboutQt2(parent.cPointer(), title_ms) } -func QMessageBox_Information53(parent *QWidget, title string, text string, button0 int, button1 int) int { +func QMessageBox_Information8(parent *QWidget, title string, text string, button0 int, button1 int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -826,10 +826,10 @@ func QMessageBox_Information53(parent *QWidget, title string, text string, butto 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_information53(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1))) + return (int)(C.QMessageBox_information8(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 { +func QMessageBox_Information9(parent *QWidget, title string, text string, button0 int, button1 int, button2 int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -838,10 +838,10 @@ func QMessageBox_Information6(parent *QWidget, title string, text string, button 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))) + return (int)(C.QMessageBox_information9(parent.cPointer(), title_ms, text_ms, (C.int)(button0), (C.int)(button1), (C.int)(button2))) } -func QMessageBox_Information54(parent *QWidget, title string, text string, button0Text string, button1Text string) int { +func QMessageBox_Information10(parent *QWidget, title string, text string, button0Text string, button1Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -858,10 +858,10 @@ func QMessageBox_Information54(parent *QWidget, title string, text string, butto 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_information54(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms)) + return (int)(C.QMessageBox_information10(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 { +func QMessageBox_Information11(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -882,10 +882,10 @@ func QMessageBox_Information62(parent *QWidget, title string, text string, butto 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)) + return (int)(C.QMessageBox_information11(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 { +func QMessageBox_Information12(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -906,10 +906,10 @@ func QMessageBox_Information7(parent *QWidget, title string, text string, button 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))) + return (int)(C.QMessageBox_information12(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 { +func QMessageBox_Information13(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int, escapeButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -930,10 +930,10 @@ func QMessageBox_Information8(parent *QWidget, title string, text string, button 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))) + return (int)(C.QMessageBox_information13(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms, (C.int)(defaultButtonNumber), (C.int)(escapeButtonNumber))) } -func QMessageBox_Question52(parent *QWidget, title string, text string, button0 int, button1 int) int { +func QMessageBox_Question7(parent *QWidget, title string, text string, button0 int, button1 int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -942,10 +942,10 @@ func QMessageBox_Question52(parent *QWidget, title string, text string, button0 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))) + return (int)(C.QMessageBox_question7(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 { +func QMessageBox_Question8(parent *QWidget, title string, text string, button0 int, button1 int, button2 int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -954,10 +954,10 @@ func QMessageBox_Question6(parent *QWidget, title string, text string, button0 i 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))) + return (int)(C.QMessageBox_question8(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 { +func QMessageBox_Question9(parent *QWidget, title string, text string, button0Text string, button1Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -974,10 +974,10 @@ func QMessageBox_Question53(parent *QWidget, title string, text string, button0T 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)) + return (int)(C.QMessageBox_question9(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 { +func QMessageBox_Question10(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -998,10 +998,10 @@ func QMessageBox_Question62(parent *QWidget, title string, text string, button0T 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)) + return (int)(C.QMessageBox_question10(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 { +func QMessageBox_Question11(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1022,10 +1022,10 @@ func QMessageBox_Question7(parent *QWidget, title string, text string, button0Te 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))) + return (int)(C.QMessageBox_question11(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 { +func QMessageBox_Question12(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int, escapeButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1046,10 +1046,10 @@ func QMessageBox_Question8(parent *QWidget, title string, text string, button0Te 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))) + return (int)(C.QMessageBox_question12(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 { +func QMessageBox_Warning7(parent *QWidget, title string, text string, button0 int, button1 int, button2 int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1058,10 +1058,10 @@ func QMessageBox_Warning6(parent *QWidget, title string, text string, button0 in 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))) + return (int)(C.QMessageBox_warning7(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 { +func QMessageBox_Warning8(parent *QWidget, title string, text string, button0Text string, button1Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1078,10 +1078,10 @@ func QMessageBox_Warning52(parent *QWidget, title string, text string, button0Te 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)) + return (int)(C.QMessageBox_warning8(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 { +func QMessageBox_Warning9(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1102,10 +1102,10 @@ func QMessageBox_Warning62(parent *QWidget, title string, text string, button0Te 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)) + return (int)(C.QMessageBox_warning9(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 { +func QMessageBox_Warning10(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1126,10 +1126,10 @@ func QMessageBox_Warning7(parent *QWidget, title string, text string, button0Tex 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))) + return (int)(C.QMessageBox_warning10(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 { +func QMessageBox_Warning11(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int, escapeButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1150,10 +1150,10 @@ func QMessageBox_Warning8(parent *QWidget, title string, text string, button0Tex 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))) + return (int)(C.QMessageBox_warning11(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 { +func QMessageBox_Critical7(parent *QWidget, title string, text string, button0 int, button1 int, button2 int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1162,10 +1162,10 @@ func QMessageBox_Critical6(parent *QWidget, title string, text string, button0 i 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))) + return (int)(C.QMessageBox_critical7(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 { +func QMessageBox_Critical8(parent *QWidget, title string, text string, button0Text string, button1Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1182,10 +1182,10 @@ func QMessageBox_Critical52(parent *QWidget, title string, text string, button0T 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)) + return (int)(C.QMessageBox_critical8(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 { +func QMessageBox_Critical9(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1206,10 +1206,10 @@ func QMessageBox_Critical62(parent *QWidget, title string, text string, button0T 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)) + return (int)(C.QMessageBox_critical9(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 { +func QMessageBox_Critical10(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1230,10 +1230,10 @@ func QMessageBox_Critical7(parent *QWidget, title string, text string, button0Te 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))) + return (int)(C.QMessageBox_critical10(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 { +func QMessageBox_Critical11(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string, defaultButtonNumber int, escapeButtonNumber int) int { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -1254,7 +1254,7 @@ func QMessageBox_Critical8(parent *QWidget, title string, text string, button0Te 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))) + return (int)(C.QMessageBox_critical11(parent.cPointer(), title_ms, text_ms, button0Text_ms, button1Text_ms, button2Text_ms, (C.int)(defaultButtonNumber), (C.int)(escapeButtonNumber))) } // AdjustPosition can only be called from a QMessageBox that was directly constructed. diff --git a/qt6/gen_qmessagebox.h b/qt6/gen_qmessagebox.h index 10ed4aab..1c43c81f 100644 --- a/qt6/gen_qmessagebox.h +++ b/qt6/gen_qmessagebox.h @@ -173,38 +173,38 @@ void QMessageBox_keyPressEvent(QMessageBox* self, QKeyEvent* event); void QMessageBox_changeEvent(QMessageBox* self, QEvent* event); struct miqt_string QMessageBox_tr2(const char* s, const char* c); struct miqt_string QMessageBox_tr3(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_information52(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); -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); +int QMessageBox_information5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons); +int QMessageBox_information6(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton); +int QMessageBox_information7(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +int QMessageBox_question5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons); +int QMessageBox_question6(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton); +int QMessageBox_warning5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons); +int QMessageBox_warning6(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons, int defaultButton); +int QMessageBox_critical5(QWidget* parent, struct miqt_string title, struct miqt_string text, int buttons); +int QMessageBox_critical6(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_information53(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_information54(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_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); +int QMessageBox_information8(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +int QMessageBox_information9(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2); +int QMessageBox_information10(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text); +int QMessageBox_information11(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text); +int QMessageBox_information12(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_information13(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_question7(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1); +int QMessageBox_question8(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2); +int QMessageBox_question9(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text); +int QMessageBox_question10(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text); +int QMessageBox_question11(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_question12(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_warning7(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2); +int QMessageBox_warning8(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text); +int QMessageBox_warning9(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text); +int QMessageBox_warning10(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_warning11(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_critical7(QWidget* parent, struct miqt_string title, struct miqt_string text, int button0, int button1, int button2); +int QMessageBox_critical8(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text); +int QMessageBox_critical9(QWidget* parent, struct miqt_string title, struct miqt_string text, struct miqt_string button0Text, struct miqt_string button1Text, struct miqt_string button2Text); +int QMessageBox_critical10(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_critical11(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); bool QMessageBox_override_virtual_event(void* self, intptr_t slot); bool QMessageBox_virtualbase_event(void* self, QEvent* e); bool QMessageBox_override_virtual_resizeEvent(void* self, intptr_t slot); diff --git a/qt6/gen_qmetaobject.cpp b/qt6/gen_qmetaobject.cpp index 4f752e16..4f27926b 100644 --- a/qt6/gen_qmetaobject.cpp +++ b/qt6/gen_qmetaobject.cpp @@ -227,203 +227,203 @@ bool QMetaMethod_invoke13(const QMetaMethod* self, QObject* object, int connecti return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaMethod_invoke32(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0) { +bool QMetaMethod_invoke14(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0) { return self->invoke(object, *returnValue, *val0); } -bool QMetaMethod_invoke42(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaMethod_invoke15(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1) { return self->invoke(object, *returnValue, *val0, *val1); } -bool QMetaMethod_invoke52(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaMethod_invoke16(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return self->invoke(object, *returnValue, *val0, *val1, *val2); } -bool QMetaMethod_invoke62(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaMethod_invoke17(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3); } -bool QMetaMethod_invoke72(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaMethod_invoke18(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4); } -bool QMetaMethod_invoke82(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaMethod_invoke19(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaMethod_invoke92(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaMethod_invoke20(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaMethod_invoke102(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaMethod_invoke21(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaMethod_invoke112(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaMethod_invoke22(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaMethod_invoke122(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaMethod_invoke23(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaMethod_invoke33(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0) { +bool QMetaMethod_invoke24(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0) { return self->invoke(object, static_cast(connectionType), *val0); } -bool QMetaMethod_invoke43(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaMethod_invoke25(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1) { return self->invoke(object, static_cast(connectionType), *val0, *val1); } -bool QMetaMethod_invoke53(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaMethod_invoke26(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2); } -bool QMetaMethod_invoke63(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaMethod_invoke27(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3); } -bool QMetaMethod_invoke73(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaMethod_invoke28(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4); } -bool QMetaMethod_invoke83(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaMethod_invoke29(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaMethod_invoke93(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaMethod_invoke30(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaMethod_invoke103(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaMethod_invoke31(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaMethod_invoke113(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaMethod_invoke32(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaMethod_invoke123(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaMethod_invoke33(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaMethod_invoke22(const QMetaMethod* self, QObject* object, QGenericArgument* val0) { +bool QMetaMethod_invoke34(const QMetaMethod* self, QObject* object, QGenericArgument* val0) { return self->invoke(object, *val0); } -bool QMetaMethod_invoke34(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaMethod_invoke35(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1) { return self->invoke(object, *val0, *val1); } -bool QMetaMethod_invoke44(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaMethod_invoke36(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return self->invoke(object, *val0, *val1, *val2); } -bool QMetaMethod_invoke54(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaMethod_invoke37(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return self->invoke(object, *val0, *val1, *val2, *val3); } -bool QMetaMethod_invoke64(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaMethod_invoke38(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return self->invoke(object, *val0, *val1, *val2, *val3, *val4); } -bool QMetaMethod_invoke74(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaMethod_invoke39(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaMethod_invoke84(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaMethod_invoke40(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaMethod_invoke94(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaMethod_invoke41(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaMethod_invoke104(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaMethod_invoke42(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaMethod_invoke114(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaMethod_invoke43(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaMethod_invokeOnGadget3(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0) { +bool QMetaMethod_invokeOnGadget2(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0) { return self->invokeOnGadget(gadget, *returnValue, *val0); } -bool QMetaMethod_invokeOnGadget4(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaMethod_invokeOnGadget3(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1); } -bool QMetaMethod_invokeOnGadget5(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaMethod_invokeOnGadget4(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2); } -bool QMetaMethod_invokeOnGadget6(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaMethod_invokeOnGadget5(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3); } -bool QMetaMethod_invokeOnGadget7(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaMethod_invokeOnGadget6(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3, *val4); } -bool QMetaMethod_invokeOnGadget8(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaMethod_invokeOnGadget7(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaMethod_invokeOnGadget9(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaMethod_invokeOnGadget8(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaMethod_invokeOnGadget10(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaMethod_invokeOnGadget9(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaMethod_invokeOnGadget11(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaMethod_invokeOnGadget10(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaMethod_invokeOnGadget12(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaMethod_invokeOnGadget11(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return self->invokeOnGadget(gadget, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaMethod_invokeOnGadget2(const QMetaMethod* self, void* gadget, QGenericArgument* val0) { +bool QMetaMethod_invokeOnGadget12(const QMetaMethod* self, void* gadget, QGenericArgument* val0) { return self->invokeOnGadget(gadget, *val0); } -bool QMetaMethod_invokeOnGadget32(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaMethod_invokeOnGadget13(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1) { return self->invokeOnGadget(gadget, *val0, *val1); } -bool QMetaMethod_invokeOnGadget42(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaMethod_invokeOnGadget14(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return self->invokeOnGadget(gadget, *val0, *val1, *val2); } -bool QMetaMethod_invokeOnGadget52(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaMethod_invokeOnGadget15(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3); } -bool QMetaMethod_invokeOnGadget62(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaMethod_invokeOnGadget16(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3, *val4); } -bool QMetaMethod_invokeOnGadget72(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaMethod_invokeOnGadget17(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaMethod_invokeOnGadget82(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaMethod_invokeOnGadget18(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaMethod_invokeOnGadget92(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaMethod_invokeOnGadget19(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaMethod_invokeOnGadget102(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaMethod_invokeOnGadget20(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaMethod_invokeOnGadget112(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaMethod_invokeOnGadget21(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return self->invokeOnGadget(gadget, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } diff --git a/qt6/gen_qmetaobject.go b/qt6/gen_qmetaobject.go index e378a520..aac7fd87 100644 --- a/qt6/gen_qmetaobject.go +++ b/qt6/gen_qmetaobject.go @@ -267,204 +267,204 @@ func (this *QMetaMethod) Invoke13(object *QObject, connectionType ConnectionType return (bool)(C.QMetaMethod_invoke13(this.h, object.cPointer(), (C.int)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func (this *QMetaMethod) Invoke32(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke32(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer())) +func (this *QMetaMethod) Invoke14(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke14(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer())) } -func (this *QMetaMethod) Invoke42(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke42(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer())) +func (this *QMetaMethod) Invoke15(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke15(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer())) } -func (this *QMetaMethod) Invoke52(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke52(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) +func (this *QMetaMethod) Invoke16(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke16(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func (this *QMetaMethod) Invoke62(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke62(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) +func (this *QMetaMethod) Invoke17(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke17(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func (this *QMetaMethod) Invoke72(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke72(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) +func (this *QMetaMethod) Invoke18(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke18(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func (this *QMetaMethod) Invoke82(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke82(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) +func (this *QMetaMethod) Invoke19(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke19(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func (this *QMetaMethod) Invoke92(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke92(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) +func (this *QMetaMethod) Invoke20(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke20(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func (this *QMetaMethod) Invoke102(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke102(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) +func (this *QMetaMethod) Invoke21(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke21(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func (this *QMetaMethod) Invoke112(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke112(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) +func (this *QMetaMethod) Invoke22(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke22(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func (this *QMetaMethod) Invoke122(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke122(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) +func (this *QMetaMethod) Invoke23(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke23(this.h, object.cPointer(), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func (this *QMetaMethod) Invoke33(object *QObject, connectionType ConnectionType, val0 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke33(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer())) +func (this *QMetaMethod) Invoke24(object *QObject, connectionType ConnectionType, val0 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke24(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer())) } -func (this *QMetaMethod) Invoke43(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke43(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer())) +func (this *QMetaMethod) Invoke25(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke25(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer())) } -func (this *QMetaMethod) Invoke53(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke53(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer())) +func (this *QMetaMethod) Invoke26(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke26(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func (this *QMetaMethod) Invoke63(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke63(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) +func (this *QMetaMethod) Invoke27(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke27(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func (this *QMetaMethod) Invoke73(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke73(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) +func (this *QMetaMethod) Invoke28(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke28(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func (this *QMetaMethod) Invoke83(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke83(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) +func (this *QMetaMethod) Invoke29(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke29(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func (this *QMetaMethod) Invoke93(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke93(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) +func (this *QMetaMethod) Invoke30(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke30(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func (this *QMetaMethod) Invoke103(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke103(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) +func (this *QMetaMethod) Invoke31(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke31(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func (this *QMetaMethod) Invoke113(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke113(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) +func (this *QMetaMethod) Invoke32(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke32(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func (this *QMetaMethod) Invoke123(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke123(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) +func (this *QMetaMethod) Invoke33(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke33(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func (this *QMetaMethod) Invoke22(object *QObject, val0 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke22(this.h, object.cPointer(), val0.cPointer())) +func (this *QMetaMethod) Invoke34(object *QObject, val0 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke34(this.h, object.cPointer(), val0.cPointer())) } -func (this *QMetaMethod) Invoke34(object *QObject, val0 QGenericArgument, val1 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke34(this.h, object.cPointer(), val0.cPointer(), val1.cPointer())) +func (this *QMetaMethod) Invoke35(object *QObject, val0 QGenericArgument, val1 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke35(this.h, object.cPointer(), val0.cPointer(), val1.cPointer())) } -func (this *QMetaMethod) Invoke44(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke44(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) +func (this *QMetaMethod) Invoke36(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke36(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func (this *QMetaMethod) Invoke54(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke54(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) +func (this *QMetaMethod) Invoke37(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke37(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func (this *QMetaMethod) Invoke64(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke64(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) +func (this *QMetaMethod) Invoke38(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke38(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func (this *QMetaMethod) Invoke74(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke74(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) +func (this *QMetaMethod) Invoke39(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke39(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func (this *QMetaMethod) Invoke84(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke84(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) +func (this *QMetaMethod) Invoke40(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke40(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func (this *QMetaMethod) Invoke94(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke94(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) +func (this *QMetaMethod) Invoke41(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke41(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func (this *QMetaMethod) Invoke104(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke104(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) +func (this *QMetaMethod) Invoke42(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke42(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func (this *QMetaMethod) Invoke114(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invoke114(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) +func (this *QMetaMethod) Invoke43(object *QObject, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invoke43(this.h, object.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget3(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget3(this.h, gadget, returnValue.cPointer(), val0.cPointer())) +func (this *QMetaMethod) InvokeOnGadget2(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget2(this.h, gadget, returnValue.cPointer(), val0.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget4(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget4(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer())) +func (this *QMetaMethod) InvokeOnGadget3(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget3(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget5(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget5(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) +func (this *QMetaMethod) InvokeOnGadget4(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget4(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget6(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget6(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) +func (this *QMetaMethod) InvokeOnGadget5(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget5(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget7(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget7(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) +func (this *QMetaMethod) InvokeOnGadget6(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget6(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget8(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget8(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) +func (this *QMetaMethod) InvokeOnGadget7(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget7(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget9(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget9(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) +func (this *QMetaMethod) InvokeOnGadget8(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget8(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget10(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget10(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) +func (this *QMetaMethod) InvokeOnGadget9(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget9(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget11(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget11(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) +func (this *QMetaMethod) InvokeOnGadget10(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget10(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget12(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget12(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) +func (this *QMetaMethod) InvokeOnGadget11(gadget unsafe.Pointer, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget11(this.h, gadget, returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget2(gadget unsafe.Pointer, val0 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget2(this.h, gadget, val0.cPointer())) +func (this *QMetaMethod) InvokeOnGadget12(gadget unsafe.Pointer, val0 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget12(this.h, gadget, val0.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget32(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget32(this.h, gadget, val0.cPointer(), val1.cPointer())) +func (this *QMetaMethod) InvokeOnGadget13(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget13(this.h, gadget, val0.cPointer(), val1.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget42(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget42(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer())) +func (this *QMetaMethod) InvokeOnGadget14(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget14(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget52(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget52(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) +func (this *QMetaMethod) InvokeOnGadget15(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget15(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget62(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget62(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) +func (this *QMetaMethod) InvokeOnGadget16(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget16(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget72(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget72(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) +func (this *QMetaMethod) InvokeOnGadget17(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget17(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget82(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget82(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) +func (this *QMetaMethod) InvokeOnGadget18(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget18(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget92(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget92(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) +func (this *QMetaMethod) InvokeOnGadget19(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget19(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget102(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget102(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) +func (this *QMetaMethod) InvokeOnGadget20(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget20(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func (this *QMetaMethod) InvokeOnGadget112(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { - return (bool)(C.QMetaMethod_invokeOnGadget112(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) +func (this *QMetaMethod) InvokeOnGadget21(gadget unsafe.Pointer, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { + return (bool)(C.QMetaMethod_invokeOnGadget21(this.h, gadget, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } // Delete this object from C++ memory. diff --git a/qt6/gen_qmetaobject.h b/qt6/gen_qmetaobject.h index 78119cce..30e6d748 100644 --- a/qt6/gen_qmetaobject.h +++ b/qt6/gen_qmetaobject.h @@ -80,56 +80,56 @@ bool QMetaMethod_invoke10(const QMetaMethod* self, QObject* object, int connecti bool QMetaMethod_invoke11(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); bool QMetaMethod_invoke12(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); bool QMetaMethod_invoke13(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaMethod_invoke32(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0); -bool QMetaMethod_invoke42(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaMethod_invoke52(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaMethod_invoke62(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaMethod_invoke72(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaMethod_invoke82(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaMethod_invoke92(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaMethod_invoke102(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaMethod_invoke112(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaMethod_invoke122(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaMethod_invoke33(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0); -bool QMetaMethod_invoke43(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaMethod_invoke53(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaMethod_invoke63(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaMethod_invoke73(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaMethod_invoke83(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaMethod_invoke93(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaMethod_invoke103(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaMethod_invoke113(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaMethod_invoke123(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaMethod_invoke22(const QMetaMethod* self, QObject* object, QGenericArgument* val0); -bool QMetaMethod_invoke34(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaMethod_invoke44(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaMethod_invoke54(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaMethod_invoke64(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaMethod_invoke74(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaMethod_invoke84(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaMethod_invoke94(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaMethod_invoke104(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaMethod_invoke114(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaMethod_invokeOnGadget3(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0); -bool QMetaMethod_invokeOnGadget4(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaMethod_invokeOnGadget5(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaMethod_invokeOnGadget6(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaMethod_invokeOnGadget7(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaMethod_invokeOnGadget8(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaMethod_invokeOnGadget9(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaMethod_invokeOnGadget10(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaMethod_invokeOnGadget11(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaMethod_invokeOnGadget12(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaMethod_invokeOnGadget2(const QMetaMethod* self, void* gadget, QGenericArgument* val0); -bool QMetaMethod_invokeOnGadget32(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaMethod_invokeOnGadget42(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaMethod_invokeOnGadget52(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaMethod_invokeOnGadget62(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaMethod_invokeOnGadget72(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaMethod_invokeOnGadget82(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaMethod_invokeOnGadget92(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaMethod_invokeOnGadget102(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaMethod_invokeOnGadget112(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaMethod_invoke14(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0); +bool QMetaMethod_invoke15(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaMethod_invoke16(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaMethod_invoke17(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaMethod_invoke18(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaMethod_invoke19(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaMethod_invoke20(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaMethod_invoke21(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaMethod_invoke22(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaMethod_invoke23(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaMethod_invoke24(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0); +bool QMetaMethod_invoke25(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaMethod_invoke26(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaMethod_invoke27(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaMethod_invoke28(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaMethod_invoke29(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaMethod_invoke30(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaMethod_invoke31(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaMethod_invoke32(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaMethod_invoke33(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaMethod_invoke34(const QMetaMethod* self, QObject* object, QGenericArgument* val0); +bool QMetaMethod_invoke35(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaMethod_invoke36(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaMethod_invoke37(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaMethod_invoke38(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaMethod_invoke39(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaMethod_invoke40(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaMethod_invoke41(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaMethod_invoke42(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaMethod_invoke43(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaMethod_invokeOnGadget2(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0); +bool QMetaMethod_invokeOnGadget3(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaMethod_invokeOnGadget4(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaMethod_invokeOnGadget5(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaMethod_invokeOnGadget6(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaMethod_invokeOnGadget7(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaMethod_invokeOnGadget8(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaMethod_invokeOnGadget9(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaMethod_invokeOnGadget10(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaMethod_invokeOnGadget11(const QMetaMethod* self, void* gadget, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaMethod_invokeOnGadget12(const QMetaMethod* self, void* gadget, QGenericArgument* val0); +bool QMetaMethod_invokeOnGadget13(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaMethod_invokeOnGadget14(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaMethod_invokeOnGadget15(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaMethod_invokeOnGadget16(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaMethod_invokeOnGadget17(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaMethod_invokeOnGadget18(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaMethod_invokeOnGadget19(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaMethod_invokeOnGadget20(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaMethod_invokeOnGadget21(const QMetaMethod* self, void* gadget, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); void QMetaMethod_delete(QMetaMethod* self); QMetaEnum* QMetaEnum_new(); diff --git a/qt6/gen_qmetatype.cpp b/qt6/gen_qmetatype.cpp index c3c6b8c3..b3abb618 100644 --- a/qt6/gen_qmetatype.cpp +++ b/qt6/gen_qmetatype.cpp @@ -234,15 +234,15 @@ void QMetaType_unregisterMetaType(QMetaType* type) { QMetaType::unregisterMetaType(*type); } -void* QMetaType_create22(int type, const void* copy) { +void* QMetaType_create3(int type, const void* copy) { return QMetaType::create(static_cast(type), copy); } -int QMetaType_id1(const QMetaType* self, int param1) { +int QMetaType_idWithInt(const QMetaType* self, int param1) { return self->id(static_cast(param1)); } -void* QMetaType_create1(const QMetaType* self, const void* copy) { +void* QMetaType_createWithCopy(const QMetaType* self, const void* copy) { return self->create(copy); } diff --git a/qt6/gen_qmetatype.go b/qt6/gen_qmetatype.go index b0fa6742..43ab2309 100644 --- a/qt6/gen_qmetatype.go +++ b/qt6/gen_qmetatype.go @@ -403,16 +403,16 @@ func QMetaType_UnregisterMetaType(typeVal QMetaType) { C.QMetaType_unregisterMetaType(typeVal.cPointer()) } -func QMetaType_Create22(typeVal int, copyVal unsafe.Pointer) unsafe.Pointer { - return (unsafe.Pointer)(C.QMetaType_create22((C.int)(typeVal), copyVal)) +func QMetaType_Create3(typeVal int, copyVal unsafe.Pointer) unsafe.Pointer { + return (unsafe.Pointer)(C.QMetaType_create3((C.int)(typeVal), copyVal)) } -func (this *QMetaType) Id1(param1 int) int { - return (int)(C.QMetaType_id1(this.h, (C.int)(param1))) +func (this *QMetaType) IdWithInt(param1 int) int { + return (int)(C.QMetaType_idWithInt(this.h, (C.int)(param1))) } -func (this *QMetaType) Create1(copyVal unsafe.Pointer) unsafe.Pointer { - return (unsafe.Pointer)(C.QMetaType_create1(this.h, copyVal)) +func (this *QMetaType) CreateWithCopy(copyVal unsafe.Pointer) unsafe.Pointer { + return (unsafe.Pointer)(C.QMetaType_createWithCopy(this.h, copyVal)) } func (this *QMetaType) Construct2(where unsafe.Pointer, copyVal unsafe.Pointer) unsafe.Pointer { diff --git a/qt6/gen_qmetatype.h b/qt6/gen_qmetatype.h index 1aa47ea3..703b3240 100644 --- a/qt6/gen_qmetatype.h +++ b/qt6/gen_qmetatype.h @@ -83,9 +83,9 @@ bool QMetaType_hasRegisteredMutableViewFunction(QMetaType* fromType, QMetaType* void QMetaType_unregisterConverterFunction(QMetaType* from, QMetaType* to); void QMetaType_unregisterMutableViewFunction(QMetaType* from, QMetaType* to); void QMetaType_unregisterMetaType(QMetaType* type); -void* QMetaType_create22(int type, const void* copy); -int QMetaType_id1(const QMetaType* self, int param1); -void* QMetaType_create1(const QMetaType* self, const void* copy); +void* QMetaType_create3(int type, const void* copy); +int QMetaType_idWithInt(const QMetaType* self, int param1); +void* QMetaType_createWithCopy(const QMetaType* self, const void* copy); void* QMetaType_construct2(const QMetaType* self, void* where, const void* copy); void QMetaType_delete(QMetaType* self); diff --git a/qt6/gen_qmimedatabase.cpp b/qt6/gen_qmimedatabase.cpp index e0b3a34b..7917c9c0 100644 --- a/qt6/gen_qmimedatabase.cpp +++ b/qt6/gen_qmimedatabase.cpp @@ -105,7 +105,7 @@ QMimeType* QMimeDatabase_mimeTypeForFile2(const QMimeDatabase* self, struct miqt return new QMimeType(self->mimeTypeForFile(fileName_QString, static_cast(mode))); } -QMimeType* QMimeDatabase_mimeTypeForFile22(const QMimeDatabase* self, QFileInfo* fileInfo, int mode) { +QMimeType* QMimeDatabase_mimeTypeForFile3(const QMimeDatabase* self, QFileInfo* fileInfo, int mode) { return new QMimeType(self->mimeTypeForFile(*fileInfo, static_cast(mode))); } diff --git a/qt6/gen_qmimedatabase.go b/qt6/gen_qmimedatabase.go index 7c9d4577..6339909d 100644 --- a/qt6/gen_qmimedatabase.go +++ b/qt6/gen_qmimedatabase.go @@ -186,8 +186,8 @@ func (this *QMimeDatabase) MimeTypeForFile2(fileName string, mode QMimeDatabase_ return _goptr } -func (this *QMimeDatabase) MimeTypeForFile22(fileInfo *QFileInfo, mode QMimeDatabase__MatchMode) *QMimeType { - _goptr := newQMimeType(C.QMimeDatabase_mimeTypeForFile22(this.h, fileInfo.cPointer(), (C.int)(mode))) +func (this *QMimeDatabase) MimeTypeForFile3(fileInfo *QFileInfo, mode QMimeDatabase__MatchMode) *QMimeType { + _goptr := newQMimeType(C.QMimeDatabase_mimeTypeForFile3(this.h, fileInfo.cPointer(), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qmimedatabase.h b/qt6/gen_qmimedatabase.h index a492e7c7..d4a0733d 100644 --- a/qt6/gen_qmimedatabase.h +++ b/qt6/gen_qmimedatabase.h @@ -41,7 +41,7 @@ QMimeType* QMimeDatabase_mimeTypeForFileNameAndData2(const QMimeDatabase* self, struct miqt_string QMimeDatabase_suffixForFileName(const QMimeDatabase* self, struct miqt_string fileName); struct miqt_array /* of QMimeType* */ QMimeDatabase_allMimeTypes(const QMimeDatabase* self); QMimeType* QMimeDatabase_mimeTypeForFile2(const QMimeDatabase* self, struct miqt_string fileName, int mode); -QMimeType* QMimeDatabase_mimeTypeForFile22(const QMimeDatabase* self, QFileInfo* fileInfo, int mode); +QMimeType* QMimeDatabase_mimeTypeForFile3(const QMimeDatabase* self, QFileInfo* fileInfo, int mode); void QMimeDatabase_delete(QMimeDatabase* self); #ifdef __cplusplus diff --git a/qt6/gen_qmutex.cpp b/qt6/gen_qmutex.cpp index ecccf813..79a8d2f0 100644 --- a/qt6/gen_qmutex.cpp +++ b/qt6/gen_qmutex.cpp @@ -76,7 +76,7 @@ bool QRecursiveMutex_tryLock2(QRecursiveMutex* self) { return self->try_lock(); } -bool QRecursiveMutex_tryLock1(QRecursiveMutex* self, int timeout) { +bool QRecursiveMutex_tryLockWithTimeout(QRecursiveMutex* self, int timeout) { return self->tryLock(static_cast(timeout)); } diff --git a/qt6/gen_qmutex.go b/qt6/gen_qmutex.go index 3bafc2b9..ce1cef45 100644 --- a/qt6/gen_qmutex.go +++ b/qt6/gen_qmutex.go @@ -199,8 +199,8 @@ func (this *QRecursiveMutex) TryLock2() bool { return (bool)(C.QRecursiveMutex_tryLock2(this.h)) } -func (this *QRecursiveMutex) TryLock1(timeout int) bool { - return (bool)(C.QRecursiveMutex_tryLock1(this.h, (C.int)(timeout))) +func (this *QRecursiveMutex) TryLockWithTimeout(timeout int) bool { + return (bool)(C.QRecursiveMutex_tryLockWithTimeout(this.h, (C.int)(timeout))) } // Delete this object from C++ memory. diff --git a/qt6/gen_qmutex.h b/qt6/gen_qmutex.h index e6d905a5..cce4575c 100644 --- a/qt6/gen_qmutex.h +++ b/qt6/gen_qmutex.h @@ -42,7 +42,7 @@ void QRecursiveMutex_lock(QRecursiveMutex* self); bool QRecursiveMutex_tryLock(QRecursiveMutex* self); void QRecursiveMutex_unlock(QRecursiveMutex* self); bool QRecursiveMutex_tryLock2(QRecursiveMutex* self); -bool QRecursiveMutex_tryLock1(QRecursiveMutex* self, int timeout); +bool QRecursiveMutex_tryLockWithTimeout(QRecursiveMutex* self, int timeout); void QRecursiveMutex_delete(QRecursiveMutex* self); #ifdef __cplusplus diff --git a/qt6/gen_qobject.cpp b/qt6/gen_qobject.cpp index 0c6c756f..9dcb9095 100644 --- a/qt6/gen_qobject.cpp +++ b/qt6/gen_qobject.cpp @@ -24,7 +24,7 @@ extern "C" { #endif void miqt_exec_callback_QObject_destroyed(intptr_t); -void miqt_exec_callback_QObject_destroyed1(intptr_t, QObject*); +void miqt_exec_callback_QObject_destroyedWithQObject(intptr_t, QObject*); bool miqt_exec_callback_QObject_event(QObject*, intptr_t, QEvent*); bool miqt_exec_callback_QObject_eventFilter(QObject*, intptr_t, QObject*, QEvent*); void miqt_exec_callback_QObject_timerEvent(QObject*, intptr_t, QTimerEvent*); @@ -418,7 +418,7 @@ int QObject_startTimer2(QObject* self, int interval, int timerType) { return self->startTimer(static_cast(interval), static_cast(timerType)); } -QMetaObject__Connection* QObject_connect5(QObject* sender, QMetaMethod* signal, QObject* receiver, QMetaMethod* method, int type) { +QMetaObject__Connection* QObject_connect3(QObject* sender, QMetaMethod* signal, QObject* receiver, QMetaMethod* method, int type) { return new QMetaObject::Connection(QObject::connect(sender, *signal, receiver, *method, static_cast(type))); } @@ -426,14 +426,14 @@ QMetaObject__Connection* QObject_connect4(const QObject* self, QObject* sender, return new QMetaObject::Connection(self->connect(sender, signal, member, static_cast(type))); } -void QObject_destroyed1(QObject* self, QObject* param1) { +void QObject_destroyedWithQObject(QObject* self, QObject* param1) { self->destroyed(param1); } -void QObject_connect_destroyed1(QObject* self, intptr_t slot) { +void QObject_connect_destroyedWithQObject(QObject* self, intptr_t slot) { MiqtVirtualQObject::connect(self, static_cast(&QObject::destroyed), self, [=](QObject* param1) { QObject* sigval1 = param1; - miqt_exec_callback_QObject_destroyed1(slot, sigval1); + miqt_exec_callback_QObject_destroyedWithQObject(slot, sigval1); }); } diff --git a/qt6/gen_qobject.go b/qt6/gen_qobject.go index c87d28be..d599865a 100644 --- a/qt6/gen_qobject.go +++ b/qt6/gen_qobject.go @@ -334,8 +334,8 @@ func (this *QObject) StartTimer2(interval int, timerType TimerType) int { return (int)(C.QObject_startTimer2(this.h, (C.int)(interval), (C.int)(timerType))) } -func QObject_Connect5(sender *QObject, signal *QMetaMethod, receiver *QObject, method *QMetaMethod, typeVal ConnectionType) *QMetaObject__Connection { - _goptr := newQMetaObject__Connection(C.QObject_connect5(sender.cPointer(), signal.cPointer(), receiver.cPointer(), method.cPointer(), (C.int)(typeVal))) +func QObject_Connect3(sender *QObject, signal *QMetaMethod, receiver *QObject, method *QMetaMethod, typeVal ConnectionType) *QMetaObject__Connection { + _goptr := newQMetaObject__Connection(C.QObject_connect3(sender.cPointer(), signal.cPointer(), receiver.cPointer(), method.cPointer(), (C.int)(typeVal))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -350,15 +350,15 @@ func (this *QObject) Connect4(sender *QObject, signal string, member string, typ return _goptr } -func (this *QObject) Destroyed1(param1 *QObject) { - C.QObject_destroyed1(this.h, param1.cPointer()) +func (this *QObject) DestroyedWithQObject(param1 *QObject) { + C.QObject_destroyedWithQObject(this.h, param1.cPointer()) } -func (this *QObject) OnDestroyed1(slot func(param1 *QObject)) { - C.QObject_connect_destroyed1(this.h, C.intptr_t(cgo.NewHandle(slot))) +func (this *QObject) OnDestroyedWithQObject(slot func(param1 *QObject)) { + C.QObject_connect_destroyedWithQObject(this.h, C.intptr_t(cgo.NewHandle(slot))) } -//export miqt_exec_callback_QObject_destroyed1 -func miqt_exec_callback_QObject_destroyed1(cb C.intptr_t, param1 *C.QObject) { +//export miqt_exec_callback_QObject_destroyedWithQObject +func miqt_exec_callback_QObject_destroyedWithQObject(cb C.intptr_t, param1 *C.QObject) { gofunc, ok := cgo.Handle(cb).Value().(func(param1 *QObject)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/gen_qobject.h b/qt6/gen_qobject.h index c9e4e0c3..20027c3d 100644 --- a/qt6/gen_qobject.h +++ b/qt6/gen_qobject.h @@ -107,10 +107,10 @@ void QObject_disconnectNotify(QObject* self, QMetaMethod* signal); struct miqt_string QObject_tr2(const char* s, const char* c); struct miqt_string QObject_tr3(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 type); +QMetaObject__Connection* QObject_connect3(QObject* sender, QMetaMethod* signal, QObject* receiver, QMetaMethod* method, int type); QMetaObject__Connection* QObject_connect4(const QObject* self, QObject* sender, const char* signal, const char* member, int type); -void QObject_destroyed1(QObject* self, QObject* param1); -void QObject_connect_destroyed1(QObject* self, intptr_t slot); +void QObject_destroyedWithQObject(QObject* self, QObject* param1); +void QObject_connect_destroyedWithQObject(QObject* self, intptr_t slot); bool QObject_override_virtual_event(void* self, intptr_t slot); bool QObject_virtualbase_event(void* self, QEvent* event); bool QObject_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt6/gen_qobjectdefs.cpp b/qt6/gen_qobjectdefs.cpp index 6ab7bab9..40126663 100644 --- a/qt6/gen_qobjectdefs.cpp +++ b/qt6/gen_qobjectdefs.cpp @@ -275,7 +275,7 @@ 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_tr2(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(); @@ -286,11 +286,11 @@ struct miqt_string QMetaObject_tr3(const QMetaObject* self, const char* s, const return _ms; } -QMetaObject__Connection* QMetaObject_connect5(QObject* sender, int signal_index, QObject* receiver, int method_index, int type) { +QMetaObject__Connection* QMetaObject_connect2(QObject* sender, int signal_index, QObject* receiver, int method_index, int type) { return new QMetaObject::Connection(QMetaObject::connect(sender, static_cast(signal_index), receiver, static_cast(method_index), static_cast(type))); } -QMetaObject__Connection* QMetaObject_connect6(QObject* sender, int signal_index, QObject* receiver, int method_index, int type, int* types) { +QMetaObject__Connection* QMetaObject_connect3(QObject* sender, int signal_index, QObject* receiver, int method_index, int type, int* types) { return new QMetaObject::Connection(QMetaObject::connect(sender, static_cast(signal_index), receiver, static_cast(method_index), static_cast(type), static_cast(types))); } @@ -334,127 +334,127 @@ bool QMetaObject_invokeMethod14(QObject* obj, const char* member, int param3, QG return QMetaObject::invokeMethod(obj, member, static_cast(param3), *ret, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaObject_invokeMethod42(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0) { +bool QMetaObject_invokeMethod15(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0) { return QMetaObject::invokeMethod(obj, member, *ret, *val0); } -bool QMetaObject_invokeMethod52(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaObject_invokeMethod16(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1); } -bool QMetaObject_invokeMethod62(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaObject_invokeMethod17(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2); } -bool QMetaObject_invokeMethod72(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaObject_invokeMethod18(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3); } -bool QMetaObject_invokeMethod82(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaObject_invokeMethod19(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3, *val4); } -bool QMetaObject_invokeMethod92(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaObject_invokeMethod20(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaObject_invokeMethod102(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaObject_invokeMethod21(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaObject_invokeMethod112(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaObject_invokeMethod22(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaObject_invokeMethod122(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaObject_invokeMethod23(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaObject_invokeMethod132(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaObject_invokeMethod24(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return QMetaObject::invokeMethod(obj, member, *ret, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaObject_invokeMethod43(QObject* obj, const char* member, int type, QGenericArgument* val0) { +bool QMetaObject_invokeMethod25(QObject* obj, const char* member, int type, QGenericArgument* val0) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0); } -bool QMetaObject_invokeMethod53(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaObject_invokeMethod26(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1); } -bool QMetaObject_invokeMethod63(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaObject_invokeMethod27(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2); } -bool QMetaObject_invokeMethod73(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaObject_invokeMethod28(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3); } -bool QMetaObject_invokeMethod83(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaObject_invokeMethod29(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3, *val4); } -bool QMetaObject_invokeMethod93(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaObject_invokeMethod30(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaObject_invokeMethod103(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaObject_invokeMethod31(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaObject_invokeMethod113(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaObject_invokeMethod32(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaObject_invokeMethod123(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaObject_invokeMethod33(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaObject_invokeMethod133(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaObject_invokeMethod34(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return QMetaObject::invokeMethod(obj, member, static_cast(type), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaObject_invokeMethod32(QObject* obj, const char* member, QGenericArgument* val0) { +bool QMetaObject_invokeMethod35(QObject* obj, const char* member, QGenericArgument* val0) { return QMetaObject::invokeMethod(obj, member, *val0); } -bool QMetaObject_invokeMethod44(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaObject_invokeMethod36(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1) { return QMetaObject::invokeMethod(obj, member, *val0, *val1); } -bool QMetaObject_invokeMethod54(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaObject_invokeMethod37(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2); } -bool QMetaObject_invokeMethod64(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaObject_invokeMethod38(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3); } -bool QMetaObject_invokeMethod74(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaObject_invokeMethod39(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3, *val4); } -bool QMetaObject_invokeMethod84(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaObject_invokeMethod40(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaObject_invokeMethod94(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaObject_invokeMethod41(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaObject_invokeMethod104(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaObject_invokeMethod42(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaObject_invokeMethod114(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaObject_invokeMethod43(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaObject_invokeMethod124(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaObject_invokeMethod44(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return QMetaObject::invokeMethod(obj, member, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -QObject* QMetaObject_newInstance1(const QMetaObject* self, QGenericArgument* val0) { +QObject* QMetaObject_newInstanceWithVal0(const QMetaObject* self, QGenericArgument* val0) { return self->newInstance(*val0); } diff --git a/qt6/gen_qobjectdefs.go b/qt6/gen_qobjectdefs.go index c73dfa39..961694a9 100644 --- a/qt6/gen_qobjectdefs.go +++ b/qt6/gen_qobjectdefs.go @@ -507,25 +507,25 @@ func (this *QMetaObject) NewInstance() *QObject { return newQObject(C.QMetaObject_newInstance(this.h)) } -func (this *QMetaObject) Tr3(s string, c string, n int) string { +func (this *QMetaObject) Tr2(s string, c string, n int) string { s_Cstring := C.CString(s) defer C.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)) + var _ms C.struct_miqt_string = C.QMetaObject_tr2(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 } -func QMetaObject_Connect5(sender *QObject, signal_index int, receiver *QObject, method_index int, typeVal int) *QMetaObject__Connection { - _goptr := newQMetaObject__Connection(C.QMetaObject_connect5(sender.cPointer(), (C.int)(signal_index), receiver.cPointer(), (C.int)(method_index), (C.int)(typeVal))) +func QMetaObject_Connect2(sender *QObject, signal_index int, receiver *QObject, method_index int, typeVal int) *QMetaObject__Connection { + _goptr := newQMetaObject__Connection(C.QMetaObject_connect2(sender.cPointer(), (C.int)(signal_index), receiver.cPointer(), (C.int)(method_index), (C.int)(typeVal))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QMetaObject_Connect6(sender *QObject, signal_index int, receiver *QObject, method_index int, typeVal int, types *int) *QMetaObject__Connection { - _goptr := newQMetaObject__Connection(C.QMetaObject_connect6(sender.cPointer(), (C.int)(signal_index), receiver.cPointer(), (C.int)(method_index), (C.int)(typeVal), (*C.int)(unsafe.Pointer(types)))) +func QMetaObject_Connect3(sender *QObject, signal_index int, receiver *QObject, method_index int, typeVal int, types *int) *QMetaObject__Connection { + _goptr := newQMetaObject__Connection(C.QMetaObject_connect3(sender.cPointer(), (C.int)(signal_index), receiver.cPointer(), (C.int)(method_index), (C.int)(typeVal), (*C.int)(unsafe.Pointer(types)))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -590,188 +590,188 @@ func QMetaObject_InvokeMethod14(obj *QObject, member string, param3 ConnectionTy return (bool)(C.QMetaObject_invokeMethod14(obj.cPointer(), member_Cstring, (C.int)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func QMetaObject_InvokeMethod42(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument) bool { +func QMetaObject_InvokeMethod15(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod42(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer())) + return (bool)(C.QMetaObject_invokeMethod15(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer())) } -func QMetaObject_InvokeMethod52(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { +func QMetaObject_InvokeMethod16(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod52(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer())) + return (bool)(C.QMetaObject_invokeMethod16(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer())) } -func QMetaObject_InvokeMethod62(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { +func QMetaObject_InvokeMethod17(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod62(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) + return (bool)(C.QMetaObject_invokeMethod17(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func QMetaObject_InvokeMethod72(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { +func QMetaObject_InvokeMethod18(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod72(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) + return (bool)(C.QMetaObject_invokeMethod18(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func QMetaObject_InvokeMethod82(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { +func QMetaObject_InvokeMethod19(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod82(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) + return (bool)(C.QMetaObject_invokeMethod19(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func QMetaObject_InvokeMethod92(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { +func QMetaObject_InvokeMethod20(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod92(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) + return (bool)(C.QMetaObject_invokeMethod20(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func QMetaObject_InvokeMethod102(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { +func QMetaObject_InvokeMethod21(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod102(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) + return (bool)(C.QMetaObject_invokeMethod21(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func QMetaObject_InvokeMethod112(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { +func QMetaObject_InvokeMethod22(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod112(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) + return (bool)(C.QMetaObject_invokeMethod22(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func QMetaObject_InvokeMethod122(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { +func QMetaObject_InvokeMethod23(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod122(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) + return (bool)(C.QMetaObject_invokeMethod23(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func QMetaObject_InvokeMethod132(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { +func QMetaObject_InvokeMethod24(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod132(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) + return (bool)(C.QMetaObject_invokeMethod24(obj.cPointer(), member_Cstring, retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func QMetaObject_InvokeMethod43(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument) bool { +func QMetaObject_InvokeMethod25(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod43(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer())) + return (bool)(C.QMetaObject_invokeMethod25(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer())) } -func QMetaObject_InvokeMethod53(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument) bool { +func QMetaObject_InvokeMethod26(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod53(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer())) + return (bool)(C.QMetaObject_invokeMethod26(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer())) } -func QMetaObject_InvokeMethod63(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { +func QMetaObject_InvokeMethod27(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod63(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer())) + return (bool)(C.QMetaObject_invokeMethod27(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func QMetaObject_InvokeMethod73(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { +func QMetaObject_InvokeMethod28(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod73(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) + return (bool)(C.QMetaObject_invokeMethod28(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func QMetaObject_InvokeMethod83(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { +func QMetaObject_InvokeMethod29(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod83(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) + return (bool)(C.QMetaObject_invokeMethod29(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func QMetaObject_InvokeMethod93(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { +func QMetaObject_InvokeMethod30(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod93(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) + return (bool)(C.QMetaObject_invokeMethod30(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func QMetaObject_InvokeMethod103(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { +func QMetaObject_InvokeMethod31(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod103(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) + return (bool)(C.QMetaObject_invokeMethod31(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func QMetaObject_InvokeMethod113(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { +func QMetaObject_InvokeMethod32(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod113(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) + return (bool)(C.QMetaObject_invokeMethod32(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func QMetaObject_InvokeMethod123(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { +func QMetaObject_InvokeMethod33(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod123(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) + return (bool)(C.QMetaObject_invokeMethod33(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func QMetaObject_InvokeMethod133(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { +func QMetaObject_InvokeMethod34(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod133(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) + return (bool)(C.QMetaObject_invokeMethod34(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func QMetaObject_InvokeMethod32(obj *QObject, member string, val0 QGenericArgument) bool { +func QMetaObject_InvokeMethod35(obj *QObject, member string, val0 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod32(obj.cPointer(), member_Cstring, val0.cPointer())) + return (bool)(C.QMetaObject_invokeMethod35(obj.cPointer(), member_Cstring, val0.cPointer())) } -func QMetaObject_InvokeMethod44(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument) bool { +func QMetaObject_InvokeMethod36(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod44(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer())) + return (bool)(C.QMetaObject_invokeMethod36(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer())) } -func QMetaObject_InvokeMethod54(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { +func QMetaObject_InvokeMethod37(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod54(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer())) + return (bool)(C.QMetaObject_invokeMethod37(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer())) } -func QMetaObject_InvokeMethod64(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { +func QMetaObject_InvokeMethod38(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod64(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) + return (bool)(C.QMetaObject_invokeMethod38(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } -func QMetaObject_InvokeMethod74(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { +func QMetaObject_InvokeMethod39(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod74(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) + return (bool)(C.QMetaObject_invokeMethod39(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } -func QMetaObject_InvokeMethod84(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { +func QMetaObject_InvokeMethod40(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod84(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) + return (bool)(C.QMetaObject_invokeMethod40(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } -func QMetaObject_InvokeMethod94(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { +func QMetaObject_InvokeMethod41(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod94(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) + return (bool)(C.QMetaObject_invokeMethod41(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } -func QMetaObject_InvokeMethod104(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { +func QMetaObject_InvokeMethod42(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod104(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) + return (bool)(C.QMetaObject_invokeMethod42(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } -func QMetaObject_InvokeMethod114(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { +func QMetaObject_InvokeMethod43(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod114(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) + return (bool)(C.QMetaObject_invokeMethod43(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } -func QMetaObject_InvokeMethod124(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { +func QMetaObject_InvokeMethod44(obj *QObject, member string, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_invokeMethod124(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) + return (bool)(C.QMetaObject_invokeMethod44(obj.cPointer(), member_Cstring, val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } -func (this *QMetaObject) NewInstance1(val0 QGenericArgument) *QObject { - return newQObject(C.QMetaObject_newInstance1(this.h, val0.cPointer())) +func (this *QMetaObject) NewInstanceWithVal0(val0 QGenericArgument) *QObject { + return newQObject(C.QMetaObject_newInstanceWithVal0(this.h, val0.cPointer())) } func (this *QMetaObject) NewInstance2(val0 QGenericArgument, val1 QGenericArgument) *QObject { diff --git a/qt6/gen_qobjectdefs.h b/qt6/gen_qobjectdefs.h index 8e363d0f..3f9c5d8c 100644 --- a/qt6/gen_qobjectdefs.h +++ b/qt6/gen_qobjectdefs.h @@ -117,9 +117,9 @@ bool QMetaObject_invokeMethod2(QObject* obj, const char* member, QGenericReturnA bool QMetaObject_invokeMethod3(QObject* obj, const char* member, int type); 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); -QMetaObject__Connection* QMetaObject_connect5(QObject* sender, int signal_index, QObject* receiver, int method_index, int type); -QMetaObject__Connection* QMetaObject_connect6(QObject* sender, int signal_index, QObject* receiver, int method_index, int type, int* types); +struct miqt_string QMetaObject_tr2(const QMetaObject* self, const char* s, const char* c, int n); +QMetaObject__Connection* QMetaObject_connect2(QObject* sender, int signal_index, QObject* receiver, int method_index, int type); +QMetaObject__Connection* QMetaObject_connect3(QObject* sender, int signal_index, QObject* receiver, int method_index, int type, int* types); bool QMetaObject_invokeMethod5(QObject* obj, const char* member, int param3, QGenericReturnArgument* ret, QGenericArgument* val0); bool QMetaObject_invokeMethod6(QObject* obj, const char* member, int param3, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1); bool QMetaObject_invokeMethod7(QObject* obj, const char* member, int param3, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); @@ -130,37 +130,37 @@ bool QMetaObject_invokeMethod11(QObject* obj, const char* member, int param3, QG bool QMetaObject_invokeMethod12(QObject* obj, const char* member, int param3, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); bool QMetaObject_invokeMethod13(QObject* obj, const char* member, int param3, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); bool QMetaObject_invokeMethod14(QObject* obj, const char* member, int param3, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaObject_invokeMethod42(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0); -bool QMetaObject_invokeMethod52(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaObject_invokeMethod62(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaObject_invokeMethod72(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaObject_invokeMethod82(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaObject_invokeMethod92(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaObject_invokeMethod102(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaObject_invokeMethod112(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaObject_invokeMethod122(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaObject_invokeMethod132(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaObject_invokeMethod43(QObject* obj, const char* member, int type, QGenericArgument* val0); -bool QMetaObject_invokeMethod53(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaObject_invokeMethod63(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaObject_invokeMethod73(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaObject_invokeMethod83(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaObject_invokeMethod93(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaObject_invokeMethod103(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaObject_invokeMethod113(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaObject_invokeMethod123(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaObject_invokeMethod133(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaObject_invokeMethod32(QObject* obj, const char* member, QGenericArgument* val0); -bool QMetaObject_invokeMethod44(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaObject_invokeMethod54(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaObject_invokeMethod64(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaObject_invokeMethod74(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaObject_invokeMethod84(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaObject_invokeMethod94(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaObject_invokeMethod104(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaObject_invokeMethod114(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaObject_invokeMethod124(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -QObject* QMetaObject_newInstance1(const QMetaObject* self, QGenericArgument* val0); +bool QMetaObject_invokeMethod15(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0); +bool QMetaObject_invokeMethod16(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaObject_invokeMethod17(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaObject_invokeMethod18(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaObject_invokeMethod19(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaObject_invokeMethod20(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaObject_invokeMethod21(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaObject_invokeMethod22(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaObject_invokeMethod23(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaObject_invokeMethod24(QObject* obj, const char* member, QGenericReturnArgument* ret, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaObject_invokeMethod25(QObject* obj, const char* member, int type, QGenericArgument* val0); +bool QMetaObject_invokeMethod26(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaObject_invokeMethod27(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaObject_invokeMethod28(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaObject_invokeMethod29(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaObject_invokeMethod30(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaObject_invokeMethod31(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaObject_invokeMethod32(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaObject_invokeMethod33(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaObject_invokeMethod34(QObject* obj, const char* member, int type, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaObject_invokeMethod35(QObject* obj, const char* member, QGenericArgument* val0); +bool QMetaObject_invokeMethod36(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaObject_invokeMethod37(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaObject_invokeMethod38(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaObject_invokeMethod39(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaObject_invokeMethod40(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaObject_invokeMethod41(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaObject_invokeMethod42(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaObject_invokeMethod43(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaObject_invokeMethod44(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +QObject* QMetaObject_newInstanceWithVal0(const QMetaObject* self, QGenericArgument* val0); QObject* QMetaObject_newInstance2(const QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1); QObject* QMetaObject_newInstance3(const QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); QObject* QMetaObject_newInstance4(const QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); diff --git a/qt6/gen_qpagesize.cpp b/qt6/gen_qpagesize.cpp index ca0e0cf0..fed5e3bc 100644 --- a/qt6/gen_qpagesize.cpp +++ b/qt6/gen_qpagesize.cpp @@ -199,12 +199,12 @@ QSize* QPageSize_sizePixels2(int pageSizeId, int resolution) { return new QSize(QPageSize::sizePixels(static_cast(pageSizeId), static_cast(resolution))); } -int QPageSize_id22(QSize* pointSize, int matchPolicy) { +int QPageSize_id3(QSize* pointSize, int matchPolicy) { QPageSize::PageSizeId _ret = QPageSize::id(*pointSize, static_cast(matchPolicy)); return static_cast(_ret); } -int QPageSize_id3(QSizeF* size, int units, int matchPolicy) { +int QPageSize_id4(QSizeF* size, int units, int matchPolicy) { QPageSize::PageSizeId _ret = QPageSize::id(*size, static_cast(units), static_cast(matchPolicy)); return static_cast(_ret); } diff --git a/qt6/gen_qpagesize.go b/qt6/gen_qpagesize.go index bbb364a7..d3a04e64 100644 --- a/qt6/gen_qpagesize.go +++ b/qt6/gen_qpagesize.go @@ -406,12 +406,12 @@ func QPageSize_SizePixels2(pageSizeId QPageSize__PageSizeId, resolution int) *QS return _goptr } -func QPageSize_Id22(pointSize *QSize, matchPolicy QPageSize__SizeMatchPolicy) QPageSize__PageSizeId { - return (QPageSize__PageSizeId)(C.QPageSize_id22(pointSize.cPointer(), (C.int)(matchPolicy))) +func QPageSize_Id3(pointSize *QSize, matchPolicy QPageSize__SizeMatchPolicy) QPageSize__PageSizeId { + return (QPageSize__PageSizeId)(C.QPageSize_id3(pointSize.cPointer(), (C.int)(matchPolicy))) } -func QPageSize_Id3(size *QSizeF, units QPageSize__Unit, matchPolicy QPageSize__SizeMatchPolicy) QPageSize__PageSizeId { - return (QPageSize__PageSizeId)(C.QPageSize_id3(size.cPointer(), (C.int)(units), (C.int)(matchPolicy))) +func QPageSize_Id4(size *QSizeF, units QPageSize__Unit, matchPolicy QPageSize__SizeMatchPolicy) QPageSize__PageSizeId { + return (QPageSize__PageSizeId)(C.QPageSize_id4(size.cPointer(), (C.int)(units), (C.int)(matchPolicy))) } // Delete this object from C++ memory. diff --git a/qt6/gen_qpagesize.h b/qt6/gen_qpagesize.h index c40b39f8..e6a9cd22 100644 --- a/qt6/gen_qpagesize.h +++ b/qt6/gen_qpagesize.h @@ -64,8 +64,8 @@ int QPageSize_definitionUnitsWithPageSizeId(int pageSizeId); QSizeF* QPageSize_size2(int pageSizeId, int units); QSize* QPageSize_sizePointsWithPageSizeId(int pageSizeId); QSize* QPageSize_sizePixels2(int pageSizeId, int resolution); -int QPageSize_id22(QSize* pointSize, int matchPolicy); -int QPageSize_id3(QSizeF* size, int units, int matchPolicy); +int QPageSize_id3(QSize* pointSize, int matchPolicy); +int QPageSize_id4(QSizeF* size, int units, int matchPolicy); void QPageSize_delete(QPageSize* self); #ifdef __cplusplus diff --git a/qt6/gen_qpainter.cpp b/qt6/gen_qpainter.cpp index fc2c6f68..a635875b 100644 --- a/qt6/gen_qpainter.cpp +++ b/qt6/gen_qpainter.cpp @@ -858,11 +858,11 @@ void QPainter_endNativePainting(QPainter* self) { self->endNativePainting(); } -void QPainter_setClipRect22(QPainter* self, QRectF* param1, int op) { +void QPainter_setClipRect3(QPainter* self, QRectF* param1, int op) { self->setClipRect(*param1, static_cast(op)); } -void QPainter_setClipRect23(QPainter* self, QRect* param1, int op) { +void QPainter_setClipRect4(QPainter* self, QRect* param1, int op) { self->setClipRect(*param1, static_cast(op)); } @@ -886,11 +886,11 @@ void QPainter_setWorldTransform2(QPainter* self, QTransform* matrix, bool combin self->setWorldTransform(*matrix, combine); } -void QPainter_drawPolygon32(QPainter* self, QPointF* points, int pointCount, int fillRule) { +void QPainter_drawPolygon4(QPainter* self, QPointF* points, int pointCount, int fillRule) { self->drawPolygon(points, static_cast(pointCount), static_cast(fillRule)); } -void QPainter_drawPolygon33(QPainter* self, QPoint* points, int pointCount, int fillRule) { +void QPainter_drawPolygon6(QPainter* self, QPoint* points, int pointCount, int fillRule) { self->drawPolygon(points, static_cast(pointCount), static_cast(fillRule)); } @@ -898,91 +898,91 @@ void QPainter_drawRoundedRect4(QPainter* self, QRectF* rect, double xRadius, dou self->drawRoundedRect(*rect, static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } -void QPainter_drawRoundedRect7(QPainter* self, int x, int y, int w, int h, double xRadius, double yRadius, int mode) { +void QPainter_drawRoundedRect5(QPainter* self, int x, int y, int w, int h, double xRadius, double yRadius, int mode) { self->drawRoundedRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } -void QPainter_drawRoundedRect42(QPainter* self, QRect* rect, double xRadius, double yRadius, int mode) { +void QPainter_drawRoundedRect6(QPainter* self, QRect* rect, double xRadius, double yRadius, int mode) { self->drawRoundedRect(*rect, static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } -void QPainter_drawTiledPixmap32(QPainter* self, QRectF* rect, QPixmap* pm, QPointF* offset) { +void QPainter_drawTiledPixmap4(QPainter* self, QRectF* rect, QPixmap* pm, QPointF* offset) { self->drawTiledPixmap(*rect, *pm, *offset); } -void QPainter_drawTiledPixmap6(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx) { +void QPainter_drawTiledPixmap5(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx) { self->drawTiledPixmap(static_cast(x), static_cast(y), static_cast(w), static_cast(h), *param5, static_cast(sx)); } -void QPainter_drawTiledPixmap7(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx, int sy) { +void QPainter_drawTiledPixmap6(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx, int sy) { self->drawTiledPixmap(static_cast(x), static_cast(y), static_cast(w), static_cast(h), *param5, static_cast(sx), static_cast(sy)); } -void QPainter_drawTiledPixmap33(QPainter* self, QRect* param1, QPixmap* param2, QPoint* param3) { +void QPainter_drawTiledPixmap7(QPainter* self, QRect* param1, QPixmap* param2, QPoint* param3) { self->drawTiledPixmap(*param1, *param2, *param3); } -void QPainter_drawPixmapFragments4(QPainter* self, QPainter__PixmapFragment* fragments, int fragmentCount, QPixmap* pixmap, int hints) { +void QPainter_drawPixmapFragments2(QPainter* self, QPainter__PixmapFragment* fragments, int fragmentCount, QPixmap* pixmap, int hints) { self->drawPixmapFragments(fragments, static_cast(fragmentCount), *pixmap, static_cast(hints)); } -void QPainter_drawImage42(QPainter* self, QRectF* targetRect, QImage* image, QRectF* sourceRect, int flags) { +void QPainter_drawImage10(QPainter* self, QRectF* targetRect, QImage* image, QRectF* sourceRect, int flags) { self->drawImage(*targetRect, *image, *sourceRect, static_cast(flags)); } -void QPainter_drawImage43(QPainter* self, QRect* targetRect, QImage* image, QRect* sourceRect, int flags) { +void QPainter_drawImage11(QPainter* self, QRect* targetRect, QImage* image, QRect* sourceRect, int flags) { self->drawImage(*targetRect, *image, *sourceRect, static_cast(flags)); } -void QPainter_drawImage44(QPainter* self, QPointF* p, QImage* image, QRectF* sr, int flags) { +void QPainter_drawImage12(QPainter* self, QPointF* p, QImage* image, QRectF* sr, int flags) { self->drawImage(*p, *image, *sr, static_cast(flags)); } -void QPainter_drawImage45(QPainter* self, QPoint* p, QImage* image, QRect* sr, int flags) { +void QPainter_drawImage13(QPainter* self, QPoint* p, QImage* image, QRect* sr, int flags) { self->drawImage(*p, *image, *sr, static_cast(flags)); } -void QPainter_drawImage46(QPainter* self, int x, int y, QImage* image, int sx) { +void QPainter_drawImage14(QPainter* self, int x, int y, QImage* image, int sx) { self->drawImage(static_cast(x), static_cast(y), *image, static_cast(sx)); } -void QPainter_drawImage52(QPainter* self, int x, int y, QImage* image, int sx, int sy) { +void QPainter_drawImage15(QPainter* self, int x, int y, QImage* image, int sx, int sy) { self->drawImage(static_cast(x), static_cast(y), *image, static_cast(sx), static_cast(sy)); } -void QPainter_drawImage62(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw) { +void QPainter_drawImage16(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw) { self->drawImage(static_cast(x), static_cast(y), *image, static_cast(sx), static_cast(sy), static_cast(sw)); } -void QPainter_drawImage72(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh) { +void QPainter_drawImage17(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh) { self->drawImage(static_cast(x), static_cast(y), *image, static_cast(sx), static_cast(sy), static_cast(sw), static_cast(sh)); } -void QPainter_drawImage82(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh, int flags) { +void QPainter_drawImage18(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh, int flags) { 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) { +void QPainter_drawText9(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) { +void QPainter_drawText10(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) { +void QPainter_drawText11(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) { +void QPainter_drawText12(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) { +QRectF* QPainter_boundingRect5(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)); } @@ -1003,19 +1003,19 @@ QPainter__PixmapFragment* QPainter__PixmapFragment_create(QPointF* pos, QRectF* return new QPainter::PixmapFragment(QPainter::PixmapFragment::create(*pos, *sourceRect)); } -QPainter__PixmapFragment* QPainter__PixmapFragment_create3(QPointF* pos, QRectF* sourceRect, double scaleX) { +QPainter__PixmapFragment* QPainter__PixmapFragment_create2(QPointF* pos, QRectF* sourceRect, double scaleX) { return new QPainter::PixmapFragment(QPainter::PixmapFragment::create(*pos, *sourceRect, static_cast(scaleX))); } -QPainter__PixmapFragment* QPainter__PixmapFragment_create4(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY) { +QPainter__PixmapFragment* QPainter__PixmapFragment_create3(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY) { return new QPainter::PixmapFragment(QPainter::PixmapFragment::create(*pos, *sourceRect, static_cast(scaleX), static_cast(scaleY))); } -QPainter__PixmapFragment* QPainter__PixmapFragment_create5(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation) { +QPainter__PixmapFragment* QPainter__PixmapFragment_create4(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation) { return new QPainter::PixmapFragment(QPainter::PixmapFragment::create(*pos, *sourceRect, static_cast(scaleX), static_cast(scaleY), static_cast(rotation))); } -QPainter__PixmapFragment* QPainter__PixmapFragment_create6(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation, double opacity) { +QPainter__PixmapFragment* QPainter__PixmapFragment_create5(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation, double opacity) { return new QPainter::PixmapFragment(QPainter::PixmapFragment::create(*pos, *sourceRect, static_cast(scaleX), static_cast(scaleY), static_cast(rotation), static_cast(opacity))); } diff --git a/qt6/gen_qpainter.go b/qt6/gen_qpainter.go index 1556a674..8958b078 100644 --- a/qt6/gen_qpainter.go +++ b/qt6/gen_qpainter.go @@ -971,12 +971,12 @@ func (this *QPainter) EndNativePainting() { C.QPainter_endNativePainting(this.h) } -func (this *QPainter) SetClipRect22(param1 *QRectF, op ClipOperation) { - C.QPainter_setClipRect22(this.h, param1.cPointer(), (C.int)(op)) +func (this *QPainter) SetClipRect3(param1 *QRectF, op ClipOperation) { + C.QPainter_setClipRect3(this.h, param1.cPointer(), (C.int)(op)) } -func (this *QPainter) SetClipRect23(param1 *QRect, op ClipOperation) { - C.QPainter_setClipRect23(this.h, param1.cPointer(), (C.int)(op)) +func (this *QPainter) SetClipRect4(param1 *QRect, op ClipOperation) { + C.QPainter_setClipRect4(this.h, param1.cPointer(), (C.int)(op)) } func (this *QPainter) SetClipRect5(x int, y int, w int, h int, op ClipOperation) { @@ -999,120 +999,120 @@ func (this *QPainter) SetWorldTransform2(matrix *QTransform, combine bool) { C.QPainter_setWorldTransform2(this.h, matrix.cPointer(), (C.bool)(combine)) } -func (this *QPainter) DrawPolygon32(points *QPointF, pointCount int, fillRule FillRule) { - C.QPainter_drawPolygon32(this.h, points.cPointer(), (C.int)(pointCount), (C.int)(fillRule)) +func (this *QPainter) DrawPolygon4(points *QPointF, pointCount int, fillRule FillRule) { + C.QPainter_drawPolygon4(this.h, points.cPointer(), (C.int)(pointCount), (C.int)(fillRule)) } -func (this *QPainter) DrawPolygon33(points *QPoint, pointCount int, fillRule FillRule) { - C.QPainter_drawPolygon33(this.h, points.cPointer(), (C.int)(pointCount), (C.int)(fillRule)) +func (this *QPainter) DrawPolygon6(points *QPoint, pointCount int, fillRule FillRule) { + C.QPainter_drawPolygon6(this.h, points.cPointer(), (C.int)(pointCount), (C.int)(fillRule)) } func (this *QPainter) DrawRoundedRect4(rect *QRectF, xRadius float64, yRadius float64, mode SizeMode) { C.QPainter_drawRoundedRect4(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } -func (this *QPainter) DrawRoundedRect7(x int, y int, w int, h int, xRadius float64, yRadius float64, mode SizeMode) { - C.QPainter_drawRoundedRect7(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) +func (this *QPainter) DrawRoundedRect5(x int, y int, w int, h int, xRadius float64, yRadius float64, mode SizeMode) { + C.QPainter_drawRoundedRect5(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } -func (this *QPainter) DrawRoundedRect42(rect *QRect, xRadius float64, yRadius float64, mode SizeMode) { - C.QPainter_drawRoundedRect42(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) +func (this *QPainter) DrawRoundedRect6(rect *QRect, xRadius float64, yRadius float64, mode SizeMode) { + C.QPainter_drawRoundedRect6(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } -func (this *QPainter) DrawTiledPixmap32(rect *QRectF, pm *QPixmap, offset *QPointF) { - C.QPainter_drawTiledPixmap32(this.h, rect.cPointer(), pm.cPointer(), offset.cPointer()) +func (this *QPainter) DrawTiledPixmap4(rect *QRectF, pm *QPixmap, offset *QPointF) { + C.QPainter_drawTiledPixmap4(this.h, rect.cPointer(), pm.cPointer(), offset.cPointer()) } -func (this *QPainter) DrawTiledPixmap6(x int, y int, w int, h int, param5 *QPixmap, sx int) { - C.QPainter_drawTiledPixmap6(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), param5.cPointer(), (C.int)(sx)) +func (this *QPainter) DrawTiledPixmap5(x int, y int, w int, h int, param5 *QPixmap, sx int) { + C.QPainter_drawTiledPixmap5(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), param5.cPointer(), (C.int)(sx)) } -func (this *QPainter) DrawTiledPixmap7(x int, y int, w int, h int, param5 *QPixmap, sx int, sy int) { - C.QPainter_drawTiledPixmap7(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), param5.cPointer(), (C.int)(sx), (C.int)(sy)) +func (this *QPainter) DrawTiledPixmap6(x int, y int, w int, h int, param5 *QPixmap, sx int, sy int) { + C.QPainter_drawTiledPixmap6(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), param5.cPointer(), (C.int)(sx), (C.int)(sy)) } -func (this *QPainter) DrawTiledPixmap33(param1 *QRect, param2 *QPixmap, param3 *QPoint) { - C.QPainter_drawTiledPixmap33(this.h, param1.cPointer(), param2.cPointer(), param3.cPointer()) +func (this *QPainter) DrawTiledPixmap7(param1 *QRect, param2 *QPixmap, param3 *QPoint) { + C.QPainter_drawTiledPixmap7(this.h, param1.cPointer(), param2.cPointer(), param3.cPointer()) } -func (this *QPainter) DrawPixmapFragments4(fragments *QPainter__PixmapFragment, fragmentCount int, pixmap *QPixmap, hints QPainter__PixmapFragmentHint) { - C.QPainter_drawPixmapFragments4(this.h, fragments.cPointer(), (C.int)(fragmentCount), pixmap.cPointer(), (C.int)(hints)) +func (this *QPainter) DrawPixmapFragments2(fragments *QPainter__PixmapFragment, fragmentCount int, pixmap *QPixmap, hints QPainter__PixmapFragmentHint) { + C.QPainter_drawPixmapFragments2(this.h, fragments.cPointer(), (C.int)(fragmentCount), pixmap.cPointer(), (C.int)(hints)) } -func (this *QPainter) DrawImage42(targetRect *QRectF, image *QImage, sourceRect *QRectF, flags ImageConversionFlag) { - C.QPainter_drawImage42(this.h, targetRect.cPointer(), image.cPointer(), sourceRect.cPointer(), (C.int)(flags)) +func (this *QPainter) DrawImage10(targetRect *QRectF, image *QImage, sourceRect *QRectF, flags ImageConversionFlag) { + C.QPainter_drawImage10(this.h, targetRect.cPointer(), image.cPointer(), sourceRect.cPointer(), (C.int)(flags)) } -func (this *QPainter) DrawImage43(targetRect *QRect, image *QImage, sourceRect *QRect, flags ImageConversionFlag) { - C.QPainter_drawImage43(this.h, targetRect.cPointer(), image.cPointer(), sourceRect.cPointer(), (C.int)(flags)) +func (this *QPainter) DrawImage11(targetRect *QRect, image *QImage, sourceRect *QRect, flags ImageConversionFlag) { + C.QPainter_drawImage11(this.h, targetRect.cPointer(), image.cPointer(), sourceRect.cPointer(), (C.int)(flags)) } -func (this *QPainter) DrawImage44(p *QPointF, image *QImage, sr *QRectF, flags ImageConversionFlag) { - C.QPainter_drawImage44(this.h, p.cPointer(), image.cPointer(), sr.cPointer(), (C.int)(flags)) +func (this *QPainter) DrawImage12(p *QPointF, image *QImage, sr *QRectF, flags ImageConversionFlag) { + C.QPainter_drawImage12(this.h, p.cPointer(), image.cPointer(), sr.cPointer(), (C.int)(flags)) } -func (this *QPainter) DrawImage45(p *QPoint, image *QImage, sr *QRect, flags ImageConversionFlag) { - C.QPainter_drawImage45(this.h, p.cPointer(), image.cPointer(), sr.cPointer(), (C.int)(flags)) +func (this *QPainter) DrawImage13(p *QPoint, image *QImage, sr *QRect, flags ImageConversionFlag) { + C.QPainter_drawImage13(this.h, p.cPointer(), image.cPointer(), sr.cPointer(), (C.int)(flags)) } -func (this *QPainter) DrawImage46(x int, y int, image *QImage, sx int) { - C.QPainter_drawImage46(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx)) +func (this *QPainter) DrawImage14(x int, y int, image *QImage, sx int) { + C.QPainter_drawImage14(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx)) } -func (this *QPainter) DrawImage52(x int, y int, image *QImage, sx int, sy int) { - C.QPainter_drawImage52(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy)) +func (this *QPainter) DrawImage15(x int, y int, image *QImage, sx int, sy int) { + C.QPainter_drawImage15(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy)) } -func (this *QPainter) DrawImage62(x int, y int, image *QImage, sx int, sy int, sw int) { - C.QPainter_drawImage62(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw)) +func (this *QPainter) DrawImage16(x int, y int, image *QImage, sx int, sy int, sw int) { + C.QPainter_drawImage16(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw)) } -func (this *QPainter) DrawImage72(x int, y int, image *QImage, sx int, sy int, sw int, sh int) { - C.QPainter_drawImage72(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw), (C.int)(sh)) +func (this *QPainter) DrawImage17(x int, y int, image *QImage, sx int, sy int, sw int, sh int) { + C.QPainter_drawImage17(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw), (C.int)(sh)) } -func (this *QPainter) DrawImage82(x int, y int, image *QImage, sx int, sy int, sw int, sh int, flags ImageConversionFlag) { - C.QPainter_drawImage82(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw), (C.int)(sh), (C.int)(flags)) +func (this *QPainter) DrawImage18(x int, y int, image *QImage, sx int, sy int, sw int, sh int, flags ImageConversionFlag) { + C.QPainter_drawImage18(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw), (C.int)(sh), (C.int)(flags)) } -func (this *QPainter) DrawText42(r *QRectF, flags int, text string, br *QRectF) { +func (this *QPainter) DrawText9(r *QRectF, flags int, text string, br *QRectF) { text_ms := C.struct_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()) + C.QPainter_drawText9(this.h, r.cPointer(), (C.int)(flags), text_ms, br.cPointer()) } -func (this *QPainter) DrawText43(r *QRect, flags int, text string, br *QRect) { +func (this *QPainter) DrawText10(r *QRect, flags int, text string, br *QRect) { text_ms := C.struct_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()) + C.QPainter_drawText10(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) { +func (this *QPainter) DrawText11(x int, y int, w int, h int, flags int, text string, br *QRect) { text_ms := C.struct_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()) + C.QPainter_drawText11(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) { +func (this *QPainter) DrawText12(r *QRectF, text string, o *QTextOption) { text_ms := C.struct_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()) + C.QPainter_drawText12(this.h, r.cPointer(), text_ms, o.cPointer()) } -func (this *QPainter) BoundingRect32(rect *QRectF, text string, o *QTextOption) *QRectF { +func (this *QPainter) BoundingRect5(rect *QRectF, text string, o *QTextOption) *QRectF { text_ms := C.struct_miqt_string{} text_ms.data = C.CString(text) text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - _goptr := newQRectF(C.QPainter_boundingRect32(this.h, rect.cPointer(), text_ms, o.cPointer())) + _goptr := newQRectF(C.QPainter_boundingRect5(this.h, rect.cPointer(), text_ms, o.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1177,26 +1177,26 @@ func QPainter__PixmapFragment_Create(pos *QPointF, sourceRect *QRectF) *QPainter return _goptr } -func QPainter__PixmapFragment_Create3(pos *QPointF, sourceRect *QRectF, scaleX float64) *QPainter__PixmapFragment { - _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create3(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX))) +func QPainter__PixmapFragment_Create2(pos *QPointF, sourceRect *QRectF, scaleX float64) *QPainter__PixmapFragment { + _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create2(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QPainter__PixmapFragment_Create4(pos *QPointF, sourceRect *QRectF, scaleX float64, scaleY float64) *QPainter__PixmapFragment { - _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create4(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX), (C.double)(scaleY))) +func QPainter__PixmapFragment_Create3(pos *QPointF, sourceRect *QRectF, scaleX float64, scaleY float64) *QPainter__PixmapFragment { + _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create3(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX), (C.double)(scaleY))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QPainter__PixmapFragment_Create5(pos *QPointF, sourceRect *QRectF, scaleX float64, scaleY float64, rotation float64) *QPainter__PixmapFragment { - _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create5(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX), (C.double)(scaleY), (C.double)(rotation))) +func QPainter__PixmapFragment_Create4(pos *QPointF, sourceRect *QRectF, scaleX float64, scaleY float64, rotation float64) *QPainter__PixmapFragment { + _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create4(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX), (C.double)(scaleY), (C.double)(rotation))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QPainter__PixmapFragment_Create6(pos *QPointF, sourceRect *QRectF, scaleX float64, scaleY float64, rotation float64, opacity float64) *QPainter__PixmapFragment { - _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create6(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX), (C.double)(scaleY), (C.double)(rotation), (C.double)(opacity))) +func QPainter__PixmapFragment_Create5(pos *QPointF, sourceRect *QRectF, scaleX float64, scaleY float64, rotation float64, opacity float64) *QPainter__PixmapFragment { + _goptr := newQPainter__PixmapFragment(C.QPainter__PixmapFragment_create5(pos.cPointer(), sourceRect.cPointer(), (C.double)(scaleX), (C.double)(scaleY), (C.double)(rotation), (C.double)(opacity))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qpainter.h b/qt6/gen_qpainter.h index a9a075f2..7ab653e1 100644 --- a/qt6/gen_qpainter.h +++ b/qt6/gen_qpainter.h @@ -262,46 +262,46 @@ bool QPainter_testRenderHint(const QPainter* self, int hint); QPaintEngine* QPainter_paintEngine(const QPainter* self); void QPainter_beginNativePainting(QPainter* self); void QPainter_endNativePainting(QPainter* self); -void QPainter_setClipRect22(QPainter* self, QRectF* param1, int op); -void QPainter_setClipRect23(QPainter* self, QRect* param1, int op); +void QPainter_setClipRect3(QPainter* self, QRectF* param1, int op); +void QPainter_setClipRect4(QPainter* self, QRect* param1, int op); void QPainter_setClipRect5(QPainter* self, int x, int y, int w, int h, int op); void QPainter_setClipRegion2(QPainter* self, QRegion* param1, int op); void QPainter_setClipPath2(QPainter* self, QPainterPath* path, int op); void QPainter_setTransform2(QPainter* self, QTransform* transform, bool combine); void QPainter_setWorldTransform2(QPainter* self, QTransform* matrix, bool combine); -void QPainter_drawPolygon32(QPainter* self, QPointF* points, int pointCount, int fillRule); -void QPainter_drawPolygon33(QPainter* self, QPoint* points, int pointCount, int fillRule); +void QPainter_drawPolygon4(QPainter* self, QPointF* points, int pointCount, int fillRule); +void QPainter_drawPolygon6(QPainter* self, QPoint* points, int pointCount, int fillRule); void QPainter_drawRoundedRect4(QPainter* self, QRectF* rect, double xRadius, double yRadius, int mode); -void QPainter_drawRoundedRect7(QPainter* self, int x, int y, int w, int h, double xRadius, double yRadius, int mode); -void QPainter_drawRoundedRect42(QPainter* self, QRect* rect, double xRadius, double yRadius, int mode); -void QPainter_drawTiledPixmap32(QPainter* self, QRectF* rect, QPixmap* pm, QPointF* offset); -void QPainter_drawTiledPixmap6(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx); -void QPainter_drawTiledPixmap7(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx, int sy); -void QPainter_drawTiledPixmap33(QPainter* self, QRect* param1, QPixmap* param2, QPoint* param3); -void QPainter_drawPixmapFragments4(QPainter* self, QPainter__PixmapFragment* fragments, int fragmentCount, QPixmap* pixmap, int hints); -void QPainter_drawImage42(QPainter* self, QRectF* targetRect, QImage* image, QRectF* sourceRect, int flags); -void QPainter_drawImage43(QPainter* self, QRect* targetRect, QImage* image, QRect* sourceRect, int flags); -void QPainter_drawImage44(QPainter* self, QPointF* p, QImage* image, QRectF* sr, int flags); -void QPainter_drawImage45(QPainter* self, QPoint* p, QImage* image, QRect* sr, int flags); -void QPainter_drawImage46(QPainter* self, int x, int y, QImage* image, int sx); -void QPainter_drawImage52(QPainter* self, int x, int y, QImage* image, int sx, int sy); -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_drawRoundedRect5(QPainter* self, int x, int y, int w, int h, double xRadius, double yRadius, int mode); +void QPainter_drawRoundedRect6(QPainter* self, QRect* rect, double xRadius, double yRadius, int mode); +void QPainter_drawTiledPixmap4(QPainter* self, QRectF* rect, QPixmap* pm, QPointF* offset); +void QPainter_drawTiledPixmap5(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx); +void QPainter_drawTiledPixmap6(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx, int sy); +void QPainter_drawTiledPixmap7(QPainter* self, QRect* param1, QPixmap* param2, QPoint* param3); +void QPainter_drawPixmapFragments2(QPainter* self, QPainter__PixmapFragment* fragments, int fragmentCount, QPixmap* pixmap, int hints); +void QPainter_drawImage10(QPainter* self, QRectF* targetRect, QImage* image, QRectF* sourceRect, int flags); +void QPainter_drawImage11(QPainter* self, QRect* targetRect, QImage* image, QRect* sourceRect, int flags); +void QPainter_drawImage12(QPainter* self, QPointF* p, QImage* image, QRectF* sr, int flags); +void QPainter_drawImage13(QPainter* self, QPoint* p, QImage* image, QRect* sr, int flags); +void QPainter_drawImage14(QPainter* self, int x, int y, QImage* image, int sx); +void QPainter_drawImage15(QPainter* self, int x, int y, QImage* image, int sx, int sy); +void QPainter_drawImage16(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw); +void QPainter_drawImage17(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh); +void QPainter_drawImage18(QPainter* self, int x, int y, QImage* image, int sx, int sy, int sw, int sh, int flags); +void QPainter_drawText9(QPainter* self, QRectF* r, int flags, struct miqt_string text, QRectF* br); +void QPainter_drawText10(QPainter* self, QRect* r, int flags, struct miqt_string text, QRect* br); +void QPainter_drawText11(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string text, QRect* br); +void QPainter_drawText12(QPainter* self, QRectF* r, struct miqt_string text, QTextOption* o); +QRectF* QPainter_boundingRect5(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_delete(QPainter* self); QPainter__PixmapFragment* QPainter__PixmapFragment_create(QPointF* pos, QRectF* sourceRect); -QPainter__PixmapFragment* QPainter__PixmapFragment_create3(QPointF* pos, QRectF* sourceRect, double scaleX); -QPainter__PixmapFragment* QPainter__PixmapFragment_create4(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY); -QPainter__PixmapFragment* QPainter__PixmapFragment_create5(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation); -QPainter__PixmapFragment* QPainter__PixmapFragment_create6(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation, double opacity); +QPainter__PixmapFragment* QPainter__PixmapFragment_create2(QPointF* pos, QRectF* sourceRect, double scaleX); +QPainter__PixmapFragment* QPainter__PixmapFragment_create3(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY); +QPainter__PixmapFragment* QPainter__PixmapFragment_create4(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation); +QPainter__PixmapFragment* QPainter__PixmapFragment_create5(QPointF* pos, QRectF* sourceRect, double scaleX, double scaleY, double rotation, double opacity); void QPainter__PixmapFragment_delete(QPainter__PixmapFragment* self); #ifdef __cplusplus diff --git a/qt6/gen_qpainterpath.cpp b/qt6/gen_qpainterpath.cpp index 082a6f4d..34884bce 100644 --- a/qt6/gen_qpainterpath.cpp +++ b/qt6/gen_qpainterpath.cpp @@ -316,11 +316,11 @@ QPainterPath* QPainterPath_operatorMinusAssign(QPainterPath* self, QPainterPath* return &_ret; } -void QPainterPath_addRoundedRect4(QPainterPath* self, QRectF* rect, double xRadius, double yRadius, int mode) { +void QPainterPath_addRoundedRect3(QPainterPath* self, QRectF* rect, double xRadius, double yRadius, int mode) { self->addRoundedRect(*rect, static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } -void QPainterPath_addRoundedRect7(QPainterPath* self, double x, double y, double w, double h, double xRadius, double yRadius, int mode) { +void QPainterPath_addRoundedRect4(QPainterPath* self, double x, double y, double w, double h, double xRadius, double yRadius, int mode) { self->addRoundedRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } diff --git a/qt6/gen_qpainterpath.go b/qt6/gen_qpainterpath.go index d5b23e4b..9b3e8756 100644 --- a/qt6/gen_qpainterpath.go +++ b/qt6/gen_qpainterpath.go @@ -384,12 +384,12 @@ func (this *QPainterPath) OperatorMinusAssign(other *QPainterPath) *QPainterPath return newQPainterPath(C.QPainterPath_operatorMinusAssign(this.h, other.cPointer())) } -func (this *QPainterPath) AddRoundedRect4(rect *QRectF, xRadius float64, yRadius float64, mode SizeMode) { - C.QPainterPath_addRoundedRect4(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) +func (this *QPainterPath) AddRoundedRect3(rect *QRectF, xRadius float64, yRadius float64, mode SizeMode) { + C.QPainterPath_addRoundedRect3(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } -func (this *QPainterPath) AddRoundedRect7(x float64, y float64, w float64, h float64, xRadius float64, yRadius float64, mode SizeMode) { - C.QPainterPath_addRoundedRect7(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) +func (this *QPainterPath) AddRoundedRect4(x float64, y float64, w float64, h float64, xRadius float64, yRadius float64, mode SizeMode) { + C.QPainterPath_addRoundedRect4(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } // Delete this object from C++ memory. diff --git a/qt6/gen_qpainterpath.h b/qt6/gen_qpainterpath.h index bfdb2136..2955697c 100644 --- a/qt6/gen_qpainterpath.h +++ b/qt6/gen_qpainterpath.h @@ -109,8 +109,8 @@ void QPainterPath_operatorBitwiseAndAssign(QPainterPath* self, QPainterPath* oth void QPainterPath_operatorBitwiseOrAssign(QPainterPath* self, QPainterPath* other); QPainterPath* QPainterPath_operatorPlusAssign(QPainterPath* self, QPainterPath* other); QPainterPath* QPainterPath_operatorMinusAssign(QPainterPath* self, QPainterPath* other); -void QPainterPath_addRoundedRect4(QPainterPath* self, QRectF* rect, double xRadius, double yRadius, int mode); -void QPainterPath_addRoundedRect7(QPainterPath* self, double x, double y, double w, double h, double xRadius, double yRadius, int mode); +void QPainterPath_addRoundedRect3(QPainterPath* self, QRectF* rect, double xRadius, double yRadius, int mode); +void QPainterPath_addRoundedRect4(QPainterPath* self, double x, double y, double w, double h, double xRadius, double yRadius, int mode); void QPainterPath_delete(QPainterPath* self); QPainterPathStroker* QPainterPathStroker_new(); diff --git a/qt6/gen_qpdfwriter.cpp b/qt6/gen_qpdfwriter.cpp index a0bcf8ad..5ab4992e 100644 --- a/qt6/gen_qpdfwriter.cpp +++ b/qt6/gen_qpdfwriter.cpp @@ -554,7 +554,7 @@ struct miqt_string QPdfWriter_tr3(const char* s, const char* c, int n) { return _ms; } -void QPdfWriter_addFileAttachment3(QPdfWriter* self, struct miqt_string fileName, struct miqt_string data, struct miqt_string mimeType) { +void QPdfWriter_addFileAttachment2(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); diff --git a/qt6/gen_qpdfwriter.go b/qt6/gen_qpdfwriter.go index 63bed96e..6ca8fe5a 100644 --- a/qt6/gen_qpdfwriter.go +++ b/qt6/gen_qpdfwriter.go @@ -193,7 +193,7 @@ func QPdfWriter_Tr3(s string, c string, n int) string { return _ret } -func (this *QPdfWriter) AddFileAttachment3(fileName string, data []byte, mimeType string) { +func (this *QPdfWriter) AddFileAttachment2(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)) @@ -209,7 +209,7 @@ func (this *QPdfWriter) AddFileAttachment3(fileName string, data []byte, mimeTyp 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) + C.QPdfWriter_addFileAttachment2(this.h, fileName_ms, data_alias, mimeType_ms) } // Sender can only be called from a QPdfWriter that was directly constructed. diff --git a/qt6/gen_qpdfwriter.h b/qt6/gen_qpdfwriter.h index 5b3093ea..1b697200 100644 --- a/qt6/gen_qpdfwriter.h +++ b/qt6/gen_qpdfwriter.h @@ -74,7 +74,7 @@ QPaintEngine* QPdfWriter_paintEngine(const QPdfWriter* self); int QPdfWriter_metric(const QPdfWriter* self, int id); struct miqt_string QPdfWriter_tr2(const char* s, const char* c); struct miqt_string QPdfWriter_tr3(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_addFileAttachment2(QPdfWriter* self, struct miqt_string fileName, struct miqt_string data, struct miqt_string mimeType); bool QPdfWriter_override_virtual_newPage(void* self, intptr_t slot); bool QPdfWriter_virtualbase_newPage(void* self); bool QPdfWriter_override_virtual_paintEngine(void* self, intptr_t slot); diff --git a/qt6/gen_qpixmap.cpp b/qt6/gen_qpixmap.cpp index 9ad5714a..22b149da 100644 --- a/qt6/gen_qpixmap.cpp +++ b/qt6/gen_qpixmap.cpp @@ -381,11 +381,11 @@ bool QPixmap_operatorNot(const QPixmap* self) { return self->operator!(); } -void QPixmap_fill1(QPixmap* self, QColor* fillColor) { +void QPixmap_fillWithFillColor(QPixmap* self, QColor* fillColor) { self->fill(*fillColor); } -QBitmap* QPixmap_createHeuristicMask1(const QPixmap* self, bool clipTight) { +QBitmap* QPixmap_createHeuristicMaskWithClipTight(const QPixmap* self, bool clipTight) { return new QBitmap(self->createHeuristicMask(clipTight)); } @@ -393,19 +393,19 @@ QBitmap* QPixmap_createMaskFromColor2(const QPixmap* self, QColor* maskColor, in return new QBitmap(self->createMaskFromColor(*maskColor, static_cast(mode))); } -QPixmap* QPixmap_scaled3(const QPixmap* self, int w, int h, int aspectMode) { +QPixmap* QPixmap_scaled2(const QPixmap* self, int w, int h, int aspectMode) { return new QPixmap(self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode))); } -QPixmap* QPixmap_scaled4(const QPixmap* self, int w, int h, int aspectMode, int mode) { +QPixmap* QPixmap_scaled3(const QPixmap* self, int w, int h, int aspectMode, int mode) { return new QPixmap(self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode), static_cast(mode))); } -QPixmap* QPixmap_scaled2(const QPixmap* self, QSize* s, int aspectMode) { +QPixmap* QPixmap_scaled4(const QPixmap* self, QSize* s, int aspectMode) { return new QPixmap(self->scaled(*s, static_cast(aspectMode))); } -QPixmap* QPixmap_scaled32(const QPixmap* self, QSize* s, int aspectMode, int mode) { +QPixmap* QPixmap_scaled5(const QPixmap* self, QSize* s, int aspectMode, int mode) { return new QPixmap(self->scaled(*s, static_cast(aspectMode), static_cast(mode))); } @@ -439,20 +439,20 @@ bool QPixmap_load3(QPixmap* self, struct miqt_string fileName, const char* forma return self->load(fileName_QString, format, static_cast(flags)); } -bool QPixmap_loadFromData3(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format) { +bool QPixmap_loadFromData2(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format) { return self->loadFromData(static_cast(buf), static_cast(len), format); } -bool QPixmap_loadFromData4(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format, int flags) { +bool QPixmap_loadFromData3(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format, int flags) { return self->loadFromData(static_cast(buf), static_cast(len), format, static_cast(flags)); } -bool QPixmap_loadFromData2(QPixmap* self, struct miqt_string data, const char* format) { +bool QPixmap_loadFromData4(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, struct miqt_string data, const char* format, int flags) { +bool QPixmap_loadFromData5(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)); } @@ -467,11 +467,11 @@ bool QPixmap_save3(const QPixmap* self, struct miqt_string fileName, const char* return self->save(fileName_QString, format, static_cast(quality)); } -bool QPixmap_save22(const QPixmap* self, QIODevice* device, const char* format) { +bool QPixmap_save4(const QPixmap* self, QIODevice* device, const char* format) { return self->save(device, format); } -bool QPixmap_save32(const QPixmap* self, QIODevice* device, const char* format, int quality) { +bool QPixmap_save5(const QPixmap* self, QIODevice* device, const char* format, int quality) { return self->save(device, format, static_cast(quality)); } @@ -479,11 +479,11 @@ bool QPixmap_convertFromImage2(QPixmap* self, QImage* img, int flags) { return self->convertFromImage(*img, static_cast(flags)); } -QPixmap* QPixmap_copy1(const QPixmap* self, QRect* rect) { +QPixmap* QPixmap_copyWithRect(const QPixmap* self, QRect* rect) { return new QPixmap(self->copy(*rect)); } -void QPixmap_scroll7(QPixmap* self, int dx, int dy, int x, int y, int width, int height, QRegion* exposed) { +void QPixmap_scroll3(QPixmap* self, int dx, int dy, int x, int y, int width, int height, QRegion* exposed) { self->scroll(static_cast(dx), static_cast(dy), static_cast(x), static_cast(y), static_cast(width), static_cast(height), exposed); } diff --git a/qt6/gen_qpixmap.go b/qt6/gen_qpixmap.go index 743d3242..cbe4aa8a 100644 --- a/qt6/gen_qpixmap.go +++ b/qt6/gen_qpixmap.go @@ -343,12 +343,12 @@ func (this *QPixmap) OperatorNot() bool { return (bool)(C.QPixmap_operatorNot(this.h)) } -func (this *QPixmap) Fill1(fillColor *QColor) { - C.QPixmap_fill1(this.h, fillColor.cPointer()) +func (this *QPixmap) FillWithFillColor(fillColor *QColor) { + C.QPixmap_fillWithFillColor(this.h, fillColor.cPointer()) } -func (this *QPixmap) CreateHeuristicMask1(clipTight bool) *QBitmap { - _goptr := newQBitmap(C.QPixmap_createHeuristicMask1(this.h, (C.bool)(clipTight))) +func (this *QPixmap) CreateHeuristicMaskWithClipTight(clipTight bool) *QBitmap { + _goptr := newQBitmap(C.QPixmap_createHeuristicMaskWithClipTight(this.h, (C.bool)(clipTight))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -359,26 +359,26 @@ func (this *QPixmap) CreateMaskFromColor2(maskColor *QColor, mode MaskMode) *QBi return _goptr } -func (this *QPixmap) Scaled3(w int, h int, aspectMode AspectRatioMode) *QPixmap { - _goptr := newQPixmap(C.QPixmap_scaled3(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode))) +func (this *QPixmap) Scaled2(w int, h int, aspectMode AspectRatioMode) *QPixmap { + _goptr := newQPixmap(C.QPixmap_scaled2(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QPixmap) Scaled4(w int, h int, aspectMode AspectRatioMode, mode TransformationMode) *QPixmap { - _goptr := newQPixmap(C.QPixmap_scaled4(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode), (C.int)(mode))) +func (this *QPixmap) Scaled3(w int, h int, aspectMode AspectRatioMode, mode TransformationMode) *QPixmap { + _goptr := newQPixmap(C.QPixmap_scaled3(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QPixmap) Scaled2(s *QSize, aspectMode AspectRatioMode) *QPixmap { - _goptr := newQPixmap(C.QPixmap_scaled2(this.h, s.cPointer(), (C.int)(aspectMode))) +func (this *QPixmap) Scaled4(s *QSize, aspectMode AspectRatioMode) *QPixmap { + _goptr := newQPixmap(C.QPixmap_scaled4(this.h, s.cPointer(), (C.int)(aspectMode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QPixmap) Scaled32(s *QSize, aspectMode AspectRatioMode, mode TransformationMode) *QPixmap { - _goptr := newQPixmap(C.QPixmap_scaled32(this.h, s.cPointer(), (C.int)(aspectMode), (C.int)(mode))) +func (this *QPixmap) Scaled5(s *QSize, aspectMode AspectRatioMode, mode TransformationMode) *QPixmap { + _goptr := newQPixmap(C.QPixmap_scaled5(this.h, s.cPointer(), (C.int)(aspectMode), (C.int)(mode))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -433,19 +433,19 @@ func (this *QPixmap) Load3(fileName string, format string, flags ImageConversion 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 { +func (this *QPixmap) LoadFromData2(buf *byte, lenVal uint, format string) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_loadFromData3(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.uint)(lenVal), format_Cstring)) + return (bool)(C.QPixmap_loadFromData2(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.uint)(lenVal), format_Cstring)) } -func (this *QPixmap) LoadFromData4(buf *byte, lenVal uint, format string, flags ImageConversionFlag) bool { +func (this *QPixmap) LoadFromData3(buf *byte, lenVal uint, format string, flags ImageConversionFlag) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_loadFromData4(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.uint)(lenVal), format_Cstring, (C.int)(flags))) + return (bool)(C.QPixmap_loadFromData3(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.uint)(lenVal), format_Cstring, (C.int)(flags))) } -func (this *QPixmap) LoadFromData2(data []byte, format string) bool { +func (this *QPixmap) LoadFromData4(data []byte, format string) bool { data_alias := C.struct_miqt_string{} if len(data) > 0 { data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) @@ -455,10 +455,10 @@ func (this *QPixmap) LoadFromData2(data []byte, format string) bool { 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_alias, format_Cstring)) + return (bool)(C.QPixmap_loadFromData4(this.h, data_alias, format_Cstring)) } -func (this *QPixmap) LoadFromData32(data []byte, format string, flags ImageConversionFlag) bool { +func (this *QPixmap) LoadFromData5(data []byte, format string, flags ImageConversionFlag) bool { data_alias := C.struct_miqt_string{} if len(data) > 0 { data_alias.data = (*C.char)(unsafe.Pointer(&data[0])) @@ -468,7 +468,7 @@ func (this *QPixmap) LoadFromData32(data []byte, format string, flags ImageConve 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_alias, format_Cstring, (C.int)(flags))) + return (bool)(C.QPixmap_loadFromData5(this.h, data_alias, format_Cstring, (C.int)(flags))) } func (this *QPixmap) Save2(fileName string, format string) bool { @@ -491,30 +491,30 @@ func (this *QPixmap) Save3(fileName string, format string, quality int) bool { return (bool)(C.QPixmap_save3(this.h, fileName_ms, format_Cstring, (C.int)(quality))) } -func (this *QPixmap) Save22(device *QIODevice, format string) bool { +func (this *QPixmap) Save4(device *QIODevice, format string) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_save22(this.h, device.cPointer(), format_Cstring)) + return (bool)(C.QPixmap_save4(this.h, device.cPointer(), format_Cstring)) } -func (this *QPixmap) Save32(device *QIODevice, format string, quality int) bool { +func (this *QPixmap) Save5(device *QIODevice, format string, quality int) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_save32(this.h, device.cPointer(), format_Cstring, (C.int)(quality))) + return (bool)(C.QPixmap_save5(this.h, device.cPointer(), format_Cstring, (C.int)(quality))) } func (this *QPixmap) ConvertFromImage2(img *QImage, flags ImageConversionFlag) bool { return (bool)(C.QPixmap_convertFromImage2(this.h, img.cPointer(), (C.int)(flags))) } -func (this *QPixmap) Copy1(rect *QRect) *QPixmap { - _goptr := newQPixmap(C.QPixmap_copy1(this.h, rect.cPointer())) +func (this *QPixmap) CopyWithRect(rect *QRect) *QPixmap { + _goptr := newQPixmap(C.QPixmap_copyWithRect(this.h, rect.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QPixmap) Scroll7(dx int, dy int, x int, y int, width int, height int, exposed *QRegion) { - C.QPixmap_scroll7(this.h, (C.int)(dx), (C.int)(dy), (C.int)(x), (C.int)(y), (C.int)(width), (C.int)(height), exposed.cPointer()) +func (this *QPixmap) Scroll3(dx int, dy int, x int, y int, width int, height int, exposed *QRegion) { + C.QPixmap_scroll3(this.h, (C.int)(dx), (C.int)(dy), (C.int)(x), (C.int)(y), (C.int)(width), (C.int)(height), exposed.cPointer()) } func (this *QPixmap) Scroll4(dx int, dy int, rect *QRect, exposed *QRegion) { diff --git a/qt6/gen_qpixmap.h b/qt6/gen_qpixmap.h index 58ce84c5..239c5cb9 100644 --- a/qt6/gen_qpixmap.h +++ b/qt6/gen_qpixmap.h @@ -105,13 +105,13 @@ bool QPixmap_isQBitmap(const QPixmap* self); QPaintEngine* QPixmap_paintEngine(const QPixmap* self); bool QPixmap_operatorNot(const QPixmap* self); int QPixmap_metric(const QPixmap* self, int param1); -void QPixmap_fill1(QPixmap* self, QColor* fillColor); -QBitmap* QPixmap_createHeuristicMask1(const QPixmap* self, bool clipTight); +void QPixmap_fillWithFillColor(QPixmap* self, QColor* fillColor); +QBitmap* QPixmap_createHeuristicMaskWithClipTight(const QPixmap* self, bool clipTight); QBitmap* QPixmap_createMaskFromColor2(const QPixmap* self, QColor* maskColor, int mode); -QPixmap* QPixmap_scaled3(const QPixmap* self, int w, int h, int aspectMode); -QPixmap* QPixmap_scaled4(const QPixmap* self, int w, int h, int aspectMode, int mode); -QPixmap* QPixmap_scaled2(const QPixmap* self, QSize* s, int aspectMode); -QPixmap* QPixmap_scaled32(const QPixmap* self, QSize* s, int aspectMode, int mode); +QPixmap* QPixmap_scaled2(const QPixmap* self, int w, int h, int aspectMode); +QPixmap* QPixmap_scaled3(const QPixmap* self, int w, int h, int aspectMode, int mode); +QPixmap* QPixmap_scaled4(const QPixmap* self, QSize* s, int aspectMode); +QPixmap* QPixmap_scaled5(const QPixmap* self, QSize* s, int aspectMode, int mode); QPixmap* QPixmap_scaledToWidth2(const QPixmap* self, int w, int mode); QPixmap* QPixmap_scaledToHeight2(const QPixmap* self, int h, int mode); QPixmap* QPixmap_transformed2(const QPixmap* self, QTransform* param1, int mode); @@ -119,17 +119,17 @@ 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_loadFromData3(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format); -bool QPixmap_loadFromData4(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format, int flags); -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_loadFromData2(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format); +bool QPixmap_loadFromData3(QPixmap* self, const unsigned char* buf, unsigned int len, const char* format, int flags); +bool QPixmap_loadFromData4(QPixmap* self, struct miqt_string data, const char* format); +bool QPixmap_loadFromData5(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_save4(const QPixmap* self, QIODevice* device, const char* format); +bool QPixmap_save5(const QPixmap* self, QIODevice* device, const char* format, int quality); bool QPixmap_convertFromImage2(QPixmap* self, QImage* img, int flags); -QPixmap* QPixmap_copy1(const QPixmap* self, QRect* rect); -void QPixmap_scroll7(QPixmap* self, int dx, int dy, int x, int y, int width, int height, QRegion* exposed); +QPixmap* QPixmap_copyWithRect(const QPixmap* self, QRect* rect); +void QPixmap_scroll3(QPixmap* self, int dx, int dy, int x, int y, int width, int height, QRegion* exposed); void QPixmap_scroll4(QPixmap* self, int dx, int dy, QRect* rect, QRegion* exposed); bool QPixmap_override_virtual_devType(void* self, intptr_t slot); int QPixmap_virtualbase_devType(const void* self); diff --git a/qt6/gen_qplaintextedit.cpp b/qt6/gen_qplaintextedit.cpp index 3d9d8bf6..d5fd024d 100644 --- a/qt6/gen_qplaintextedit.cpp +++ b/qt6/gen_qplaintextedit.cpp @@ -1755,7 +1755,7 @@ bool QPlainTextEdit_find2(QPlainTextEdit* self, struct miqt_string exp, int opti return self->find(exp_QString, static_cast(options)); } -bool QPlainTextEdit_find22(QPlainTextEdit* self, QRegularExpression* exp, int options) { +bool QPlainTextEdit_find3(QPlainTextEdit* self, QRegularExpression* exp, int options) { return self->find(*exp, static_cast(options)); } @@ -1763,11 +1763,11 @@ void QPlainTextEdit_moveCursor2(QPlainTextEdit* self, int operation, int mode) { self->moveCursor(static_cast(operation), static_cast(mode)); } -void QPlainTextEdit_zoomIn1(QPlainTextEdit* self, int range) { +void QPlainTextEdit_zoomInWithRange(QPlainTextEdit* self, int range) { self->zoomIn(static_cast(range)); } -void QPlainTextEdit_zoomOut1(QPlainTextEdit* self, int range) { +void QPlainTextEdit_zoomOutWithRange(QPlainTextEdit* self, int range) { self->zoomOut(static_cast(range)); } diff --git a/qt6/gen_qplaintextedit.go b/qt6/gen_qplaintextedit.go index 7ce3fa84..2ceb511e 100644 --- a/qt6/gen_qplaintextedit.go +++ b/qt6/gen_qplaintextedit.go @@ -653,20 +653,20 @@ func (this *QPlainTextEdit) Find2(exp string, options QTextDocument__FindFlag) b return (bool)(C.QPlainTextEdit_find2(this.h, exp_ms, (C.int)(options))) } -func (this *QPlainTextEdit) Find22(exp *QRegularExpression, options QTextDocument__FindFlag) bool { - return (bool)(C.QPlainTextEdit_find22(this.h, exp.cPointer(), (C.int)(options))) +func (this *QPlainTextEdit) Find3(exp *QRegularExpression, options QTextDocument__FindFlag) bool { + return (bool)(C.QPlainTextEdit_find3(this.h, exp.cPointer(), (C.int)(options))) } func (this *QPlainTextEdit) MoveCursor2(operation QTextCursor__MoveOperation, mode QTextCursor__MoveMode) { C.QPlainTextEdit_moveCursor2(this.h, (C.int)(operation), (C.int)(mode)) } -func (this *QPlainTextEdit) ZoomIn1(rangeVal int) { - C.QPlainTextEdit_zoomIn1(this.h, (C.int)(rangeVal)) +func (this *QPlainTextEdit) ZoomInWithRange(rangeVal int) { + C.QPlainTextEdit_zoomInWithRange(this.h, (C.int)(rangeVal)) } -func (this *QPlainTextEdit) ZoomOut1(rangeVal int) { - C.QPlainTextEdit_zoomOut1(this.h, (C.int)(rangeVal)) +func (this *QPlainTextEdit) ZoomOutWithRange(rangeVal int) { + C.QPlainTextEdit_zoomOutWithRange(this.h, (C.int)(rangeVal)) } // FirstVisibleBlock can only be called from a QPlainTextEdit that was directly constructed. diff --git a/qt6/gen_qplaintextedit.h b/qt6/gen_qplaintextedit.h index dfbf41f6..3a60d0ec 100644 --- a/qt6/gen_qplaintextedit.h +++ b/qt6/gen_qplaintextedit.h @@ -264,10 +264,10 @@ void QPlainTextEdit_doSetTextCursor(QPlainTextEdit* self, QTextCursor* cursor); struct miqt_string QPlainTextEdit_tr2(const char* s, const char* c); struct miqt_string QPlainTextEdit_tr3(const char* s, const char* c, int n); bool QPlainTextEdit_find2(QPlainTextEdit* self, struct miqt_string exp, int options); -bool QPlainTextEdit_find22(QPlainTextEdit* self, QRegularExpression* exp, int options); +bool QPlainTextEdit_find3(QPlainTextEdit* self, QRegularExpression* exp, int options); void QPlainTextEdit_moveCursor2(QPlainTextEdit* self, int operation, int mode); -void QPlainTextEdit_zoomIn1(QPlainTextEdit* self, int range); -void QPlainTextEdit_zoomOut1(QPlainTextEdit* self, int range); +void QPlainTextEdit_zoomInWithRange(QPlainTextEdit* self, int range); +void QPlainTextEdit_zoomOutWithRange(QPlainTextEdit* self, int range); bool QPlainTextEdit_override_virtual_loadResource(void* self, intptr_t slot); QVariant* QPlainTextEdit_virtualbase_loadResource(void* self, int type, QUrl* name); bool QPlainTextEdit_override_virtual_inputMethodQuery(void* self, intptr_t slot); diff --git a/qt6/gen_qpointingdevice.cpp b/qt6/gen_qpointingdevice.cpp index 5c8268ad..1047fe6a 100644 --- a/qt6/gen_qpointingdevice.cpp +++ b/qt6/gen_qpointingdevice.cpp @@ -341,7 +341,7 @@ struct miqt_string QPointingDevice_tr3(const char* s, const char* c, int n) { return _ms; } -QPointingDevice* QPointingDevice_primaryPointingDevice1(struct miqt_string seatName) { +QPointingDevice* QPointingDevice_primaryPointingDeviceWithSeatName(struct miqt_string seatName) { QString seatName_QString = QString::fromUtf8(seatName.data, seatName.len); return (QPointingDevice*) QPointingDevice::primaryPointingDevice(seatName_QString); } diff --git a/qt6/gen_qpointingdevice.go b/qt6/gen_qpointingdevice.go index 57ddac13..c41cd903 100644 --- a/qt6/gen_qpointingdevice.go +++ b/qt6/gen_qpointingdevice.go @@ -315,12 +315,12 @@ func QPointingDevice_Tr3(s string, c string, n int) string { return _ret } -func QPointingDevice_PrimaryPointingDevice1(seatName string) *QPointingDevice { +func QPointingDevice_PrimaryPointingDeviceWithSeatName(seatName string) *QPointingDevice { seatName_ms := C.struct_miqt_string{} seatName_ms.data = C.CString(seatName) seatName_ms.len = C.size_t(len(seatName)) defer C.free(unsafe.Pointer(seatName_ms.data)) - return newQPointingDevice(C.QPointingDevice_primaryPointingDevice1(seatName_ms)) + return newQPointingDevice(C.QPointingDevice_primaryPointingDeviceWithSeatName(seatName_ms)) } // Sender can only be called from a QPointingDevice that was directly constructed. diff --git a/qt6/gen_qpointingdevice.h b/qt6/gen_qpointingdevice.h index 36d9c888..7fc97277 100644 --- a/qt6/gen_qpointingdevice.h +++ b/qt6/gen_qpointingdevice.h @@ -70,7 +70,7 @@ void QPointingDevice_grabChanged(const QPointingDevice* self, QObject* grabber, void QPointingDevice_connect_grabChanged(QPointingDevice* self, intptr_t slot); struct miqt_string QPointingDevice_tr2(const char* s, const char* c); struct miqt_string QPointingDevice_tr3(const char* s, const char* c, int n); -QPointingDevice* QPointingDevice_primaryPointingDevice1(struct miqt_string seatName); +QPointingDevice* QPointingDevice_primaryPointingDeviceWithSeatName(struct miqt_string seatName); bool QPointingDevice_override_virtual_event(void* self, intptr_t slot); bool QPointingDevice_virtualbase_event(void* self, QEvent* event); bool QPointingDevice_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt6/gen_qprocess.cpp b/qt6/gen_qprocess.cpp index 33baf51c..81531c32 100644 --- a/qt6/gen_qprocess.cpp +++ b/qt6/gen_qprocess.cpp @@ -1019,7 +1019,7 @@ struct miqt_string QProcess_tr3(const char* s, const char* c, int n) { return _ms; } -void QProcess_start22(QProcess* self, struct miqt_string program, struct miqt_array /* of struct miqt_string */ arguments) { +void QProcess_start3(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); @@ -1031,7 +1031,7 @@ void QProcess_start22(QProcess* self, struct miqt_string program, struct miqt_ar self->start(program_QString, arguments_QList); } -void QProcess_start3(QProcess* self, struct miqt_string program, struct miqt_array /* of struct miqt_string */ arguments, int mode) { +void QProcess_start4(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); @@ -1043,7 +1043,7 @@ void QProcess_start3(QProcess* self, struct miqt_string program, struct miqt_arr self->start(program_QString, arguments_QList, static_cast(mode)); } -void QProcess_start1(QProcess* self, int mode) { +void QProcess_startWithMode(QProcess* self, int mode) { self->start(static_cast(mode)); } @@ -1052,7 +1052,7 @@ void QProcess_startCommand2(QProcess* self, struct miqt_string command, int mode self->startCommand(command_QString, static_cast(mode)); } -bool QProcess_startDetached1(QProcess* self, long long* pid) { +bool QProcess_startDetachedWithPid(QProcess* self, long long* pid) { return self->startDetached(static_cast(pid)); } @@ -1066,11 +1066,11 @@ void QProcess_setStandardErrorFile2(QProcess* self, struct miqt_string fileName, self->setStandardErrorFile(fileName_QString, static_cast(mode)); } -bool QProcess_waitForStarted1(QProcess* self, int msecs) { +bool QProcess_waitForStartedWithMsecs(QProcess* self, int msecs) { return self->waitForStarted(static_cast(msecs)); } -bool QProcess_waitForFinished1(QProcess* self, int msecs) { +bool QProcess_waitForFinishedWithMsecs(QProcess* self, int msecs) { return self->waitForFinished(static_cast(msecs)); } diff --git a/qt6/gen_qprocess.go b/qt6/gen_qprocess.go index d5f0d5d9..270bdb68 100644 --- a/qt6/gen_qprocess.go +++ b/qt6/gen_qprocess.go @@ -669,7 +669,7 @@ func QProcess_Tr3(s string, c string, n int) string { return _ret } -func (this *QProcess) Start22(program string, arguments []string) { +func (this *QProcess) Start3(program string, arguments []string) { program_ms := C.struct_miqt_string{} program_ms.data = C.CString(program) program_ms.len = C.size_t(len(program)) @@ -684,10 +684,10 @@ func (this *QProcess) Start22(program string, arguments []string) { arguments_CArray[i] = arguments_i_ms } arguments_ma := C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} - C.QProcess_start22(this.h, program_ms, arguments_ma) + C.QProcess_start3(this.h, program_ms, arguments_ma) } -func (this *QProcess) Start3(program string, arguments []string, mode QIODeviceBase__OpenModeFlag) { +func (this *QProcess) Start4(program string, arguments []string, mode QIODeviceBase__OpenModeFlag) { program_ms := C.struct_miqt_string{} program_ms.data = C.CString(program) program_ms.len = C.size_t(len(program)) @@ -702,11 +702,11 @@ func (this *QProcess) Start3(program string, arguments []string, mode QIODeviceB arguments_CArray[i] = arguments_i_ms } arguments_ma := C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} - C.QProcess_start3(this.h, program_ms, arguments_ma, (C.int)(mode)) + C.QProcess_start4(this.h, program_ms, arguments_ma, (C.int)(mode)) } -func (this *QProcess) Start1(mode QIODeviceBase__OpenModeFlag) { - C.QProcess_start1(this.h, (C.int)(mode)) +func (this *QProcess) StartWithMode(mode QIODeviceBase__OpenModeFlag) { + C.QProcess_startWithMode(this.h, (C.int)(mode)) } func (this *QProcess) StartCommand2(command string, mode QIODeviceBase__OpenModeFlag) { @@ -717,8 +717,8 @@ func (this *QProcess) StartCommand2(command string, mode QIODeviceBase__OpenMode C.QProcess_startCommand2(this.h, command_ms, (C.int)(mode)) } -func (this *QProcess) StartDetached1(pid *int64) bool { - return (bool)(C.QProcess_startDetached1(this.h, (*C.longlong)(unsafe.Pointer(pid)))) +func (this *QProcess) StartDetachedWithPid(pid *int64) bool { + return (bool)(C.QProcess_startDetachedWithPid(this.h, (*C.longlong)(unsafe.Pointer(pid)))) } func (this *QProcess) SetStandardOutputFile2(fileName string, mode QIODeviceBase__OpenModeFlag) { @@ -737,12 +737,12 @@ func (this *QProcess) SetStandardErrorFile2(fileName string, mode QIODeviceBase_ C.QProcess_setStandardErrorFile2(this.h, fileName_ms, (C.int)(mode)) } -func (this *QProcess) WaitForStarted1(msecs int) bool { - return (bool)(C.QProcess_waitForStarted1(this.h, (C.int)(msecs))) +func (this *QProcess) WaitForStartedWithMsecs(msecs int) bool { + return (bool)(C.QProcess_waitForStartedWithMsecs(this.h, (C.int)(msecs))) } -func (this *QProcess) WaitForFinished1(msecs int) bool { - return (bool)(C.QProcess_waitForFinished1(this.h, (C.int)(msecs))) +func (this *QProcess) WaitForFinishedWithMsecs(msecs int) bool { + return (bool)(C.QProcess_waitForFinishedWithMsecs(this.h, (C.int)(msecs))) } func QProcess_Execute2(program string, arguments []string) int { diff --git a/qt6/gen_qprocess.h b/qt6/gen_qprocess.h index 81e4b4d1..d8a33e08 100644 --- a/qt6/gen_qprocess.h +++ b/qt6/gen_qprocess.h @@ -120,15 +120,15 @@ long long QProcess_readData(QProcess* self, char* data, long long maxlen); long long QProcess_writeData(QProcess* self, const char* data, long long len); struct miqt_string QProcess_tr2(const char* s, const char* c); struct miqt_string QProcess_tr3(const char* s, const char* c, int n); -void QProcess_start22(QProcess* self, struct miqt_string program, struct miqt_array /* of struct miqt_string */ arguments); -void QProcess_start3(QProcess* self, struct miqt_string program, struct miqt_array /* of struct miqt_string */ arguments, int mode); -void QProcess_start1(QProcess* self, int mode); +void QProcess_start3(QProcess* self, struct miqt_string program, struct miqt_array /* of struct miqt_string */ arguments); +void QProcess_start4(QProcess* self, struct miqt_string program, struct miqt_array /* of struct miqt_string */ arguments, int mode); +void QProcess_startWithMode(QProcess* self, int mode); void QProcess_startCommand2(QProcess* self, struct miqt_string command, int mode); -bool QProcess_startDetached1(QProcess* self, long long* pid); +bool QProcess_startDetachedWithPid(QProcess* self, long long* pid); 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_waitForFinished1(QProcess* self, int msecs); +bool QProcess_waitForStartedWithMsecs(QProcess* self, int msecs); +bool QProcess_waitForFinishedWithMsecs(QProcess* self, int msecs); int QProcess_execute2(struct miqt_string program, struct miqt_array /* of struct miqt_string */ arguments); bool QProcess_startDetached2(struct miqt_string program, struct miqt_array /* of struct miqt_string */ arguments); bool QProcess_startDetached3(struct miqt_string program, struct miqt_array /* of struct miqt_string */ arguments, struct miqt_string workingDirectory); diff --git a/qt6/gen_qproperty.cpp b/qt6/gen_qproperty.cpp index c755fded..231ea7e7 100644 --- a/qt6/gen_qproperty.cpp +++ b/qt6/gen_qproperty.cpp @@ -190,7 +190,7 @@ QMetaType* QUntypedBindable_metaType(const QUntypedBindable* self) { return new QMetaType(self->metaType()); } -QUntypedPropertyBinding* QUntypedBindable_makeBinding1(const QUntypedBindable* self, QPropertyBindingSourceLocation* location) { +QUntypedPropertyBinding* QUntypedBindable_makeBindingWithLocation(const QUntypedBindable* self, QPropertyBindingSourceLocation* location) { return new QUntypedPropertyBinding(self->makeBinding(*location)); } diff --git a/qt6/gen_qproperty.go b/qt6/gen_qproperty.go index 5493d063..1c5f4997 100644 --- a/qt6/gen_qproperty.go +++ b/qt6/gen_qproperty.go @@ -530,8 +530,8 @@ func (this *QUntypedBindable) MetaType() *QMetaType { return _goptr } -func (this *QUntypedBindable) MakeBinding1(location *QPropertyBindingSourceLocation) *QUntypedPropertyBinding { - _goptr := newQUntypedPropertyBinding(C.QUntypedBindable_makeBinding1(this.h, location.cPointer())) +func (this *QUntypedBindable) MakeBindingWithLocation(location *QPropertyBindingSourceLocation) *QUntypedPropertyBinding { + _goptr := newQUntypedPropertyBinding(C.QUntypedBindable_makeBindingWithLocation(this.h, location.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qproperty.h b/qt6/gen_qproperty.h index 9eefa51a..13977a7b 100644 --- a/qt6/gen_qproperty.h +++ b/qt6/gen_qproperty.h @@ -82,7 +82,7 @@ QUntypedPropertyBinding* QUntypedBindable_binding(const QUntypedBindable* self); bool QUntypedBindable_setBinding(QUntypedBindable* self, QUntypedPropertyBinding* binding); bool QUntypedBindable_hasBinding(const QUntypedBindable* self); QMetaType* QUntypedBindable_metaType(const QUntypedBindable* self); -QUntypedPropertyBinding* QUntypedBindable_makeBinding1(const QUntypedBindable* self, QPropertyBindingSourceLocation* location); +QUntypedPropertyBinding* QUntypedBindable_makeBindingWithLocation(const QUntypedBindable* self, QPropertyBindingSourceLocation* location); void QUntypedBindable_delete(QUntypedBindable* self); #ifdef __cplusplus diff --git a/qt6/gen_qrandom.cpp b/qt6/gen_qrandom.cpp index a8bbbfea..847c52f1 100644 --- a/qt6/gen_qrandom.cpp +++ b/qt6/gen_qrandom.cpp @@ -150,7 +150,7 @@ QRandomGenerator* QRandomGenerator_securelySeeded() { return new QRandomGenerator(QRandomGenerator::securelySeeded()); } -void QRandomGenerator_seed1(QRandomGenerator* self, unsigned int s) { +void QRandomGenerator_seedWithQuint32(QRandomGenerator* self, unsigned int s) { self->seed(static_cast(s)); } diff --git a/qt6/gen_qrandom.go b/qt6/gen_qrandom.go index 0f406585..8c844824 100644 --- a/qt6/gen_qrandom.go +++ b/qt6/gen_qrandom.go @@ -181,8 +181,8 @@ func QRandomGenerator_SecurelySeeded() *QRandomGenerator { return _goptr } -func (this *QRandomGenerator) Seed1(s uint) { - C.QRandomGenerator_seed1(this.h, (C.uint)(s)) +func (this *QRandomGenerator) SeedWithQuint32(s uint) { + C.QRandomGenerator_seedWithQuint32(this.h, (C.uint)(s)) } // Delete this object from C++ memory. diff --git a/qt6/gen_qrandom.h b/qt6/gen_qrandom.h index 7ee11025..0c6c9e14 100644 --- a/qt6/gen_qrandom.h +++ b/qt6/gen_qrandom.h @@ -53,7 +53,7 @@ unsigned int QRandomGenerator_max(); QRandomGenerator* QRandomGenerator_system(); QRandomGenerator* QRandomGenerator_global(); QRandomGenerator* QRandomGenerator_securelySeeded(); -void QRandomGenerator_seed1(QRandomGenerator* self, unsigned int s); +void QRandomGenerator_seedWithQuint32(QRandomGenerator* self, unsigned int s); void QRandomGenerator_delete(QRandomGenerator* self); QRandomGenerator64* QRandomGenerator64_new(); diff --git a/qt6/gen_qrect.cpp b/qt6/gen_qrect.cpp index bb1fee3b..733ab29f 100644 --- a/qt6/gen_qrect.cpp +++ b/qt6/gen_qrect.cpp @@ -321,11 +321,11 @@ QRectF* QRect_toRectF(const QRect* self) { return new QRectF(self->toRectF()); } -bool QRect_contains22(const QRect* self, QRect* r, bool proper) { +bool QRect_contains4(const QRect* self, QRect* r, bool proper) { return self->contains(*r, proper); } -bool QRect_contains23(const QRect* self, QPoint* p, bool proper) { +bool QRect_contains5(const QRect* self, QPoint* p, bool proper) { return self->contains(*p, proper); } diff --git a/qt6/gen_qrect.go b/qt6/gen_qrect.go index 423fc855..1b5b7709 100644 --- a/qt6/gen_qrect.go +++ b/qt6/gen_qrect.go @@ -393,12 +393,12 @@ func (this *QRect) ToRectF() *QRectF { return _goptr } -func (this *QRect) Contains22(r *QRect, proper bool) bool { - return (bool)(C.QRect_contains22(this.h, r.cPointer(), (C.bool)(proper))) +func (this *QRect) Contains4(r *QRect, proper bool) bool { + return (bool)(C.QRect_contains4(this.h, r.cPointer(), (C.bool)(proper))) } -func (this *QRect) Contains23(p *QPoint, proper bool) bool { - return (bool)(C.QRect_contains23(this.h, p.cPointer(), (C.bool)(proper))) +func (this *QRect) Contains5(p *QPoint, proper bool) bool { + return (bool)(C.QRect_contains5(this.h, p.cPointer(), (C.bool)(proper))) } // Delete this object from C++ memory. diff --git a/qt6/gen_qrect.h b/qt6/gen_qrect.h index 892c23bf..dc52a60d 100644 --- a/qt6/gen_qrect.h +++ b/qt6/gen_qrect.h @@ -109,8 +109,8 @@ QRect* QRect_operatorPlusAssign(QRect* self, QMargins* margins); QRect* QRect_operatorMinusAssign(QRect* self, QMargins* margins); QRect* QRect_span(QPoint* p1, QPoint* p2); QRectF* QRect_toRectF(const QRect* self); -bool QRect_contains22(const QRect* self, QRect* r, bool proper); -bool QRect_contains23(const QRect* self, QPoint* p, bool proper); +bool QRect_contains4(const QRect* self, QRect* r, bool proper); +bool QRect_contains5(const QRect* self, QPoint* p, bool proper); void QRect_delete(QRect* self); QRectF* QRectF_new(); diff --git a/qt6/gen_qregularexpression.cpp b/qt6/gen_qregularexpression.cpp index 725e7e60..ffac013d 100644 --- a/qt6/gen_qregularexpression.cpp +++ b/qt6/gen_qregularexpression.cpp @@ -346,7 +346,7 @@ ptrdiff_t QRegularExpressionMatch_capturedEndWithName(const QRegularExpressionMa return static_cast(_ret); } -struct miqt_string QRegularExpressionMatch_captured1(const QRegularExpressionMatch* self, int nth) { +struct miqt_string QRegularExpressionMatch_capturedWithNth(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(); @@ -357,17 +357,17 @@ struct miqt_string QRegularExpressionMatch_captured1(const QRegularExpressionMat return _ms; } -ptrdiff_t QRegularExpressionMatch_capturedStart1(const QRegularExpressionMatch* self, int nth) { +ptrdiff_t QRegularExpressionMatch_capturedStartWithNth(const QRegularExpressionMatch* self, int nth) { qsizetype _ret = self->capturedStart(static_cast(nth)); return static_cast(_ret); } -ptrdiff_t QRegularExpressionMatch_capturedLength1(const QRegularExpressionMatch* self, int nth) { +ptrdiff_t QRegularExpressionMatch_capturedLengthWithNth(const QRegularExpressionMatch* self, int nth) { qsizetype _ret = self->capturedLength(static_cast(nth)); return static_cast(_ret); } -ptrdiff_t QRegularExpressionMatch_capturedEnd1(const QRegularExpressionMatch* self, int nth) { +ptrdiff_t QRegularExpressionMatch_capturedEndWithNth(const QRegularExpressionMatch* self, int nth) { qsizetype _ret = self->capturedEnd(static_cast(nth)); return static_cast(_ret); } diff --git a/qt6/gen_qregularexpression.go b/qt6/gen_qregularexpression.go index 6a3f79b2..ffb0b36f 100644 --- a/qt6/gen_qregularexpression.go +++ b/qt6/gen_qregularexpression.go @@ -489,23 +489,23 @@ func (this *QRegularExpressionMatch) CapturedEndWithName(name string) int64 { return (int64)(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)) +func (this *QRegularExpressionMatch) CapturedWithNth(nth int) string { + var _ms C.struct_miqt_string = C.QRegularExpressionMatch_capturedWithNth(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 *QRegularExpressionMatch) CapturedStart1(nth int) int64 { - return (int64)(C.QRegularExpressionMatch_capturedStart1(this.h, (C.int)(nth))) +func (this *QRegularExpressionMatch) CapturedStartWithNth(nth int) int64 { + return (int64)(C.QRegularExpressionMatch_capturedStartWithNth(this.h, (C.int)(nth))) } -func (this *QRegularExpressionMatch) CapturedLength1(nth int) int64 { - return (int64)(C.QRegularExpressionMatch_capturedLength1(this.h, (C.int)(nth))) +func (this *QRegularExpressionMatch) CapturedLengthWithNth(nth int) int64 { + return (int64)(C.QRegularExpressionMatch_capturedLengthWithNth(this.h, (C.int)(nth))) } -func (this *QRegularExpressionMatch) CapturedEnd1(nth int) int64 { - return (int64)(C.QRegularExpressionMatch_capturedEnd1(this.h, (C.int)(nth))) +func (this *QRegularExpressionMatch) CapturedEndWithNth(nth int) int64 { + return (int64)(C.QRegularExpressionMatch_capturedEndWithNth(this.h, (C.int)(nth))) } // Delete this object from C++ memory. diff --git a/qt6/gen_qregularexpression.h b/qt6/gen_qregularexpression.h index 6d46efa9..131e04b8 100644 --- a/qt6/gen_qregularexpression.h +++ b/qt6/gen_qregularexpression.h @@ -78,10 +78,10 @@ ptrdiff_t QRegularExpressionMatch_capturedEnd(const QRegularExpressionMatch* sel ptrdiff_t QRegularExpressionMatch_capturedStartWithName(const QRegularExpressionMatch* self, struct miqt_string name); ptrdiff_t QRegularExpressionMatch_capturedLengthWithName(const QRegularExpressionMatch* self, struct miqt_string name); ptrdiff_t QRegularExpressionMatch_capturedEndWithName(const QRegularExpressionMatch* self, struct miqt_string name); -struct miqt_string QRegularExpressionMatch_captured1(const QRegularExpressionMatch* self, int nth); -ptrdiff_t QRegularExpressionMatch_capturedStart1(const QRegularExpressionMatch* self, int nth); -ptrdiff_t QRegularExpressionMatch_capturedLength1(const QRegularExpressionMatch* self, int nth); -ptrdiff_t QRegularExpressionMatch_capturedEnd1(const QRegularExpressionMatch* self, int nth); +struct miqt_string QRegularExpressionMatch_capturedWithNth(const QRegularExpressionMatch* self, int nth); +ptrdiff_t QRegularExpressionMatch_capturedStartWithNth(const QRegularExpressionMatch* self, int nth); +ptrdiff_t QRegularExpressionMatch_capturedLengthWithNth(const QRegularExpressionMatch* self, int nth); +ptrdiff_t QRegularExpressionMatch_capturedEndWithNth(const QRegularExpressionMatch* self, int nth); void QRegularExpressionMatch_delete(QRegularExpressionMatch* self); QRegularExpressionMatchIterator* QRegularExpressionMatchIterator_new(); diff --git a/qt6/gen_qresource.cpp b/qt6/gen_qresource.cpp index 1a5fa537..a5e12227 100644 --- a/qt6/gen_qresource.cpp +++ b/qt6/gen_qresource.cpp @@ -133,12 +133,12 @@ bool QResource_unregisterResource2(struct miqt_string rccFilename, struct miqt_s return QResource::unregisterResource(rccFilename_QString, resourceRoot_QString); } -bool QResource_registerResource22(const unsigned char* rccData, struct miqt_string resourceRoot) { +bool QResource_registerResource3(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) { +bool QResource_unregisterResource3(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/qt6/gen_qresource.go b/qt6/gen_qresource.go index c92d1336..14cbd442 100644 --- a/qt6/gen_qresource.go +++ b/qt6/gen_qresource.go @@ -192,20 +192,20 @@ func QResource_UnregisterResource2(rccFilename string, resourceRoot string) bool return (bool)(C.QResource_unregisterResource2(rccFilename_ms, resourceRoot_ms)) } -func QResource_RegisterResource22(rccData *byte, resourceRoot string) bool { +func QResource_RegisterResource3(rccData *byte, resourceRoot string) bool { 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)) + return (bool)(C.QResource_registerResource3((*C.uchar)(unsafe.Pointer(rccData)), resourceRoot_ms)) } -func QResource_UnregisterResource22(rccData *byte, resourceRoot string) bool { +func QResource_UnregisterResource3(rccData *byte, resourceRoot string) bool { 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)) + return (bool)(C.QResource_unregisterResource3((*C.uchar)(unsafe.Pointer(rccData)), resourceRoot_ms)) } // Delete this object from C++ memory. diff --git a/qt6/gen_qresource.h b/qt6/gen_qresource.h index c4ea2ffa..552ee5fa 100644 --- a/qt6/gen_qresource.h +++ b/qt6/gen_qresource.h @@ -45,8 +45,8 @@ 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_registerResource3(const unsigned char* rccData, struct miqt_string resourceRoot); +bool QResource_unregisterResource3(const unsigned char* rccData, struct miqt_string resourceRoot); void QResource_delete(QResource* self); #ifdef __cplusplus diff --git a/qt6/gen_qrgba64.cpp b/qt6/gen_qrgba64.cpp index bf1f5133..dd393450 100644 --- a/qt6/gen_qrgba64.cpp +++ b/qt6/gen_qrgba64.cpp @@ -22,7 +22,7 @@ QRgba64* QRgba64_fromRgba64(unsigned long long c) { return new QRgba64(QRgba64::fromRgba64(static_cast(c))); } -QRgba64* QRgba64_fromRgba642(uint16_t red, uint16_t green, uint16_t blue, uint16_t alpha) { +QRgba64* QRgba64_fromRgba642(unsigned short red, unsigned short green, unsigned short blue, unsigned short alpha) { return new QRgba64(QRgba64::fromRgba64(static_cast(red), static_cast(green), static_cast(blue), static_cast(alpha))); } @@ -42,39 +42,39 @@ bool QRgba64_isTransparent(const QRgba64* self) { return self->isTransparent(); } -uint16_t QRgba64_red(const QRgba64* self) { +unsigned short QRgba64_red(const QRgba64* self) { quint16 _ret = self->red(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QRgba64_green(const QRgba64* self) { +unsigned short QRgba64_green(const QRgba64* self) { quint16 _ret = self->green(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QRgba64_blue(const QRgba64* self) { +unsigned short QRgba64_blue(const QRgba64* self) { quint16 _ret = self->blue(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QRgba64_alpha(const QRgba64* self) { +unsigned short QRgba64_alpha(const QRgba64* self) { quint16 _ret = self->alpha(); - return static_cast(_ret); + return static_cast(_ret); } -void QRgba64_setRed(QRgba64* self, uint16_t _red) { +void QRgba64_setRed(QRgba64* self, unsigned short _red) { self->setRed(static_cast(_red)); } -void QRgba64_setGreen(QRgba64* self, uint16_t _green) { +void QRgba64_setGreen(QRgba64* self, unsigned short _green) { self->setGreen(static_cast(_green)); } -void QRgba64_setBlue(QRgba64* self, uint16_t _blue) { +void QRgba64_setBlue(QRgba64* self, unsigned short _blue) { self->setBlue(static_cast(_blue)); } -void QRgba64_setAlpha(QRgba64* self, uint16_t _alpha) { +void QRgba64_setAlpha(QRgba64* self, unsigned short _alpha) { self->setAlpha(static_cast(_alpha)); } @@ -103,9 +103,9 @@ unsigned int QRgba64_toArgb32(const QRgba64* self) { return static_cast(_ret); } -uint16_t QRgba64_toRgb16(const QRgba64* self) { +unsigned short QRgba64_toRgb16(const QRgba64* self) { ushort _ret = self->toRgb16(); - return static_cast(_ret); + return static_cast(_ret); } QRgba64* QRgba64_premultiplied(const QRgba64* self) { diff --git a/qt6/gen_qrgba64.go b/qt6/gen_qrgba64.go index e0eaaa73..21d0d35c 100644 --- a/qt6/gen_qrgba64.go +++ b/qt6/gen_qrgba64.go @@ -64,7 +64,7 @@ func QRgba64_FromRgba64(c uint64) *QRgba64 { } func QRgba64_FromRgba642(red uint16, green uint16, blue uint16, alpha uint16) *QRgba64 { - _goptr := newQRgba64(C.QRgba64_fromRgba642((C.uint16_t)(red), (C.uint16_t)(green), (C.uint16_t)(blue), (C.uint16_t)(alpha))) + _goptr := newQRgba64(C.QRgba64_fromRgba642((C.ushort)(red), (C.ushort)(green), (C.ushort)(blue), (C.ushort)(alpha))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -106,19 +106,19 @@ func (this *QRgba64) Alpha() uint16 { } func (this *QRgba64) SetRed(_red uint16) { - C.QRgba64_setRed(this.h, (C.uint16_t)(_red)) + C.QRgba64_setRed(this.h, (C.ushort)(_red)) } func (this *QRgba64) SetGreen(_green uint16) { - C.QRgba64_setGreen(this.h, (C.uint16_t)(_green)) + C.QRgba64_setGreen(this.h, (C.ushort)(_green)) } func (this *QRgba64) SetBlue(_blue uint16) { - C.QRgba64_setBlue(this.h, (C.uint16_t)(_blue)) + C.QRgba64_setBlue(this.h, (C.ushort)(_blue)) } func (this *QRgba64) SetAlpha(_alpha uint16) { - C.QRgba64_setAlpha(this.h, (C.uint16_t)(_alpha)) + C.QRgba64_setAlpha(this.h, (C.ushort)(_alpha)) } func (this *QRgba64) Red8() byte { diff --git a/qt6/gen_qrgba64.h b/qt6/gen_qrgba64.h index 04e124c7..3ca1387d 100644 --- a/qt6/gen_qrgba64.h +++ b/qt6/gen_qrgba64.h @@ -23,25 +23,25 @@ typedef struct QRgba64 QRgba64; QRgba64* QRgba64_new(); QRgba64* QRgba64_new2(QRgba64* param1); QRgba64* QRgba64_fromRgba64(unsigned long long c); -QRgba64* QRgba64_fromRgba642(uint16_t red, uint16_t green, uint16_t blue, uint16_t alpha); +QRgba64* QRgba64_fromRgba642(unsigned short red, unsigned short green, unsigned short blue, unsigned short alpha); QRgba64* QRgba64_fromRgba(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha); QRgba64* QRgba64_fromArgb32(unsigned int rgb); bool QRgba64_isOpaque(const QRgba64* self); bool QRgba64_isTransparent(const QRgba64* self); -uint16_t QRgba64_red(const QRgba64* self); -uint16_t QRgba64_green(const QRgba64* self); -uint16_t QRgba64_blue(const QRgba64* self); -uint16_t QRgba64_alpha(const QRgba64* self); -void QRgba64_setRed(QRgba64* self, uint16_t _red); -void QRgba64_setGreen(QRgba64* self, uint16_t _green); -void QRgba64_setBlue(QRgba64* self, uint16_t _blue); -void QRgba64_setAlpha(QRgba64* self, uint16_t _alpha); +unsigned short QRgba64_red(const QRgba64* self); +unsigned short QRgba64_green(const QRgba64* self); +unsigned short QRgba64_blue(const QRgba64* self); +unsigned short QRgba64_alpha(const QRgba64* self); +void QRgba64_setRed(QRgba64* self, unsigned short _red); +void QRgba64_setGreen(QRgba64* self, unsigned short _green); +void QRgba64_setBlue(QRgba64* self, unsigned short _blue); +void QRgba64_setAlpha(QRgba64* self, unsigned short _alpha); unsigned char QRgba64_red8(const QRgba64* self); unsigned char QRgba64_green8(const QRgba64* self); unsigned char QRgba64_blue8(const QRgba64* self); unsigned char QRgba64_alpha8(const QRgba64* self); unsigned int QRgba64_toArgb32(const QRgba64* self); -uint16_t QRgba64_toRgb16(const QRgba64* self); +unsigned short QRgba64_toRgb16(const QRgba64* self); QRgba64* QRgba64_premultiplied(const QRgba64* self); QRgba64* QRgba64_unpremultiplied(const QRgba64* self); unsigned long long QRgba64_ToUnsignedLongLong(const QRgba64* self); diff --git a/qt6/gen_qscreen.cpp b/qt6/gen_qscreen.cpp index cd59b144..d21bbd1d 100644 --- a/qt6/gen_qscreen.cpp +++ b/qt6/gen_qscreen.cpp @@ -369,7 +369,7 @@ struct miqt_string QScreen_tr3(const char* s, const char* c, int n) { return _ms; } -QPixmap* QScreen_grabWindow1(QScreen* self, uintptr_t window) { +QPixmap* QScreen_grabWindowWithWindow(QScreen* self, uintptr_t window) { return new QPixmap(self->grabWindow(static_cast(window))); } diff --git a/qt6/gen_qscreen.go b/qt6/gen_qscreen.go index c0e1b878..1e563161 100644 --- a/qt6/gen_qscreen.go +++ b/qt6/gen_qscreen.go @@ -445,8 +445,8 @@ func QScreen_Tr3(s string, c string, n int) string { return _ret } -func (this *QScreen) GrabWindow1(window uintptr) *QPixmap { - _goptr := newQPixmap(C.QScreen_grabWindow1(this.h, (C.uintptr_t)(window))) +func (this *QScreen) GrabWindowWithWindow(window uintptr) *QPixmap { + _goptr := newQPixmap(C.QScreen_grabWindowWithWindow(this.h, (C.uintptr_t)(window))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qscreen.h b/qt6/gen_qscreen.h index b1b13aaa..680a3ba6 100644 --- a/qt6/gen_qscreen.h +++ b/qt6/gen_qscreen.h @@ -95,7 +95,7 @@ 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); -QPixmap* QScreen_grabWindow1(QScreen* self, uintptr_t window); +QPixmap* QScreen_grabWindowWithWindow(QScreen* self, uintptr_t window); 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/qt6/gen_qscrollarea.cpp b/qt6/gen_qscrollarea.cpp index ed246020..338a28f0 100644 --- a/qt6/gen_qscrollarea.cpp +++ b/qt6/gen_qscrollarea.cpp @@ -1204,11 +1204,11 @@ struct miqt_string QScrollArea_tr3(const char* s, const char* c, int n) { return _ms; } -void QScrollArea_ensureVisible3(QScrollArea* self, int x, int y, int xmargin) { +void QScrollArea_ensureVisible2(QScrollArea* self, int x, int y, int xmargin) { self->ensureVisible(static_cast(x), static_cast(y), static_cast(xmargin)); } -void QScrollArea_ensureVisible4(QScrollArea* self, int x, int y, int xmargin, int ymargin) { +void QScrollArea_ensureVisible3(QScrollArea* self, int x, int y, int xmargin, int ymargin) { self->ensureVisible(static_cast(x), static_cast(y), static_cast(xmargin), static_cast(ymargin)); } diff --git a/qt6/gen_qscrollarea.go b/qt6/gen_qscrollarea.go index efd46705..98f2007b 100644 --- a/qt6/gen_qscrollarea.go +++ b/qt6/gen_qscrollarea.go @@ -149,12 +149,12 @@ func QScrollArea_Tr3(s string, c string, n int) string { return _ret } -func (this *QScrollArea) EnsureVisible3(x int, y int, xmargin int) { - C.QScrollArea_ensureVisible3(this.h, (C.int)(x), (C.int)(y), (C.int)(xmargin)) +func (this *QScrollArea) EnsureVisible2(x int, y int, xmargin int) { + C.QScrollArea_ensureVisible2(this.h, (C.int)(x), (C.int)(y), (C.int)(xmargin)) } -func (this *QScrollArea) EnsureVisible4(x int, y int, xmargin int, ymargin int) { - C.QScrollArea_ensureVisible4(this.h, (C.int)(x), (C.int)(y), (C.int)(xmargin), (C.int)(ymargin)) +func (this *QScrollArea) EnsureVisible3(x int, y int, xmargin int, ymargin int) { + C.QScrollArea_ensureVisible3(this.h, (C.int)(x), (C.int)(y), (C.int)(xmargin), (C.int)(ymargin)) } func (this *QScrollArea) EnsureWidgetVisible2(childWidget *QWidget, xmargin int) { diff --git a/qt6/gen_qscrollarea.h b/qt6/gen_qscrollarea.h index 060e790d..fd800973 100644 --- a/qt6/gen_qscrollarea.h +++ b/qt6/gen_qscrollarea.h @@ -116,8 +116,8 @@ void QScrollArea_scrollContentsBy(QScrollArea* self, int dx, int dy); QSize* QScrollArea_viewportSizeHint(const QScrollArea* self); struct miqt_string QScrollArea_tr2(const char* s, const char* c); struct miqt_string QScrollArea_tr3(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_ensureVisible2(QScrollArea* self, int x, int y, int xmargin); +void QScrollArea_ensureVisible3(QScrollArea* self, int x, int y, int xmargin, int ymargin); void QScrollArea_ensureWidgetVisible2(QScrollArea* self, QWidget* childWidget, int xmargin); void QScrollArea_ensureWidgetVisible3(QScrollArea* self, QWidget* childWidget, int xmargin, int ymargin); bool QScrollArea_override_virtual_sizeHint(void* self, intptr_t slot); diff --git a/qt6/gen_qscroller.cpp b/qt6/gen_qscroller.cpp index 0772b818..ed1fd872 100644 --- a/qt6/gen_qscroller.cpp +++ b/qt6/gen_qscroller.cpp @@ -221,7 +221,7 @@ int QScroller_grabGesture2(QObject* target, int gestureType) { return static_cast(_ret); } -bool QScroller_handleInput3(QScroller* self, int input, QPointF* position, long long timestamp) { +bool QScroller_handleInput2(QScroller* self, int input, QPointF* position, long long timestamp) { return self->handleInput(static_cast(input), *position, static_cast(timestamp)); } diff --git a/qt6/gen_qscroller.go b/qt6/gen_qscroller.go index a10604d6..8ef3a2af 100644 --- a/qt6/gen_qscroller.go +++ b/qt6/gen_qscroller.go @@ -286,6 +286,6 @@ func QScroller_GrabGesture2(target *QObject, gestureType QScroller__ScrollerGest return (GestureType)(C.QScroller_grabGesture2(target.cPointer(), (C.int)(gestureType))) } -func (this *QScroller) HandleInput3(input QScroller__Input, position *QPointF, timestamp int64) bool { - return (bool)(C.QScroller_handleInput3(this.h, (C.int)(input), position.cPointer(), (C.longlong)(timestamp))) +func (this *QScroller) HandleInput2(input QScroller__Input, position *QPointF, timestamp int64) bool { + return (bool)(C.QScroller_handleInput2(this.h, (C.int)(input), position.cPointer(), (C.longlong)(timestamp))) } diff --git a/qt6/gen_qscroller.h b/qt6/gen_qscroller.h index b4ba3384..d496f5c8 100644 --- a/qt6/gen_qscroller.h +++ b/qt6/gen_qscroller.h @@ -68,7 +68,7 @@ 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); int QScroller_grabGesture2(QObject* target, int gestureType); -bool QScroller_handleInput3(QScroller* self, int input, QPointF* position, long long timestamp); +bool QScroller_handleInput2(QScroller* self, int input, QPointF* position, long long timestamp); #ifdef __cplusplus } /* extern C */ diff --git a/qt6/gen_qsemaphore.cpp b/qt6/gen_qsemaphore.cpp index 42d584ab..a4220af4 100644 --- a/qt6/gen_qsemaphore.cpp +++ b/qt6/gen_qsemaphore.cpp @@ -43,15 +43,15 @@ bool QSemaphore_tryAcquire3(QSemaphore* self) { return self->try_acquire(); } -void QSemaphore_acquire1(QSemaphore* self, int n) { +void QSemaphore_acquireWithInt(QSemaphore* self, int n) { self->acquire(static_cast(n)); } -bool QSemaphore_tryAcquire1(QSemaphore* self, int n) { +bool QSemaphore_tryAcquireWithInt(QSemaphore* self, int n) { return self->tryAcquire(static_cast(n)); } -void QSemaphore_release1(QSemaphore* self, int n) { +void QSemaphore_releaseWithInt(QSemaphore* self, int n) { self->release(static_cast(n)); } diff --git a/qt6/gen_qsemaphore.go b/qt6/gen_qsemaphore.go index ad9463f8..204d88f0 100644 --- a/qt6/gen_qsemaphore.go +++ b/qt6/gen_qsemaphore.go @@ -81,16 +81,16 @@ func (this *QSemaphore) TryAcquire3() bool { return (bool)(C.QSemaphore_tryAcquire3(this.h)) } -func (this *QSemaphore) Acquire1(n int) { - C.QSemaphore_acquire1(this.h, (C.int)(n)) +func (this *QSemaphore) AcquireWithInt(n int) { + C.QSemaphore_acquireWithInt(this.h, (C.int)(n)) } -func (this *QSemaphore) TryAcquire1(n int) bool { - return (bool)(C.QSemaphore_tryAcquire1(this.h, (C.int)(n))) +func (this *QSemaphore) TryAcquireWithInt(n int) bool { + return (bool)(C.QSemaphore_tryAcquireWithInt(this.h, (C.int)(n))) } -func (this *QSemaphore) Release1(n int) { - C.QSemaphore_release1(this.h, (C.int)(n)) +func (this *QSemaphore) ReleaseWithInt(n int) { + C.QSemaphore_releaseWithInt(this.h, (C.int)(n)) } // Delete this object from C++ memory. diff --git a/qt6/gen_qsemaphore.h b/qt6/gen_qsemaphore.h index 5d0ac286..bebd4340 100644 --- a/qt6/gen_qsemaphore.h +++ b/qt6/gen_qsemaphore.h @@ -30,9 +30,9 @@ bool QSemaphore_tryAcquire2(QSemaphore* self, int n, int timeout); void QSemaphore_release(QSemaphore* self); int QSemaphore_available(const QSemaphore* self); bool QSemaphore_tryAcquire3(QSemaphore* self); -void QSemaphore_acquire1(QSemaphore* self, int n); -bool QSemaphore_tryAcquire1(QSemaphore* self, int n); -void QSemaphore_release1(QSemaphore* self, int n); +void QSemaphore_acquireWithInt(QSemaphore* self, int n); +bool QSemaphore_tryAcquireWithInt(QSemaphore* self, int n); +void QSemaphore_releaseWithInt(QSemaphore* self, int n); void QSemaphore_delete(QSemaphore* self); QSemaphoreReleaser* QSemaphoreReleaser_new(); diff --git a/qt6/gen_qsharedmemory.cpp b/qt6/gen_qsharedmemory.cpp index 99881172..b11de726 100644 --- a/qt6/gen_qsharedmemory.cpp +++ b/qt6/gen_qsharedmemory.cpp @@ -337,7 +337,7 @@ bool QSharedMemory_create2(QSharedMemory* self, ptrdiff_t size, int mode) { return self->create((qsizetype)(size), static_cast(mode)); } -bool QSharedMemory_attach1(QSharedMemory* self, int mode) { +bool QSharedMemory_attachWithMode(QSharedMemory* self, int mode) { return self->attach(static_cast(mode)); } diff --git a/qt6/gen_qsharedmemory.go b/qt6/gen_qsharedmemory.go index a090e3c3..9d2133ac 100644 --- a/qt6/gen_qsharedmemory.go +++ b/qt6/gen_qsharedmemory.go @@ -232,8 +232,8 @@ func (this *QSharedMemory) Create2(size int64, mode QSharedMemory__AccessMode) b return (bool)(C.QSharedMemory_create2(this.h, (C.ptrdiff_t)(size), (C.int)(mode))) } -func (this *QSharedMemory) Attach1(mode QSharedMemory__AccessMode) bool { - return (bool)(C.QSharedMemory_attach1(this.h, (C.int)(mode))) +func (this *QSharedMemory) AttachWithMode(mode QSharedMemory__AccessMode) bool { + return (bool)(C.QSharedMemory_attachWithMode(this.h, (C.int)(mode))) } // Sender can only be called from a QSharedMemory that was directly constructed. diff --git a/qt6/gen_qsharedmemory.h b/qt6/gen_qsharedmemory.h index 5b983b30..dbdaaa7f 100644 --- a/qt6/gen_qsharedmemory.h +++ b/qt6/gen_qsharedmemory.h @@ -59,7 +59,7 @@ 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); bool QSharedMemory_create2(QSharedMemory* self, ptrdiff_t size, int mode); -bool QSharedMemory_attach1(QSharedMemory* self, int mode); +bool QSharedMemory_attachWithMode(QSharedMemory* self, int mode); bool QSharedMemory_override_virtual_event(void* self, intptr_t slot); bool QSharedMemory_virtualbase_event(void* self, QEvent* event); bool QSharedMemory_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt6/gen_qsocketnotifier.cpp b/qt6/gen_qsocketnotifier.cpp index 6e71885b..8db60674 100644 --- a/qt6/gen_qsocketnotifier.cpp +++ b/qt6/gen_qsocketnotifier.cpp @@ -436,7 +436,11 @@ void QSocketNotifier_delete(QSocketNotifier* self) { } QSocketDescriptor* QSocketDescriptor_new() { +#ifndef Q_OS_LINUX + return nullptr; +#else return new QSocketDescriptor(); +#endif } QSocketDescriptor* QSocketDescriptor_new2(QSocketDescriptor* param1) { diff --git a/qt6/gen_qsocketnotifier.go b/qt6/gen_qsocketnotifier.go index 60ca54d0..3c6e87c8 100644 --- a/qt6/gen_qsocketnotifier.go +++ b/qt6/gen_qsocketnotifier.go @@ -442,6 +442,10 @@ func UnsafeNewQSocketDescriptor(h unsafe.Pointer) *QSocketDescriptor { // NewQSocketDescriptor constructs a new QSocketDescriptor object. func NewQSocketDescriptor() *QSocketDescriptor { + if runtime.GOOS != "linux" { + panic("Unsupported OS") + } + return newQSocketDescriptor(C.QSocketDescriptor_new()) } diff --git a/qt6/gen_qsortfilterproxymodel.cpp b/qt6/gen_qsortfilterproxymodel.cpp index 137e6eb6..c61e0e0d 100644 --- a/qt6/gen_qsortfilterproxymodel.cpp +++ b/qt6/gen_qsortfilterproxymodel.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qt6/gen_qsplitter.cpp b/qt6/gen_qsplitter.cpp index 641eaa92..5ce6ad69 100644 --- a/qt6/gen_qsplitter.cpp +++ b/qt6/gen_qsplitter.cpp @@ -1296,7 +1296,7 @@ struct miqt_string QSplitter_tr3(const char* s, const char* c, int n) { return _ms; } -void QSplitter_setOpaqueResize1(QSplitter* self, bool opaque) { +void QSplitter_setOpaqueResizeWithOpaque(QSplitter* self, bool opaque) { self->setOpaqueResize(opaque); } diff --git a/qt6/gen_qsplitter.go b/qt6/gen_qsplitter.go index 77403755..fe2fcc85 100644 --- a/qt6/gen_qsplitter.go +++ b/qt6/gen_qsplitter.go @@ -267,8 +267,8 @@ func QSplitter_Tr3(s string, c string, n int) string { return _ret } -func (this *QSplitter) SetOpaqueResize1(opaque bool) { - C.QSplitter_setOpaqueResize1(this.h, (C.bool)(opaque)) +func (this *QSplitter) SetOpaqueResizeWithOpaque(opaque bool) { + C.QSplitter_setOpaqueResizeWithOpaque(this.h, (C.bool)(opaque)) } // MoveSplitter can only be called from a QSplitter that was directly constructed. diff --git a/qt6/gen_qsplitter.h b/qt6/gen_qsplitter.h index d7540ecd..797d27c1 100644 --- a/qt6/gen_qsplitter.h +++ b/qt6/gen_qsplitter.h @@ -133,7 +133,7 @@ void QSplitter_resizeEvent(QSplitter* self, QResizeEvent* param1); void QSplitter_changeEvent(QSplitter* self, QEvent* param1); struct miqt_string QSplitter_tr2(const char* s, const char* c); struct miqt_string QSplitter_tr3(const char* s, const char* c, int n); -void QSplitter_setOpaqueResize1(QSplitter* self, bool opaque); +void QSplitter_setOpaqueResizeWithOpaque(QSplitter* self, bool opaque); bool QSplitter_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QSplitter_virtualbase_sizeHint(const void* self); bool QSplitter_override_virtual_minimumSizeHint(void* self, intptr_t slot); diff --git a/qt6/gen_qstandarditemmodel.cpp b/qt6/gen_qstandarditemmodel.cpp index f0dc51d1..b91ebe3d 100644 --- a/qt6/gen_qstandarditemmodel.cpp +++ b/qt6/gen_qstandarditemmodel.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -2319,7 +2320,7 @@ QStandardItem* QStandardItemModel_item2(const QStandardItemModel* self, int row, return self->item(static_cast(row), static_cast(column)); } -bool QStandardItemModel_insertRow22(QStandardItemModel* self, int row, QModelIndex* parent) { +bool QStandardItemModel_insertRow3(QStandardItemModel* self, int row, QModelIndex* parent) { return self->insertRow(static_cast(row), *parent); } diff --git a/qt6/gen_qstandarditemmodel.go b/qt6/gen_qstandarditemmodel.go index e054965c..c43f76c5 100644 --- a/qt6/gen_qstandarditemmodel.go +++ b/qt6/gen_qstandarditemmodel.go @@ -1296,8 +1296,8 @@ func (this *QStandardItemModel) Item2(row int, column int) *QStandardItem { return newQStandardItem(C.QStandardItemModel_item2(this.h, (C.int)(row), (C.int)(column))) } -func (this *QStandardItemModel) InsertRow22(row int, parent *QModelIndex) bool { - return (bool)(C.QStandardItemModel_insertRow22(this.h, (C.int)(row), parent.cPointer())) +func (this *QStandardItemModel) InsertRow3(row int, parent *QModelIndex) bool { + return (bool)(C.QStandardItemModel_insertRow3(this.h, (C.int)(row), parent.cPointer())) } func (this *QStandardItemModel) InsertColumn2(column int, parent *QModelIndex) bool { diff --git a/qt6/gen_qstandarditemmodel.h b/qt6/gen_qstandarditemmodel.h index cbd6275f..d002c370 100644 --- a/qt6/gen_qstandarditemmodel.h +++ b/qt6/gen_qstandarditemmodel.h @@ -236,7 +236,7 @@ void QStandardItemModel_connect_itemChanged(QStandardItemModel* self, intptr_t s struct miqt_string QStandardItemModel_tr2(const char* s, const char* c); struct miqt_string QStandardItemModel_tr3(const char* s, const char* c, int n); QStandardItem* QStandardItemModel_item2(const QStandardItemModel* self, int row, int column); -bool QStandardItemModel_insertRow22(QStandardItemModel* self, int row, QModelIndex* parent); +bool QStandardItemModel_insertRow3(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 /* of QStandardItem* */ QStandardItemModel_findItems2(const QStandardItemModel* self, struct miqt_string text, int flags); diff --git a/qt6/gen_qstandardpaths.cpp b/qt6/gen_qstandardpaths.cpp index ddceeaa0..3c5a432b 100644 --- a/qt6/gen_qstandardpaths.cpp +++ b/qt6/gen_qstandardpaths.cpp @@ -109,7 +109,7 @@ bool QStandardPaths_isTestModeEnabled() { return QStandardPaths::isTestModeEnabled(); } -struct miqt_string QStandardPaths_locate3(int type, struct miqt_string fileName, int options) { +struct miqt_string QStandardPaths_locate2(int type, struct miqt_string fileName, int options) { QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QString _ret = QStandardPaths::locate(static_cast(type), fileName_QString, static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -121,7 +121,7 @@ struct miqt_string QStandardPaths_locate3(int type, struct miqt_string fileName, return _ms; } -struct miqt_array /* of struct miqt_string */ QStandardPaths_locateAll3(int type, struct miqt_string fileName, int options) { +struct miqt_array /* of struct miqt_string */ QStandardPaths_locateAll2(int type, struct miqt_string fileName, int options) { QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); QStringList _ret = QStandardPaths::locateAll(static_cast(type), fileName_QString, static_cast(options)); // Convert QList<> from C++ memory to manually-managed C memory diff --git a/qt6/gen_qstandardpaths.go b/qt6/gen_qstandardpaths.go index 374cb472..cb80ab56 100644 --- a/qt6/gen_qstandardpaths.go +++ b/qt6/gen_qstandardpaths.go @@ -151,23 +151,23 @@ func QStandardPaths_IsTestModeEnabled() bool { return (bool)(C.QStandardPaths_isTestModeEnabled()) } -func QStandardPaths_Locate3(typeVal QStandardPaths__StandardLocation, fileName string, options QStandardPaths__LocateOption) string { +func QStandardPaths_Locate2(typeVal QStandardPaths__StandardLocation, fileName string, options QStandardPaths__LocateOption) 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)) - var _ms C.struct_miqt_string = C.QStandardPaths_locate3((C.int)(typeVal), fileName_ms, (C.int)(options)) + var _ms C.struct_miqt_string = C.QStandardPaths_locate2((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 { +func QStandardPaths_LocateAll2(typeVal QStandardPaths__StandardLocation, fileName string, options QStandardPaths__LocateOption) []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)) - var _ma C.struct_miqt_array = C.QStandardPaths_locateAll3((C.int)(typeVal), fileName_ms, (C.int)(options)) + var _ma C.struct_miqt_array = C.QStandardPaths_locateAll2((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 for i := 0; i < int(_ma.len); i++ { diff --git a/qt6/gen_qstandardpaths.h b/qt6/gen_qstandardpaths.h index 68004522..e5e84232 100644 --- a/qt6/gen_qstandardpaths.h +++ b/qt6/gen_qstandardpaths.h @@ -28,8 +28,8 @@ struct miqt_string QStandardPaths_displayName(int type); struct miqt_string QStandardPaths_findExecutable(struct miqt_string executableName); void QStandardPaths_setTestModeEnabled(bool testMode); bool QStandardPaths_isTestModeEnabled(); -struct miqt_string QStandardPaths_locate3(int type, struct miqt_string fileName, int options); -struct miqt_array /* of struct miqt_string */ QStandardPaths_locateAll3(int type, struct miqt_string fileName, int options); +struct miqt_string QStandardPaths_locate2(int type, struct miqt_string fileName, int options); +struct miqt_array /* of struct miqt_string */ QStandardPaths_locateAll2(int type, 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 diff --git a/qt6/gen_qstatictext.cpp b/qt6/gen_qstatictext.cpp index 626d38fc..cebbc5b3 100644 --- a/qt6/gen_qstatictext.cpp +++ b/qt6/gen_qstatictext.cpp @@ -105,7 +105,7 @@ bool QStaticText_operatorNotEqual(const QStaticText* self, QStaticText* param1) return (*self != *param1); } -void QStaticText_prepare1(QStaticText* self, QTransform* matrix) { +void QStaticText_prepareWithMatrix(QStaticText* self, QTransform* matrix) { self->prepare(*matrix); } diff --git a/qt6/gen_qstatictext.go b/qt6/gen_qstatictext.go index bd99e631..966bcddb 100644 --- a/qt6/gen_qstatictext.go +++ b/qt6/gen_qstatictext.go @@ -149,8 +149,8 @@ func (this *QStaticText) OperatorNotEqual(param1 *QStaticText) bool { return (bool)(C.QStaticText_operatorNotEqual(this.h, param1.cPointer())) } -func (this *QStaticText) Prepare1(matrix *QTransform) { - C.QStaticText_prepare1(this.h, matrix.cPointer()) +func (this *QStaticText) PrepareWithMatrix(matrix *QTransform) { + C.QStaticText_prepareWithMatrix(this.h, matrix.cPointer()) } func (this *QStaticText) Prepare2(matrix *QTransform, font *QFont) { diff --git a/qt6/gen_qstatictext.h b/qt6/gen_qstatictext.h index 2ac41d7a..58ab9ff4 100644 --- a/qt6/gen_qstatictext.h +++ b/qt6/gen_qstatictext.h @@ -47,7 +47,7 @@ void QStaticText_setPerformanceHint(QStaticText* self, int performanceHint); int QStaticText_performanceHint(const QStaticText* self); bool QStaticText_operatorEqual(const QStaticText* self, QStaticText* param1); bool QStaticText_operatorNotEqual(const QStaticText* self, QStaticText* param1); -void QStaticText_prepare1(QStaticText* self, QTransform* matrix); +void QStaticText_prepareWithMatrix(QStaticText* self, QTransform* matrix); void QStaticText_prepare2(QStaticText* self, QTransform* matrix, QFont* font); void QStaticText_delete(QStaticText* self); diff --git a/qt6/gen_qstatusbar.cpp b/qt6/gen_qstatusbar.cpp index aaf0d636..31d369f8 100644 --- a/qt6/gen_qstatusbar.cpp +++ b/qt6/gen_qstatusbar.cpp @@ -1128,7 +1128,7 @@ void QStatusBar_addWidget2(QStatusBar* self, QWidget* widget, int stretch) { self->addWidget(widget, static_cast(stretch)); } -int QStatusBar_insertWidget3(QStatusBar* self, int index, QWidget* widget, int stretch) { +int QStatusBar_insertWidget2(QStatusBar* self, int index, QWidget* widget, int stretch) { return self->insertWidget(static_cast(index), widget, static_cast(stretch)); } @@ -1136,7 +1136,7 @@ void QStatusBar_addPermanentWidget2(QStatusBar* self, QWidget* widget, int stret self->addPermanentWidget(widget, static_cast(stretch)); } -int QStatusBar_insertPermanentWidget3(QStatusBar* self, int index, QWidget* widget, int stretch) { +int QStatusBar_insertPermanentWidget2(QStatusBar* self, int index, QWidget* widget, int stretch) { return self->insertPermanentWidget(static_cast(index), widget, static_cast(stretch)); } diff --git a/qt6/gen_qstatusbar.go b/qt6/gen_qstatusbar.go index c09fe087..74b7ad04 100644 --- a/qt6/gen_qstatusbar.go +++ b/qt6/gen_qstatusbar.go @@ -181,16 +181,16 @@ func (this *QStatusBar) AddWidget2(widget *QWidget, stretch int) { C.QStatusBar_addWidget2(this.h, widget.cPointer(), (C.int)(stretch)) } -func (this *QStatusBar) InsertWidget3(index int, widget *QWidget, stretch int) int { - return (int)(C.QStatusBar_insertWidget3(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch))) +func (this *QStatusBar) InsertWidget2(index int, widget *QWidget, stretch int) int { + return (int)(C.QStatusBar_insertWidget2(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch))) } func (this *QStatusBar) AddPermanentWidget2(widget *QWidget, stretch int) { C.QStatusBar_addPermanentWidget2(this.h, widget.cPointer(), (C.int)(stretch)) } -func (this *QStatusBar) InsertPermanentWidget3(index int, widget *QWidget, stretch int) int { - return (int)(C.QStatusBar_insertPermanentWidget3(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch))) +func (this *QStatusBar) InsertPermanentWidget2(index int, widget *QWidget, stretch int) int { + return (int)(C.QStatusBar_insertPermanentWidget2(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch))) } func (this *QStatusBar) ShowMessage2(text string, timeout int) { diff --git a/qt6/gen_qstatusbar.h b/qt6/gen_qstatusbar.h index 8e833efa..69538489 100644 --- a/qt6/gen_qstatusbar.h +++ b/qt6/gen_qstatusbar.h @@ -109,9 +109,9 @@ bool QStatusBar_event(QStatusBar* self, QEvent* param1); struct miqt_string QStatusBar_tr2(const char* s, const char* c); struct miqt_string QStatusBar_tr3(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); +int QStatusBar_insertWidget2(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); +int QStatusBar_insertPermanentWidget2(QStatusBar* self, int index, QWidget* widget, int stretch); void QStatusBar_showMessage2(QStatusBar* self, struct miqt_string text, int timeout); bool QStatusBar_override_virtual_showEvent(void* self, intptr_t slot); void QStatusBar_virtualbase_showEvent(void* self, QShowEvent* param1); diff --git a/qt6/gen_qstringlistmodel.cpp b/qt6/gen_qstringlistmodel.cpp index 60338999..d7875d45 100644 --- a/qt6/gen_qstringlistmodel.cpp +++ b/qt6/gen_qstringlistmodel.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qt6/gen_qstringmatcher.cpp b/qt6/gen_qstringmatcher.cpp index f320126e..1e221681 100644 --- a/qt6/gen_qstringmatcher.cpp +++ b/qt6/gen_qstringmatcher.cpp @@ -80,13 +80,13 @@ int QStringMatcher_caseSensitivity(const QStringMatcher* self) { return static_cast(_ret); } -ptrdiff_t QStringMatcher_indexIn22(const QStringMatcher* self, struct miqt_string str, ptrdiff_t from) { +ptrdiff_t QStringMatcher_indexIn3(const QStringMatcher* self, struct miqt_string str, ptrdiff_t from) { QString str_QString = QString::fromUtf8(str.data, str.len); qsizetype _ret = self->indexIn(str_QString, (qsizetype)(from)); return static_cast(_ret); } -ptrdiff_t QStringMatcher_indexIn3(const QStringMatcher* self, QChar* str, ptrdiff_t length, ptrdiff_t from) { +ptrdiff_t QStringMatcher_indexIn4(const QStringMatcher* self, QChar* str, ptrdiff_t length, ptrdiff_t from) { qsizetype _ret = self->indexIn(str, (qsizetype)(length), (qsizetype)(from)); return static_cast(_ret); } diff --git a/qt6/gen_qstringmatcher.go b/qt6/gen_qstringmatcher.go index 33075f0c..13d74cb4 100644 --- a/qt6/gen_qstringmatcher.go +++ b/qt6/gen_qstringmatcher.go @@ -128,16 +128,16 @@ func (this *QStringMatcher) CaseSensitivity() CaseSensitivity { return (CaseSensitivity)(C.QStringMatcher_caseSensitivity(this.h)) } -func (this *QStringMatcher) IndexIn22(str string, from int64) int64 { +func (this *QStringMatcher) IndexIn3(str string, from int64) int64 { 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 (int64)(C.QStringMatcher_indexIn22(this.h, str_ms, (C.ptrdiff_t)(from))) + return (int64)(C.QStringMatcher_indexIn3(this.h, str_ms, (C.ptrdiff_t)(from))) } -func (this *QStringMatcher) IndexIn3(str *QChar, length int64, from int64) int64 { - return (int64)(C.QStringMatcher_indexIn3(this.h, str.cPointer(), (C.ptrdiff_t)(length), (C.ptrdiff_t)(from))) +func (this *QStringMatcher) IndexIn4(str *QChar, length int64, from int64) int64 { + return (int64)(C.QStringMatcher_indexIn4(this.h, str.cPointer(), (C.ptrdiff_t)(length), (C.ptrdiff_t)(from))) } // Delete this object from C++ memory. diff --git a/qt6/gen_qstringmatcher.h b/qt6/gen_qstringmatcher.h index 75cbf171..8f4610c4 100644 --- a/qt6/gen_qstringmatcher.h +++ b/qt6/gen_qstringmatcher.h @@ -35,8 +35,8 @@ ptrdiff_t QStringMatcher_indexIn(const QStringMatcher* self, struct miqt_string ptrdiff_t QStringMatcher_indexIn2(const QStringMatcher* self, QChar* str, ptrdiff_t length); struct miqt_string QStringMatcher_pattern(const QStringMatcher* self); int QStringMatcher_caseSensitivity(const QStringMatcher* self); -ptrdiff_t QStringMatcher_indexIn22(const QStringMatcher* self, struct miqt_string str, ptrdiff_t from); -ptrdiff_t QStringMatcher_indexIn3(const QStringMatcher* self, QChar* str, ptrdiff_t length, ptrdiff_t from); +ptrdiff_t QStringMatcher_indexIn3(const QStringMatcher* self, struct miqt_string str, ptrdiff_t from); +ptrdiff_t QStringMatcher_indexIn4(const QStringMatcher* self, QChar* str, ptrdiff_t length, ptrdiff_t from); void QStringMatcher_delete(QStringMatcher* self); #ifdef __cplusplus diff --git a/qt6/gen_qstringview.cpp b/qt6/gen_qstringview.cpp index 3686ae7c..68ba623f 100644 --- a/qt6/gen_qstringview.cpp +++ b/qt6/gen_qstringview.cpp @@ -179,13 +179,13 @@ bool QStringView_isValidUtf16(const QStringView* self) { return self->isValidUtf16(); } -int16_t QStringView_toShort(const QStringView* self) { +short QStringView_toShort(const QStringView* self) { return self->toShort(); } -uint16_t QStringView_toUShort(const QStringView* self) { +unsigned short QStringView_toUShort(const QStringView* self) { ushort _ret = self->toUShort(); - return static_cast(_ret); + return static_cast(_ret); } int QStringView_toInt(const QStringView* self) { @@ -306,54 +306,54 @@ ptrdiff_t QStringView_count2(const QStringView* self, QChar* c, int cs) { return static_cast(_ret); } -ptrdiff_t QStringView_lastIndexOf22(const QStringView* self, QChar* c, int cs) { +ptrdiff_t QStringView_lastIndexOf6(const QStringView* self, QChar* c, int cs) { qsizetype _ret = self->lastIndexOf(*c, static_cast(cs)); return static_cast(_ret); } -ptrdiff_t QStringView_lastIndexOf32(const QStringView* self, QChar* c, ptrdiff_t from, int cs) { +ptrdiff_t QStringView_lastIndexOf7(const QStringView* self, QChar* c, ptrdiff_t from, int cs) { qsizetype _ret = self->lastIndexOf(*c, (qsizetype)(from), static_cast(cs)); return static_cast(_ret); } -ptrdiff_t QStringView_indexOf24(const QStringView* self, QRegularExpression* re, ptrdiff_t from) { +ptrdiff_t QStringView_indexOf8(const QStringView* self, QRegularExpression* re, ptrdiff_t from) { qsizetype _ret = self->indexOf(*re, (qsizetype)(from)); return static_cast(_ret); } -ptrdiff_t QStringView_indexOf34(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch) { +ptrdiff_t QStringView_indexOf9(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch) { qsizetype _ret = self->indexOf(*re, (qsizetype)(from), rmatch); return static_cast(_ret); } -ptrdiff_t QStringView_lastIndexOf35(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch) { +ptrdiff_t QStringView_lastIndexOf12(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch) { qsizetype _ret = self->lastIndexOf(*re, (qsizetype)(from), rmatch); return static_cast(_ret); } -bool QStringView_contains24(const QStringView* self, QRegularExpression* re, QRegularExpressionMatch* rmatch) { +bool QStringView_contains5(const QStringView* self, QRegularExpression* re, QRegularExpressionMatch* rmatch) { return self->contains(*re, rmatch); } -int16_t QStringView_toShort1(const QStringView* self, bool* ok) { +short QStringView_toShortWithOk(const QStringView* self, bool* ok) { return self->toShort(ok); } -int16_t QStringView_toShort2(const QStringView* self, bool* ok, int base) { +short QStringView_toShort2(const QStringView* self, bool* ok, int base) { return self->toShort(ok, static_cast(base)); } -uint16_t QStringView_toUShort1(const QStringView* self, bool* ok) { +unsigned short QStringView_toUShortWithOk(const QStringView* self, bool* ok) { ushort _ret = self->toUShort(ok); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QStringView_toUShort2(const QStringView* self, bool* ok, int base) { +unsigned short QStringView_toUShort2(const QStringView* self, bool* ok, int base) { ushort _ret = self->toUShort(ok, static_cast(base)); - return static_cast(_ret); + return static_cast(_ret); } -int QStringView_toInt1(const QStringView* self, bool* ok) { +int QStringView_toIntWithOk(const QStringView* self, bool* ok) { return self->toInt(ok); } @@ -361,7 +361,7 @@ int QStringView_toInt2(const QStringView* self, bool* ok, int base) { return self->toInt(ok, static_cast(base)); } -unsigned int QStringView_toUInt1(const QStringView* self, bool* ok) { +unsigned int QStringView_toUIntWithOk(const QStringView* self, bool* ok) { uint _ret = self->toUInt(ok); return static_cast(_ret); } @@ -371,7 +371,7 @@ unsigned int QStringView_toUInt2(const QStringView* self, bool* ok, int base) { return static_cast(_ret); } -long QStringView_toLong1(const QStringView* self, bool* ok) { +long QStringView_toLongWithOk(const QStringView* self, bool* ok) { return self->toLong(ok); } @@ -379,7 +379,7 @@ long QStringView_toLong2(const QStringView* self, bool* ok, int base) { return self->toLong(ok, static_cast(base)); } -unsigned long QStringView_toULong1(const QStringView* self, bool* ok) { +unsigned long QStringView_toULongWithOk(const QStringView* self, bool* ok) { ulong _ret = self->toULong(ok); return static_cast(_ret); } @@ -389,7 +389,7 @@ unsigned long QStringView_toULong2(const QStringView* self, bool* ok, int base) return static_cast(_ret); } -long long QStringView_toLongLong1(const QStringView* self, bool* ok) { +long long QStringView_toLongLongWithOk(const QStringView* self, bool* ok) { qlonglong _ret = self->toLongLong(ok); return static_cast(_ret); } @@ -399,7 +399,7 @@ long long QStringView_toLongLong2(const QStringView* self, bool* ok, int base) { return static_cast(_ret); } -unsigned long long QStringView_toULongLong1(const QStringView* self, bool* ok) { +unsigned long long QStringView_toULongLongWithOk(const QStringView* self, bool* ok) { qulonglong _ret = self->toULongLong(ok); return static_cast(_ret); } @@ -409,11 +409,11 @@ unsigned long long QStringView_toULongLong2(const QStringView* self, bool* ok, i return static_cast(_ret); } -float QStringView_toFloat1(const QStringView* self, bool* ok) { +float QStringView_toFloatWithOk(const QStringView* self, bool* ok) { return self->toFloat(ok); } -double QStringView_toDouble1(const QStringView* self, bool* ok) { +double QStringView_toDoubleWithOk(const QStringView* self, bool* ok) { return self->toDouble(ok); } diff --git a/qt6/gen_qstringview.go b/qt6/gen_qstringview.go index cf7fd6a7..65304cd6 100644 --- a/qt6/gen_qstringview.go +++ b/qt6/gen_qstringview.go @@ -309,100 +309,100 @@ func (this *QStringView) Count2(c QChar, cs CaseSensitivity) int64 { return (int64)(C.QStringView_count2(this.h, c.cPointer(), (C.int)(cs))) } -func (this *QStringView) LastIndexOf22(c QChar, cs CaseSensitivity) int64 { - return (int64)(C.QStringView_lastIndexOf22(this.h, c.cPointer(), (C.int)(cs))) +func (this *QStringView) LastIndexOf6(c QChar, cs CaseSensitivity) int64 { + return (int64)(C.QStringView_lastIndexOf6(this.h, c.cPointer(), (C.int)(cs))) } -func (this *QStringView) LastIndexOf32(c QChar, from int64, cs CaseSensitivity) int64 { - return (int64)(C.QStringView_lastIndexOf32(this.h, c.cPointer(), (C.ptrdiff_t)(from), (C.int)(cs))) +func (this *QStringView) LastIndexOf7(c QChar, from int64, cs CaseSensitivity) int64 { + return (int64)(C.QStringView_lastIndexOf7(this.h, c.cPointer(), (C.ptrdiff_t)(from), (C.int)(cs))) } -func (this *QStringView) IndexOf24(re *QRegularExpression, from int64) int64 { - return (int64)(C.QStringView_indexOf24(this.h, re.cPointer(), (C.ptrdiff_t)(from))) +func (this *QStringView) IndexOf8(re *QRegularExpression, from int64) int64 { + return (int64)(C.QStringView_indexOf8(this.h, re.cPointer(), (C.ptrdiff_t)(from))) } -func (this *QStringView) IndexOf34(re *QRegularExpression, from int64, rmatch *QRegularExpressionMatch) int64 { - return (int64)(C.QStringView_indexOf34(this.h, re.cPointer(), (C.ptrdiff_t)(from), rmatch.cPointer())) +func (this *QStringView) IndexOf9(re *QRegularExpression, from int64, rmatch *QRegularExpressionMatch) int64 { + return (int64)(C.QStringView_indexOf9(this.h, re.cPointer(), (C.ptrdiff_t)(from), rmatch.cPointer())) } -func (this *QStringView) LastIndexOf35(re *QRegularExpression, from int64, rmatch *QRegularExpressionMatch) int64 { - return (int64)(C.QStringView_lastIndexOf35(this.h, re.cPointer(), (C.ptrdiff_t)(from), rmatch.cPointer())) +func (this *QStringView) LastIndexOf12(re *QRegularExpression, from int64, rmatch *QRegularExpressionMatch) int64 { + return (int64)(C.QStringView_lastIndexOf12(this.h, re.cPointer(), (C.ptrdiff_t)(from), rmatch.cPointer())) } -func (this *QStringView) Contains24(re *QRegularExpression, rmatch *QRegularExpressionMatch) bool { - return (bool)(C.QStringView_contains24(this.h, re.cPointer(), rmatch.cPointer())) +func (this *QStringView) Contains5(re *QRegularExpression, rmatch *QRegularExpressionMatch) bool { + return (bool)(C.QStringView_contains5(this.h, re.cPointer(), rmatch.cPointer())) } -func (this *QStringView) ToShort1(ok *bool) int16 { - return (int16)(C.QStringView_toShort1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToShortWithOk(ok *bool) int16 { + return (int16)(C.QStringView_toShortWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToShort2(ok *bool, base int) int16 { return (int16)(C.QStringView_toShort2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToUShort1(ok *bool) uint16 { - return (uint16)(C.QStringView_toUShort1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToUShortWithOk(ok *bool) uint16 { + return (uint16)(C.QStringView_toUShortWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToUShort2(ok *bool, base int) uint16 { return (uint16)(C.QStringView_toUShort2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToInt1(ok *bool) int { - return (int)(C.QStringView_toInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToIntWithOk(ok *bool) int { + return (int)(C.QStringView_toIntWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToInt2(ok *bool, base int) int { return (int)(C.QStringView_toInt2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToUInt1(ok *bool) uint { - return (uint)(C.QStringView_toUInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToUIntWithOk(ok *bool) uint { + return (uint)(C.QStringView_toUIntWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToUInt2(ok *bool, base int) uint { return (uint)(C.QStringView_toUInt2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToLong1(ok *bool) int64 { - return (int64)(C.QStringView_toLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToLongWithOk(ok *bool) int64 { + return (int64)(C.QStringView_toLongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToLong2(ok *bool, base int) int64 { return (int64)(C.QStringView_toLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToULong1(ok *bool) uint64 { - return (uint64)(C.QStringView_toULong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToULongWithOk(ok *bool) uint64 { + return (uint64)(C.QStringView_toULongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToULong2(ok *bool, base int) uint64 { return (uint64)(C.QStringView_toULong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToLongLong1(ok *bool) int64 { - return (int64)(C.QStringView_toLongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToLongLongWithOk(ok *bool) int64 { + return (int64)(C.QStringView_toLongLongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToLongLong2(ok *bool, base int) int64 { return (int64)(C.QStringView_toLongLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToULongLong1(ok *bool) uint64 { - return (uint64)(C.QStringView_toULongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToULongLongWithOk(ok *bool) uint64 { + return (uint64)(C.QStringView_toULongLongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QStringView) ToULongLong2(ok *bool, base int) uint64 { return (uint64)(C.QStringView_toULongLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) } -func (this *QStringView) ToFloat1(ok *bool) float32 { - return (float32)(C.QStringView_toFloat1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToFloatWithOk(ok *bool) float32 { + return (float32)(C.QStringView_toFloatWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QStringView) ToDouble1(ok *bool) float64 { - return (float64)(C.QStringView_toDouble1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QStringView) ToDoubleWithOk(ok *bool) float64 { + return (float64)(C.QStringView_toDoubleWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } // Delete this object from C++ memory. diff --git a/qt6/gen_qstringview.h b/qt6/gen_qstringview.h index 6f7fb80a..8bc9bd82 100644 --- a/qt6/gen_qstringview.h +++ b/qt6/gen_qstringview.h @@ -56,8 +56,8 @@ bool QStringView_containsWithRe(const QStringView* self, QRegularExpression* re) ptrdiff_t QStringView_countWithRe(const QStringView* self, QRegularExpression* re); bool QStringView_isRightToLeft(const QStringView* self); bool QStringView_isValidUtf16(const QStringView* self); -int16_t QStringView_toShort(const QStringView* self); -uint16_t QStringView_toUShort(const QStringView* self); +short QStringView_toShort(const QStringView* self); +unsigned short QStringView_toUShort(const QStringView* self); int QStringView_toInt(const QStringView* self); unsigned int QStringView_toUInt(const QStringView* self); long QStringView_toLong(const QStringView* self); @@ -84,30 +84,30 @@ ptrdiff_t QStringView_indexOf2(const QStringView* self, QChar* c, ptrdiff_t from ptrdiff_t QStringView_indexOf3(const QStringView* self, QChar* c, ptrdiff_t from, int cs); bool QStringView_contains2(const QStringView* self, QChar* c, int cs); ptrdiff_t QStringView_count2(const QStringView* self, QChar* c, int cs); -ptrdiff_t QStringView_lastIndexOf22(const QStringView* self, QChar* c, int cs); -ptrdiff_t QStringView_lastIndexOf32(const QStringView* self, QChar* c, ptrdiff_t from, int cs); -ptrdiff_t QStringView_indexOf24(const QStringView* self, QRegularExpression* re, ptrdiff_t from); -ptrdiff_t QStringView_indexOf34(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch); -ptrdiff_t QStringView_lastIndexOf35(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch); -bool QStringView_contains24(const QStringView* self, QRegularExpression* re, QRegularExpressionMatch* rmatch); -int16_t QStringView_toShort1(const QStringView* self, bool* ok); -int16_t QStringView_toShort2(const QStringView* self, bool* ok, int base); -uint16_t QStringView_toUShort1(const QStringView* self, bool* ok); -uint16_t QStringView_toUShort2(const QStringView* self, bool* ok, int base); -int QStringView_toInt1(const QStringView* self, bool* ok); +ptrdiff_t QStringView_lastIndexOf6(const QStringView* self, QChar* c, int cs); +ptrdiff_t QStringView_lastIndexOf7(const QStringView* self, QChar* c, ptrdiff_t from, int cs); +ptrdiff_t QStringView_indexOf8(const QStringView* self, QRegularExpression* re, ptrdiff_t from); +ptrdiff_t QStringView_indexOf9(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch); +ptrdiff_t QStringView_lastIndexOf12(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch); +bool QStringView_contains5(const QStringView* self, QRegularExpression* re, QRegularExpressionMatch* rmatch); +short QStringView_toShortWithOk(const QStringView* self, bool* ok); +short QStringView_toShort2(const QStringView* self, bool* ok, int base); +unsigned short QStringView_toUShortWithOk(const QStringView* self, bool* ok); +unsigned short QStringView_toUShort2(const QStringView* self, bool* ok, int base); +int QStringView_toIntWithOk(const QStringView* self, bool* ok); int QStringView_toInt2(const QStringView* self, bool* ok, int base); -unsigned int QStringView_toUInt1(const QStringView* self, bool* ok); +unsigned int QStringView_toUIntWithOk(const QStringView* self, bool* ok); unsigned int QStringView_toUInt2(const QStringView* self, bool* ok, int base); -long QStringView_toLong1(const QStringView* self, bool* ok); +long QStringView_toLongWithOk(const QStringView* self, bool* ok); long QStringView_toLong2(const QStringView* self, bool* ok, int base); -unsigned long QStringView_toULong1(const QStringView* self, bool* ok); +unsigned long QStringView_toULongWithOk(const QStringView* self, bool* ok); unsigned long QStringView_toULong2(const QStringView* self, bool* ok, int base); -long long QStringView_toLongLong1(const QStringView* self, bool* ok); +long long QStringView_toLongLongWithOk(const QStringView* self, bool* ok); long long QStringView_toLongLong2(const QStringView* self, bool* ok, int base); -unsigned long long QStringView_toULongLong1(const QStringView* self, bool* ok); +unsigned long long QStringView_toULongLongWithOk(const QStringView* self, bool* ok); unsigned long long QStringView_toULongLong2(const QStringView* self, bool* ok, int base); -float QStringView_toFloat1(const QStringView* self, bool* ok); -double QStringView_toDouble1(const QStringView* self, bool* ok); +float QStringView_toFloatWithOk(const QStringView* self, bool* ok); +double QStringView_toDoubleWithOk(const QStringView* self, bool* ok); void QStringView_delete(QStringView* self); #ifdef __cplusplus diff --git a/qt6/gen_qstyle.cpp b/qt6/gen_qstyle.cpp index c4838b99..0a589cc0 100644 --- a/qt6/gen_qstyle.cpp +++ b/qt6/gen_qstyle.cpp @@ -899,19 +899,19 @@ struct miqt_string QStyle_tr3(const char* s, const char* c, int n) { return _ms; } -int QStyle_sliderPositionFromValue5(int min, int max, int val, int space, bool upsideDown) { +int QStyle_sliderPositionFromValue2(int min, int max, int val, int space, bool upsideDown) { return QStyle::sliderPositionFromValue(static_cast(min), static_cast(max), static_cast(val), static_cast(space), upsideDown); } -int QStyle_sliderValueFromPosition5(int min, int max, int pos, int space, bool upsideDown) { +int QStyle_sliderValueFromPosition2(int min, int max, int pos, int space, bool upsideDown) { return QStyle::sliderValueFromPosition(static_cast(min), static_cast(max), static_cast(pos), static_cast(space), upsideDown); } -int QStyle_combinedLayoutSpacing4(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option) { +int QStyle_combinedLayoutSpacing2(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option) { return self->combinedLayoutSpacing(static_cast(controls1), static_cast(controls2), static_cast(orientation), option); } -int QStyle_combinedLayoutSpacing5(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option, QWidget* widget) { +int QStyle_combinedLayoutSpacing3(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option, QWidget* widget) { return self->combinedLayoutSpacing(static_cast(controls1), static_cast(controls2), static_cast(orientation), option, widget); } diff --git a/qt6/gen_qstyle.go b/qt6/gen_qstyle.go index dd0aded2..64a6ecf9 100644 --- a/qt6/gen_qstyle.go +++ b/qt6/gen_qstyle.go @@ -870,20 +870,20 @@ func QStyle_Tr3(s string, c string, n int) string { return _ret } -func QStyle_SliderPositionFromValue5(min int, max int, val int, space int, upsideDown bool) int { - return (int)(C.QStyle_sliderPositionFromValue5((C.int)(min), (C.int)(max), (C.int)(val), (C.int)(space), (C.bool)(upsideDown))) +func QStyle_SliderPositionFromValue2(min int, max int, val int, space int, upsideDown bool) int { + return (int)(C.QStyle_sliderPositionFromValue2((C.int)(min), (C.int)(max), (C.int)(val), (C.int)(space), (C.bool)(upsideDown))) } -func QStyle_SliderValueFromPosition5(min int, max int, pos int, space int, upsideDown bool) int { - return (int)(C.QStyle_sliderValueFromPosition5((C.int)(min), (C.int)(max), (C.int)(pos), (C.int)(space), (C.bool)(upsideDown))) +func QStyle_SliderValueFromPosition2(min int, max int, pos int, space int, upsideDown bool) int { + return (int)(C.QStyle_sliderValueFromPosition2((C.int)(min), (C.int)(max), (C.int)(pos), (C.int)(space), (C.bool)(upsideDown))) } -func (this *QStyle) CombinedLayoutSpacing4(controls1 QSizePolicy__ControlType, controls2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption) int { - return (int)(C.QStyle_combinedLayoutSpacing4(this.h, (C.int)(controls1), (C.int)(controls2), (C.int)(orientation), option.cPointer())) +func (this *QStyle) CombinedLayoutSpacing2(controls1 QSizePolicy__ControlType, controls2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption) int { + return (int)(C.QStyle_combinedLayoutSpacing2(this.h, (C.int)(controls1), (C.int)(controls2), (C.int)(orientation), option.cPointer())) } -func (this *QStyle) CombinedLayoutSpacing5(controls1 QSizePolicy__ControlType, controls2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption, widget *QWidget) int { - return (int)(C.QStyle_combinedLayoutSpacing5(this.h, (C.int)(controls1), (C.int)(controls2), (C.int)(orientation), option.cPointer(), widget.cPointer())) +func (this *QStyle) CombinedLayoutSpacing3(controls1 QSizePolicy__ControlType, controls2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption, widget *QWidget) int { + return (int)(C.QStyle_combinedLayoutSpacing3(this.h, (C.int)(controls1), (C.int)(controls2), (C.int)(orientation), option.cPointer(), widget.cPointer())) } // Sender can only be called from a QStyle that was directly constructed. diff --git a/qt6/gen_qstyle.h b/qt6/gen_qstyle.h index c9dc0481..a2004fa5 100644 --- a/qt6/gen_qstyle.h +++ b/qt6/gen_qstyle.h @@ -97,10 +97,10 @@ int QStyle_combinedLayoutSpacing(const QStyle* self, int controls1, int controls 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); -int QStyle_sliderPositionFromValue5(int min, int max, int val, int space, bool upsideDown); -int QStyle_sliderValueFromPosition5(int min, int max, int pos, int space, bool upsideDown); -int QStyle_combinedLayoutSpacing4(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option); -int QStyle_combinedLayoutSpacing5(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option, QWidget* widget); +int QStyle_sliderPositionFromValue2(int min, int max, int val, int space, bool upsideDown); +int QStyle_sliderValueFromPosition2(int min, int max, int pos, int space, bool upsideDown); +int QStyle_combinedLayoutSpacing2(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option); +int QStyle_combinedLayoutSpacing3(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option, QWidget* widget); bool QStyle_override_virtual_polish(void* self, intptr_t slot); void QStyle_virtualbase_polish(void* self, QWidget* widget); bool QStyle_override_virtual_unpolish(void* self, intptr_t slot); diff --git a/qt6/gen_qstylepainter.cpp b/qt6/gen_qstylepainter.cpp index e2d7914c..549b2b71 100644 --- a/qt6/gen_qstylepainter.cpp +++ b/qt6/gen_qstylepainter.cpp @@ -71,7 +71,7 @@ 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) { +void QStylePainter_drawItemText2(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/qt6/gen_qstylepainter.go b/qt6/gen_qstylepainter.go index 1d4a43e4..4a14db8b 100644 --- a/qt6/gen_qstylepainter.go +++ b/qt6/gen_qstylepainter.go @@ -103,12 +103,12 @@ func (this *QStylePainter) Style() *QStyle { return newQStyle(C.QStylePainter_style(this.h)) } -func (this *QStylePainter) DrawItemText6(r *QRect, flags int, pal *QPalette, enabled bool, text string, textRole QPalette__ColorRole) { +func (this *QStylePainter) DrawItemText2(r *QRect, flags int, pal *QPalette, enabled bool, text string, textRole QPalette__ColorRole) { text_ms := C.struct_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)) + C.QStylePainter_drawItemText2(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/qt6/gen_qstylepainter.h b/qt6/gen_qstylepainter.h index c1a7517e..2efb484d 100644 --- a/qt6/gen_qstylepainter.h +++ b/qt6/gen_qstylepainter.h @@ -50,7 +50,7 @@ void QStylePainter_drawComplexControl(QStylePainter* self, int cc, QStyleOptionC 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_drawItemText2(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/qt6/gen_qsystemsemaphore.cpp b/qt6/gen_qsystemsemaphore.cpp index 8644260b..8cfdeb4b 100644 --- a/qt6/gen_qsystemsemaphore.cpp +++ b/qt6/gen_qsystemsemaphore.cpp @@ -111,7 +111,7 @@ void QSystemSemaphore_setKey3(QSystemSemaphore* self, struct miqt_string key, in self->setKey(key_QString, static_cast(initialValue), static_cast(mode)); } -bool QSystemSemaphore_release1(QSystemSemaphore* self, int n) { +bool QSystemSemaphore_releaseWithInt(QSystemSemaphore* self, int n) { return self->release(static_cast(n)); } diff --git a/qt6/gen_qsystemsemaphore.go b/qt6/gen_qsystemsemaphore.go index 12a61e49..aa1fd05e 100644 --- a/qt6/gen_qsystemsemaphore.go +++ b/qt6/gen_qsystemsemaphore.go @@ -175,8 +175,8 @@ func (this *QSystemSemaphore) SetKey3(key string, initialValue int, mode QSystem C.QSystemSemaphore_setKey3(this.h, key_ms, (C.int)(initialValue), (C.int)(mode)) } -func (this *QSystemSemaphore) Release1(n int) bool { - return (bool)(C.QSystemSemaphore_release1(this.h, (C.int)(n))) +func (this *QSystemSemaphore) ReleaseWithInt(n int) bool { + return (bool)(C.QSystemSemaphore_releaseWithInt(this.h, (C.int)(n))) } // Delete this object from C++ memory. diff --git a/qt6/gen_qsystemsemaphore.h b/qt6/gen_qsystemsemaphore.h index cbd17422..dfbd22a7 100644 --- a/qt6/gen_qsystemsemaphore.h +++ b/qt6/gen_qsystemsemaphore.h @@ -34,7 +34,7 @@ struct miqt_string QSystemSemaphore_tr2(const char* sourceText, const char* disa struct miqt_string QSystemSemaphore_tr3(const char* sourceText, const char* disambiguation, int n); 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); +bool QSystemSemaphore_releaseWithInt(QSystemSemaphore* self, int n); void QSystemSemaphore_delete(QSystemSemaphore* self); #ifdef __cplusplus diff --git a/qt6/gen_qsystemtrayicon.cpp b/qt6/gen_qsystemtrayicon.cpp index 6faf8dcd..9e20fbd0 100644 --- a/qt6/gen_qsystemtrayicon.cpp +++ b/qt6/gen_qsystemtrayicon.cpp @@ -339,19 +339,19 @@ struct miqt_string QSystemTrayIcon_tr3(const char* s, const char* c, int n) { return _ms; } -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, 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) { +void QSystemTrayIcon_showMessage4(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) { +void QSystemTrayIcon_showMessage5(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/qt6/gen_qsystemtrayicon.go b/qt6/gen_qsystemtrayicon.go index d2c3c03f..5bbb8eb1 100644 --- a/qt6/gen_qsystemtrayicon.go +++ b/qt6/gen_qsystemtrayicon.go @@ -258,7 +258,7 @@ func QSystemTrayIcon_Tr3(s string, c string, n int) string { return _ret } -func (this *QSystemTrayIcon) ShowMessage4(title string, msg string, icon *QIcon, msecs int) { +func (this *QSystemTrayIcon) ShowMessage3(title string, msg string, icon *QIcon, msecs int) { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -267,10 +267,10 @@ func (this *QSystemTrayIcon) ShowMessage4(title string, msg string, icon *QIcon, 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)) + C.QSystemTrayIcon_showMessage3(this.h, title_ms, msg_ms, icon.cPointer(), (C.int)(msecs)) } -func (this *QSystemTrayIcon) ShowMessage3(title string, msg string, icon QSystemTrayIcon__MessageIcon) { +func (this *QSystemTrayIcon) ShowMessage4(title string, msg string, icon QSystemTrayIcon__MessageIcon) { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -279,10 +279,10 @@ func (this *QSystemTrayIcon) ShowMessage3(title string, msg string, icon QSystem 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)) + C.QSystemTrayIcon_showMessage4(this.h, title_ms, msg_ms, (C.int)(icon)) } -func (this *QSystemTrayIcon) ShowMessage42(title string, msg string, icon QSystemTrayIcon__MessageIcon, msecs int) { +func (this *QSystemTrayIcon) ShowMessage5(title string, msg string, icon QSystemTrayIcon__MessageIcon, msecs int) { title_ms := C.struct_miqt_string{} title_ms.data = C.CString(title) title_ms.len = C.size_t(len(title)) @@ -291,7 +291,7 @@ func (this *QSystemTrayIcon) ShowMessage42(title string, msg string, icon QSyste 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)) + C.QSystemTrayIcon_showMessage5(this.h, title_ms, msg_ms, (C.int)(icon), (C.int)(msecs)) } // Sender can only be called from a QSystemTrayIcon that was directly constructed. diff --git a/qt6/gen_qsystemtrayicon.h b/qt6/gen_qsystemtrayicon.h index 31ed424a..c8b15381 100644 --- a/qt6/gen_qsystemtrayicon.h +++ b/qt6/gen_qsystemtrayicon.h @@ -68,9 +68,9 @@ void QSystemTrayIcon_connect_messageClicked(QSystemTrayIcon* self, intptr_t slot bool QSystemTrayIcon_event(QSystemTrayIcon* self, QEvent* event); struct miqt_string QSystemTrayIcon_tr2(const char* s, const char* c); struct miqt_string QSystemTrayIcon_tr3(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_showMessage3(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, QIcon* icon, int msecs); +void QSystemTrayIcon_showMessage4(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, int icon); +void QSystemTrayIcon_showMessage5(QSystemTrayIcon* self, struct miqt_string title, struct miqt_string msg, int icon, int msecs); bool QSystemTrayIcon_override_virtual_event(void* self, intptr_t slot); bool QSystemTrayIcon_virtualbase_event(void* self, QEvent* event); bool QSystemTrayIcon_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt6/gen_qtabwidget.cpp b/qt6/gen_qtabwidget.cpp index 65ed61db..1b76111a 100644 --- a/qt6/gen_qtabwidget.cpp +++ b/qt6/gen_qtabwidget.cpp @@ -1401,7 +1401,7 @@ void QTabWidget_setCornerWidget2(QTabWidget* self, QWidget* w, int corner) { self->setCornerWidget(w, static_cast(corner)); } -QWidget* QTabWidget_cornerWidget1(const QTabWidget* self, int corner) { +QWidget* QTabWidget_cornerWidgetWithCorner(const QTabWidget* self, int corner) { return self->cornerWidget(static_cast(corner)); } diff --git a/qt6/gen_qtabwidget.go b/qt6/gen_qtabwidget.go index ee4f01a9..1b2be7e0 100644 --- a/qt6/gen_qtabwidget.go +++ b/qt6/gen_qtabwidget.go @@ -448,8 +448,8 @@ func (this *QTabWidget) SetCornerWidget2(w *QWidget, corner Corner) { C.QTabWidget_setCornerWidget2(this.h, w.cPointer(), (C.int)(corner)) } -func (this *QTabWidget) CornerWidget1(corner Corner) *QWidget { - return newQWidget(C.QTabWidget_cornerWidget1(this.h, (C.int)(corner))) +func (this *QTabWidget) CornerWidgetWithCorner(corner Corner) *QWidget { + return newQWidget(C.QTabWidget_cornerWidgetWithCorner(this.h, (C.int)(corner))) } // SetTabBar can only be called from a QTabWidget that was directly constructed. diff --git a/qt6/gen_qtabwidget.h b/qt6/gen_qtabwidget.h index abd50d67..ebd82926 100644 --- a/qt6/gen_qtabwidget.h +++ b/qt6/gen_qtabwidget.h @@ -166,7 +166,7 @@ void QTabWidget_initStyleOption(const QTabWidget* self, QStyleOptionTabWidgetFra struct miqt_string QTabWidget_tr2(const char* s, const char* c); struct miqt_string QTabWidget_tr3(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); +QWidget* QTabWidget_cornerWidgetWithCorner(const QTabWidget* self, int corner); bool QTabWidget_override_virtual_sizeHint(void* self, intptr_t slot); QSize* QTabWidget_virtualbase_sizeHint(const void* self); bool QTabWidget_override_virtual_minimumSizeHint(void* self, intptr_t slot); diff --git a/qt6/gen_qtestsupport_gui.cpp b/qt6/gen_qtestsupport_gui.cpp index f87a0d7d..ad4f1af8 100644 --- a/qt6/gen_qtestsupport_gui.cpp +++ b/qt6/gen_qtestsupport_gui.cpp @@ -41,19 +41,19 @@ bool QTest__QTouchEventSequence_commit(QTest__QTouchEventSequence* self, bool pr return self->commit(processEvents); } -QTest__QTouchEventSequence* QTest__QTouchEventSequence_press3(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window) { +QTest__QTouchEventSequence* QTest__QTouchEventSequence_press2(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window) { QTest::QTouchEventSequence& _ret = self->press(static_cast(touchId), *pt, window); // Cast returned reference into pointer return &_ret; } -QTest__QTouchEventSequence* QTest__QTouchEventSequence_move3(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window) { +QTest__QTouchEventSequence* QTest__QTouchEventSequence_move2(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window) { QTest::QTouchEventSequence& _ret = self->move(static_cast(touchId), *pt, window); // Cast returned reference into pointer return &_ret; } -QTest__QTouchEventSequence* QTest__QTouchEventSequence_release3(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window) { +QTest__QTouchEventSequence* QTest__QTouchEventSequence_release2(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window) { QTest::QTouchEventSequence& _ret = self->release(static_cast(touchId), *pt, window); // Cast returned reference into pointer return &_ret; diff --git a/qt6/gen_qtestsupport_gui.go b/qt6/gen_qtestsupport_gui.go index 0e96e871..0f165f88 100644 --- a/qt6/gen_qtestsupport_gui.go +++ b/qt6/gen_qtestsupport_gui.go @@ -65,16 +65,16 @@ func (this *QTest__QTouchEventSequence) Commit(processEvents bool) bool { return (bool)(C.QTest__QTouchEventSequence_commit(this.h, (C.bool)(processEvents))) } -func (this *QTest__QTouchEventSequence) Press3(touchId int, pt *QPoint, window *QWindow) *QTest__QTouchEventSequence { - return newQTest__QTouchEventSequence(C.QTest__QTouchEventSequence_press3(this.h, (C.int)(touchId), pt.cPointer(), window.cPointer())) +func (this *QTest__QTouchEventSequence) Press2(touchId int, pt *QPoint, window *QWindow) *QTest__QTouchEventSequence { + return newQTest__QTouchEventSequence(C.QTest__QTouchEventSequence_press2(this.h, (C.int)(touchId), pt.cPointer(), window.cPointer())) } -func (this *QTest__QTouchEventSequence) Move3(touchId int, pt *QPoint, window *QWindow) *QTest__QTouchEventSequence { - return newQTest__QTouchEventSequence(C.QTest__QTouchEventSequence_move3(this.h, (C.int)(touchId), pt.cPointer(), window.cPointer())) +func (this *QTest__QTouchEventSequence) Move2(touchId int, pt *QPoint, window *QWindow) *QTest__QTouchEventSequence { + return newQTest__QTouchEventSequence(C.QTest__QTouchEventSequence_move2(this.h, (C.int)(touchId), pt.cPointer(), window.cPointer())) } -func (this *QTest__QTouchEventSequence) Release3(touchId int, pt *QPoint, window *QWindow) *QTest__QTouchEventSequence { - return newQTest__QTouchEventSequence(C.QTest__QTouchEventSequence_release3(this.h, (C.int)(touchId), pt.cPointer(), window.cPointer())) +func (this *QTest__QTouchEventSequence) Release2(touchId int, pt *QPoint, window *QWindow) *QTest__QTouchEventSequence { + return newQTest__QTouchEventSequence(C.QTest__QTouchEventSequence_release2(this.h, (C.int)(touchId), pt.cPointer(), window.cPointer())) } // Delete this object from C++ memory. diff --git a/qt6/gen_qtestsupport_gui.h b/qt6/gen_qtestsupport_gui.h index d26a1632..fa6f56a7 100644 --- a/qt6/gen_qtestsupport_gui.h +++ b/qt6/gen_qtestsupport_gui.h @@ -35,9 +35,9 @@ QTest__QTouchEventSequence* QTest__QTouchEventSequence_move(QTest__QTouchEventSe QTest__QTouchEventSequence* QTest__QTouchEventSequence_release(QTest__QTouchEventSequence* self, int touchId, QPoint* pt); QTest__QTouchEventSequence* QTest__QTouchEventSequence_stationary(QTest__QTouchEventSequence* self, int touchId); bool QTest__QTouchEventSequence_commit(QTest__QTouchEventSequence* self, bool processEvents); -QTest__QTouchEventSequence* QTest__QTouchEventSequence_press3(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window); -QTest__QTouchEventSequence* QTest__QTouchEventSequence_move3(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window); -QTest__QTouchEventSequence* QTest__QTouchEventSequence_release3(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window); +QTest__QTouchEventSequence* QTest__QTouchEventSequence_press2(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window); +QTest__QTouchEventSequence* QTest__QTouchEventSequence_move2(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window); +QTest__QTouchEventSequence* QTest__QTouchEventSequence_release2(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window); void QTest__QTouchEventSequence_delete(QTest__QTouchEventSequence* self); #ifdef __cplusplus diff --git a/qt6/gen_qtestsupport_widgets.cpp b/qt6/gen_qtestsupport_widgets.cpp index b0b620a1..a1028eab 100644 --- a/qt6/gen_qtestsupport_widgets.cpp +++ b/qt6/gen_qtestsupport_widgets.cpp @@ -100,19 +100,19 @@ bool QTest__QTouchEventWidgetSequence_commit(QTest__QTouchEventWidgetSequence* s return self->commit(processEvents); } -QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_press3(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget) { +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_press2(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget) { QTest::QTouchEventWidgetSequence& _ret = self->press(static_cast(touchId), *pt, widget); // Cast returned reference into pointer return &_ret; } -QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_move3(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget) { +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_move2(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget) { QTest::QTouchEventWidgetSequence& _ret = self->move(static_cast(touchId), *pt, widget); // Cast returned reference into pointer return &_ret; } -QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_release3(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget) { +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_release2(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget) { QTest::QTouchEventWidgetSequence& _ret = self->release(static_cast(touchId), *pt, widget); // Cast returned reference into pointer return &_ret; diff --git a/qt6/gen_qtestsupport_widgets.go b/qt6/gen_qtestsupport_widgets.go index 49be7f0d..e971c912 100644 --- a/qt6/gen_qtestsupport_widgets.go +++ b/qt6/gen_qtestsupport_widgets.go @@ -76,16 +76,16 @@ func (this *QTest__QTouchEventWidgetSequence) Commit(processEvents bool) bool { return (bool)(C.QTest__QTouchEventWidgetSequence_commit(this.h, (C.bool)(processEvents))) } -func (this *QTest__QTouchEventWidgetSequence) Press3(touchId int, pt *QPoint, widget *QWidget) *QTest__QTouchEventWidgetSequence { - return newQTest__QTouchEventWidgetSequence(C.QTest__QTouchEventWidgetSequence_press3(this.h, (C.int)(touchId), pt.cPointer(), widget.cPointer())) +func (this *QTest__QTouchEventWidgetSequence) Press2(touchId int, pt *QPoint, widget *QWidget) *QTest__QTouchEventWidgetSequence { + return newQTest__QTouchEventWidgetSequence(C.QTest__QTouchEventWidgetSequence_press2(this.h, (C.int)(touchId), pt.cPointer(), widget.cPointer())) } -func (this *QTest__QTouchEventWidgetSequence) Move3(touchId int, pt *QPoint, widget *QWidget) *QTest__QTouchEventWidgetSequence { - return newQTest__QTouchEventWidgetSequence(C.QTest__QTouchEventWidgetSequence_move3(this.h, (C.int)(touchId), pt.cPointer(), widget.cPointer())) +func (this *QTest__QTouchEventWidgetSequence) Move2(touchId int, pt *QPoint, widget *QWidget) *QTest__QTouchEventWidgetSequence { + return newQTest__QTouchEventWidgetSequence(C.QTest__QTouchEventWidgetSequence_move2(this.h, (C.int)(touchId), pt.cPointer(), widget.cPointer())) } -func (this *QTest__QTouchEventWidgetSequence) Release3(touchId int, pt *QPoint, widget *QWidget) *QTest__QTouchEventWidgetSequence { - return newQTest__QTouchEventWidgetSequence(C.QTest__QTouchEventWidgetSequence_release3(this.h, (C.int)(touchId), pt.cPointer(), widget.cPointer())) +func (this *QTest__QTouchEventWidgetSequence) Release2(touchId int, pt *QPoint, widget *QWidget) *QTest__QTouchEventWidgetSequence { + return newQTest__QTouchEventWidgetSequence(C.QTest__QTouchEventWidgetSequence_release2(this.h, (C.int)(touchId), pt.cPointer(), widget.cPointer())) } // Point can only be called from a QTest__QTouchEventWidgetSequence that was directly constructed. diff --git a/qt6/gen_qtestsupport_widgets.h b/qt6/gen_qtestsupport_widgets.h index 377385a3..1d6e9a3e 100644 --- a/qt6/gen_qtestsupport_widgets.h +++ b/qt6/gen_qtestsupport_widgets.h @@ -43,9 +43,9 @@ QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_move(QTest__Q QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_release(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt); QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_stationary(QTest__QTouchEventWidgetSequence* self, int touchId); bool QTest__QTouchEventWidgetSequence_commit(QTest__QTouchEventWidgetSequence* self, bool processEvents); -QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_press3(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget); -QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_move3(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget); -QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_release3(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget); +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_press2(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget); +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_move2(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget); +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_release2(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget); bool QTest__QTouchEventWidgetSequence_override_virtual_stationary(void* self, intptr_t slot); QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_virtualbase_stationary(void* self, int touchId); bool QTest__QTouchEventWidgetSequence_override_virtual_commit(void* self, intptr_t slot); diff --git a/qt6/gen_qtextdocument.cpp b/qt6/gen_qtextdocument.cpp index 0c705f66..a058423f 100644 --- a/qt6/gen_qtextdocument.cpp +++ b/qt6/gen_qtextdocument.cpp @@ -879,11 +879,11 @@ struct miqt_string QTextDocument_tr3(const char* s, const char* c, int n) { return _ms; } -QTextDocument* QTextDocument_clone1(const QTextDocument* self, QObject* parent) { +QTextDocument* QTextDocument_cloneWithParent(const QTextDocument* self, QObject* parent) { return self->clone(parent); } -struct miqt_string QTextDocument_toMarkdown1(const QTextDocument* self, int features) { +struct miqt_string QTextDocument_toMarkdownWithFeatures(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(); @@ -899,30 +899,30 @@ void QTextDocument_setMarkdown2(QTextDocument* self, struct miqt_string markdown self->setMarkdown(markdown_QString, static_cast(features)); } -QTextCursor* QTextDocument_find22(const QTextDocument* self, struct miqt_string subString, int from) { +QTextCursor* QTextDocument_find4(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) { +QTextCursor* QTextDocument_find5(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) { +QTextCursor* QTextDocument_find6(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))); } -QTextCursor* QTextDocument_find23(const QTextDocument* self, QRegularExpression* expr, int from) { +QTextCursor* QTextDocument_find7(const QTextDocument* self, QRegularExpression* expr, int from) { return new QTextCursor(self->find(*expr, static_cast(from))); } -QTextCursor* QTextDocument_find34(const QTextDocument* self, QRegularExpression* expr, int from, int options) { +QTextCursor* QTextDocument_find8(const QTextDocument* self, QRegularExpression* expr, int from, int options) { return new QTextCursor(self->find(*expr, static_cast(from), static_cast(options))); } -QTextCursor* QTextDocument_find35(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options) { +QTextCursor* QTextDocument_find9(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options) { return new QTextCursor(self->find(*expr, *cursor, static_cast(options))); } @@ -930,11 +930,11 @@ void QTextDocument_drawContents2(QTextDocument* self, QPainter* painter, QRectF* self->drawContents(painter, *rect); } -void QTextDocument_clearUndoRedoStacks1(QTextDocument* self, int historyToClear) { +void QTextDocument_clearUndoRedoStacksWithHistoryToClear(QTextDocument* self, int historyToClear) { self->clearUndoRedoStacks(static_cast(historyToClear)); } -void QTextDocument_setModified1(QTextDocument* self, bool m) { +void QTextDocument_setModifiedWithBool(QTextDocument* self, bool m) { self->setModified(m); } diff --git a/qt6/gen_qtextdocument.go b/qt6/gen_qtextdocument.go index ceba7d67..d54ea571 100644 --- a/qt6/gen_qtextdocument.go +++ b/qt6/gen_qtextdocument.go @@ -861,12 +861,12 @@ func QTextDocument_Tr3(s string, c string, n int) string { return _ret } -func (this *QTextDocument) Clone1(parent *QObject) *QTextDocument { - return newQTextDocument(C.QTextDocument_clone1(this.h, parent.cPointer())) +func (this *QTextDocument) CloneWithParent(parent *QObject) *QTextDocument { + return newQTextDocument(C.QTextDocument_cloneWithParent(this.h, parent.cPointer())) } -func (this *QTextDocument) ToMarkdown1(features QTextDocument__MarkdownFeature) string { - var _ms C.struct_miqt_string = C.QTextDocument_toMarkdown1(this.h, (C.int)(features)) +func (this *QTextDocument) ToMarkdownWithFeatures(features QTextDocument__MarkdownFeature) string { + var _ms C.struct_miqt_string = C.QTextDocument_toMarkdownWithFeatures(this.h, (C.int)(features)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -880,50 +880,50 @@ func (this *QTextDocument) SetMarkdown2(markdown string, features QTextDocument_ C.QTextDocument_setMarkdown2(this.h, markdown_ms, (C.int)(features)) } -func (this *QTextDocument) Find22(subString string, from int) *QTextCursor { +func (this *QTextDocument) Find4(subString string, from int) *QTextCursor { 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)) - _goptr := newQTextCursor(C.QTextDocument_find22(this.h, subString_ms, (C.int)(from))) + _goptr := newQTextCursor(C.QTextDocument_find4(this.h, subString_ms, (C.int)(from))) _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 { +func (this *QTextDocument) Find5(subString string, from int, options QTextDocument__FindFlag) *QTextCursor { 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)) - _goptr := newQTextCursor(C.QTextDocument_find32(this.h, subString_ms, (C.int)(from), (C.int)(options))) + _goptr := newQTextCursor(C.QTextDocument_find5(this.h, subString_ms, (C.int)(from), (C.int)(options))) _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 { +func (this *QTextDocument) Find6(subString string, cursor *QTextCursor, options QTextDocument__FindFlag) *QTextCursor { 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)) - _goptr := newQTextCursor(C.QTextDocument_find33(this.h, subString_ms, cursor.cPointer(), (C.int)(options))) + _goptr := newQTextCursor(C.QTextDocument_find6(this.h, subString_ms, cursor.cPointer(), (C.int)(options))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocument) Find23(expr *QRegularExpression, from int) *QTextCursor { - _goptr := newQTextCursor(C.QTextDocument_find23(this.h, expr.cPointer(), (C.int)(from))) +func (this *QTextDocument) Find7(expr *QRegularExpression, from int) *QTextCursor { + _goptr := newQTextCursor(C.QTextDocument_find7(this.h, expr.cPointer(), (C.int)(from))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocument) Find34(expr *QRegularExpression, from int, options QTextDocument__FindFlag) *QTextCursor { - _goptr := newQTextCursor(C.QTextDocument_find34(this.h, expr.cPointer(), (C.int)(from), (C.int)(options))) +func (this *QTextDocument) Find8(expr *QRegularExpression, from int, options QTextDocument__FindFlag) *QTextCursor { + _goptr := newQTextCursor(C.QTextDocument_find8(this.h, expr.cPointer(), (C.int)(from), (C.int)(options))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocument) Find35(expr *QRegularExpression, cursor *QTextCursor, options QTextDocument__FindFlag) *QTextCursor { - _goptr := newQTextCursor(C.QTextDocument_find35(this.h, expr.cPointer(), cursor.cPointer(), (C.int)(options))) +func (this *QTextDocument) Find9(expr *QRegularExpression, cursor *QTextCursor, options QTextDocument__FindFlag) *QTextCursor { + _goptr := newQTextCursor(C.QTextDocument_find9(this.h, expr.cPointer(), cursor.cPointer(), (C.int)(options))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -932,12 +932,12 @@ func (this *QTextDocument) DrawContents2(painter *QPainter, rect *QRectF) { C.QTextDocument_drawContents2(this.h, painter.cPointer(), rect.cPointer()) } -func (this *QTextDocument) ClearUndoRedoStacks1(historyToClear QTextDocument__Stacks) { - C.QTextDocument_clearUndoRedoStacks1(this.h, (C.int)(historyToClear)) +func (this *QTextDocument) ClearUndoRedoStacksWithHistoryToClear(historyToClear QTextDocument__Stacks) { + C.QTextDocument_clearUndoRedoStacksWithHistoryToClear(this.h, (C.int)(historyToClear)) } -func (this *QTextDocument) SetModified1(m bool) { - C.QTextDocument_setModified1(this.h, (C.bool)(m)) +func (this *QTextDocument) SetModifiedWithBool(m bool) { + C.QTextDocument_setModifiedWithBool(this.h, (C.bool)(m)) } // Sender can only be called from a QTextDocument that was directly constructed. diff --git a/qt6/gen_qtextdocument.h b/qt6/gen_qtextdocument.h index 83da2027..5c6387a2 100644 --- a/qt6/gen_qtextdocument.h +++ b/qt6/gen_qtextdocument.h @@ -191,18 +191,18 @@ QTextObject* QTextDocument_createObject(QTextDocument* self, QTextFormat* f); QVariant* QTextDocument_loadResource(QTextDocument* self, int type, QUrl* name); struct miqt_string QTextDocument_tr2(const char* s, const char* c); struct miqt_string QTextDocument_tr3(const char* s, const char* c, int n); -QTextDocument* QTextDocument_clone1(const QTextDocument* self, QObject* parent); -struct miqt_string QTextDocument_toMarkdown1(const QTextDocument* self, int features); +QTextDocument* QTextDocument_cloneWithParent(const QTextDocument* self, QObject* parent); +struct miqt_string QTextDocument_toMarkdownWithFeatures(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, QRegularExpression* expr, int from); -QTextCursor* QTextDocument_find34(const QTextDocument* self, QRegularExpression* expr, int from, int options); -QTextCursor* QTextDocument_find35(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options); +QTextCursor* QTextDocument_find4(const QTextDocument* self, struct miqt_string subString, int from); +QTextCursor* QTextDocument_find5(const QTextDocument* self, struct miqt_string subString, int from, int options); +QTextCursor* QTextDocument_find6(const QTextDocument* self, struct miqt_string subString, QTextCursor* cursor, int options); +QTextCursor* QTextDocument_find7(const QTextDocument* self, QRegularExpression* expr, int from); +QTextCursor* QTextDocument_find8(const QTextDocument* self, QRegularExpression* expr, int from, int options); +QTextCursor* QTextDocument_find9(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options); void QTextDocument_drawContents2(QTextDocument* self, QPainter* painter, QRectF* rect); -void QTextDocument_clearUndoRedoStacks1(QTextDocument* self, int historyToClear); -void QTextDocument_setModified1(QTextDocument* self, bool m); +void QTextDocument_clearUndoRedoStacksWithHistoryToClear(QTextDocument* self, int historyToClear); +void QTextDocument_setModifiedWithBool(QTextDocument* self, bool m); bool QTextDocument_override_virtual_clear(void* self, intptr_t slot); void QTextDocument_virtualbase_clear(void* self); bool QTextDocument_override_virtual_createObject(void* self, intptr_t slot); diff --git a/qt6/gen_qtextdocumentfragment.cpp b/qt6/gen_qtextdocumentfragment.cpp index a3315f7b..af755842 100644 --- a/qt6/gen_qtextdocumentfragment.cpp +++ b/qt6/gen_qtextdocumentfragment.cpp @@ -98,7 +98,7 @@ QTextDocumentFragment* QTextDocumentFragment_fromMarkdown(struct miqt_string mar return new QTextDocumentFragment(QTextDocumentFragment::fromMarkdown(markdown_QString)); } -struct miqt_string QTextDocumentFragment_toMarkdown1(const QTextDocumentFragment* self, int features) { +struct miqt_string QTextDocumentFragment_toMarkdownWithFeatures(const QTextDocumentFragment* 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(); diff --git a/qt6/gen_qtextdocumentfragment.go b/qt6/gen_qtextdocumentfragment.go index b6694076..369a9731 100644 --- a/qt6/gen_qtextdocumentfragment.go +++ b/qt6/gen_qtextdocumentfragment.go @@ -135,8 +135,8 @@ func QTextDocumentFragment_FromMarkdown(markdown string) *QTextDocumentFragment return _goptr } -func (this *QTextDocumentFragment) ToMarkdown1(features QTextDocument__MarkdownFeature) string { - var _ms C.struct_miqt_string = C.QTextDocumentFragment_toMarkdown1(this.h, (C.int)(features)) +func (this *QTextDocumentFragment) ToMarkdownWithFeatures(features QTextDocument__MarkdownFeature) string { + var _ms C.struct_miqt_string = C.QTextDocumentFragment_toMarkdownWithFeatures(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/qt6/gen_qtextdocumentfragment.h b/qt6/gen_qtextdocumentfragment.h index df644860..dc35dc01 100644 --- a/qt6/gen_qtextdocumentfragment.h +++ b/qt6/gen_qtextdocumentfragment.h @@ -37,7 +37,7 @@ struct miqt_string QTextDocumentFragment_toMarkdown(const QTextDocumentFragment* QTextDocumentFragment* QTextDocumentFragment_fromPlainText(struct miqt_string plainText); QTextDocumentFragment* QTextDocumentFragment_fromHtml(struct miqt_string html); QTextDocumentFragment* QTextDocumentFragment_fromMarkdown(struct miqt_string markdown); -struct miqt_string QTextDocumentFragment_toMarkdown1(const QTextDocumentFragment* self, int features); +struct miqt_string QTextDocumentFragment_toMarkdownWithFeatures(const QTextDocumentFragment* self, int features); QTextDocumentFragment* QTextDocumentFragment_fromHtml2(struct miqt_string html, QTextDocument* resourceProvider); QTextDocumentFragment* QTextDocumentFragment_fromMarkdown2(struct miqt_string markdown, int features); void QTextDocumentFragment_delete(QTextDocumentFragment* self); diff --git a/qt6/gen_qtextedit.cpp b/qt6/gen_qtextedit.cpp index c4349093..4df0e9b2 100644 --- a/qt6/gen_qtextedit.cpp +++ b/qt6/gen_qtextedit.cpp @@ -1817,11 +1817,11 @@ bool QTextEdit_find2(QTextEdit* self, struct miqt_string exp, int options) { return self->find(exp_QString, static_cast(options)); } -bool QTextEdit_find22(QTextEdit* self, QRegularExpression* exp, int options) { +bool QTextEdit_find3(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_toMarkdownWithFeatures(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(); @@ -1836,11 +1836,11 @@ void QTextEdit_moveCursor2(QTextEdit* self, int operation, int mode) { self->moveCursor(static_cast(operation), static_cast(mode)); } -void QTextEdit_zoomIn1(QTextEdit* self, int range) { +void QTextEdit_zoomInWithRange(QTextEdit* self, int range) { self->zoomIn(static_cast(range)); } -void QTextEdit_zoomOut1(QTextEdit* self, int range) { +void QTextEdit_zoomOutWithRange(QTextEdit* self, int range) { self->zoomOut(static_cast(range)); } diff --git a/qt6/gen_qtextedit.go b/qt6/gen_qtextedit.go index 9815d00c..282a5ffd 100644 --- a/qt6/gen_qtextedit.go +++ b/qt6/gen_qtextedit.go @@ -743,12 +743,12 @@ func (this *QTextEdit) Find2(exp string, options QTextDocument__FindFlag) bool { return (bool)(C.QTextEdit_find2(this.h, exp_ms, (C.int)(options))) } -func (this *QTextEdit) Find22(exp *QRegularExpression, options QTextDocument__FindFlag) bool { - return (bool)(C.QTextEdit_find22(this.h, exp.cPointer(), (C.int)(options))) +func (this *QTextEdit) Find3(exp *QRegularExpression, options QTextDocument__FindFlag) bool { + return (bool)(C.QTextEdit_find3(this.h, exp.cPointer(), (C.int)(options))) } -func (this *QTextEdit) ToMarkdown1(features QTextDocument__MarkdownFeature) string { - var _ms C.struct_miqt_string = C.QTextEdit_toMarkdown1(this.h, (C.int)(features)) +func (this *QTextEdit) ToMarkdownWithFeatures(features QTextDocument__MarkdownFeature) string { + var _ms C.struct_miqt_string = C.QTextEdit_toMarkdownWithFeatures(this.h, (C.int)(features)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -758,12 +758,12 @@ func (this *QTextEdit) MoveCursor2(operation QTextCursor__MoveOperation, mode QT C.QTextEdit_moveCursor2(this.h, (C.int)(operation), (C.int)(mode)) } -func (this *QTextEdit) ZoomIn1(rangeVal int) { - C.QTextEdit_zoomIn1(this.h, (C.int)(rangeVal)) +func (this *QTextEdit) ZoomInWithRange(rangeVal int) { + C.QTextEdit_zoomInWithRange(this.h, (C.int)(rangeVal)) } -func (this *QTextEdit) ZoomOut1(rangeVal int) { - C.QTextEdit_zoomOut1(this.h, (C.int)(rangeVal)) +func (this *QTextEdit) ZoomOutWithRange(rangeVal int) { + C.QTextEdit_zoomOutWithRange(this.h, (C.int)(rangeVal)) } // ZoomInF can only be called from a QTextEdit that was directly constructed. diff --git a/qt6/gen_qtextedit.h b/qt6/gen_qtextedit.h index 11f96586..c4f4320e 100644 --- a/qt6/gen_qtextedit.h +++ b/qt6/gen_qtextedit.h @@ -262,11 +262,11 @@ void QTextEdit_doSetTextCursor(QTextEdit* self, QTextCursor* cursor); struct miqt_string QTextEdit_tr2(const char* s, const char* c); struct miqt_string QTextEdit_tr3(const char* s, const char* c, int n); bool QTextEdit_find2(QTextEdit* self, struct miqt_string exp, int options); -bool QTextEdit_find22(QTextEdit* self, QRegularExpression* exp, int options); -struct miqt_string QTextEdit_toMarkdown1(const QTextEdit* self, int features); +bool QTextEdit_find3(QTextEdit* self, QRegularExpression* exp, int options); +struct miqt_string QTextEdit_toMarkdownWithFeatures(const QTextEdit* self, int features); void QTextEdit_moveCursor2(QTextEdit* self, int operation, int mode); -void QTextEdit_zoomIn1(QTextEdit* self, int range); -void QTextEdit_zoomOut1(QTextEdit* self, int range); +void QTextEdit_zoomInWithRange(QTextEdit* self, int range); +void QTextEdit_zoomOutWithRange(QTextEdit* self, int range); bool QTextEdit_override_virtual_loadResource(void* self, intptr_t slot); QVariant* QTextEdit_virtualbase_loadResource(void* self, int type, QUrl* name); bool QTextEdit_override_virtual_inputMethodQuery(void* self, intptr_t slot); diff --git a/qt6/gen_qtextlayout.cpp b/qt6/gen_qtextlayout.cpp index 6685b85a..e0285577 100644 --- a/qt6/gen_qtextlayout.cpp +++ b/qt6/gen_qtextlayout.cpp @@ -324,7 +324,7 @@ int QTextLayout_previousCursorPosition2(const QTextLayout* self, int oldPos, int return self->previousCursorPosition(static_cast(oldPos), static_cast(mode)); } -void QTextLayout_draw3(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections) { +void QTextLayout_draw2(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections) { QList selections_QList; selections_QList.reserve(selections.len); QTextLayout__FormatRange** selections_arr = static_cast(selections.data); @@ -334,7 +334,7 @@ void QTextLayout_draw3(const QTextLayout* self, QPainter* p, QPointF* pos, struc self->draw(p, *pos, selections_QList); } -void QTextLayout_draw4(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections, QRectF* clip) { +void QTextLayout_draw3(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections, QRectF* clip) { QList selections_QList; selections_QList.reserve(selections.len); QTextLayout__FormatRange** selections_arr = static_cast(selections.data); @@ -344,7 +344,7 @@ void QTextLayout_draw4(const QTextLayout* self, QPainter* p, QPointF* pos, struc self->draw(p, *pos, selections_QList, *clip); } -struct miqt_array /* of QGlyphRun* */ QTextLayout_glyphRuns1(const QTextLayout* self, int from) { +struct miqt_array /* of QGlyphRun* */ QTextLayout_glyphRunsWithFrom(const QTextLayout* self, int from) { QList _ret = self->glyphRuns(static_cast(from)); // Convert QList<> from C++ memory to manually-managed C memory QGlyphRun** _arr = static_cast(malloc(sizeof(QGlyphRun*) * _ret.length())); @@ -511,7 +511,7 @@ double QTextLine_cursorToX2(const QTextLine* self, int* cursorPos, int edge) { return static_cast(_ret); } -double QTextLine_cursorToX22(const QTextLine* self, int cursorPos, int edge) { +double QTextLine_cursorToX3(const QTextLine* self, int cursorPos, int edge) { qreal _ret = self->cursorToX(static_cast(cursorPos), static_cast(edge)); return static_cast(_ret); } @@ -520,7 +520,7 @@ int QTextLine_xToCursor2(const QTextLine* self, double x, int param2) { return self->xToCursor(static_cast(x), static_cast(param2)); } -struct miqt_array /* of QGlyphRun* */ QTextLine_glyphRuns1(const QTextLine* self, int from) { +struct miqt_array /* of QGlyphRun* */ QTextLine_glyphRunsWithFrom(const QTextLine* self, int from) { QList _ret = self->glyphRuns(static_cast(from)); // Convert QList<> from C++ memory to manually-managed C memory QGlyphRun** _arr = static_cast(malloc(sizeof(QGlyphRun*) * _ret.length())); diff --git a/qt6/gen_qtextlayout.go b/qt6/gen_qtextlayout.go index a9b0da82..96fd0b05 100644 --- a/qt6/gen_qtextlayout.go +++ b/qt6/gen_qtextlayout.go @@ -428,28 +428,28 @@ func (this *QTextLayout) PreviousCursorPosition2(oldPos int, mode QTextLayout__C return (int)(C.QTextLayout_previousCursorPosition2(this.h, (C.int)(oldPos), (C.int)(mode))) } -func (this *QTextLayout) Draw3(p *QPainter, pos *QPointF, selections []QTextLayout__FormatRange) { +func (this *QTextLayout) Draw2(p *QPainter, pos *QPointF, selections []QTextLayout__FormatRange) { selections_CArray := (*[0xffff]*C.QTextLayout__FormatRange)(C.malloc(C.size_t(8 * len(selections)))) defer C.free(unsafe.Pointer(selections_CArray)) for i := range selections { selections_CArray[i] = selections[i].cPointer() } selections_ma := C.struct_miqt_array{len: C.size_t(len(selections)), data: unsafe.Pointer(selections_CArray)} - C.QTextLayout_draw3(this.h, p.cPointer(), pos.cPointer(), selections_ma) + C.QTextLayout_draw2(this.h, p.cPointer(), pos.cPointer(), selections_ma) } -func (this *QTextLayout) Draw4(p *QPainter, pos *QPointF, selections []QTextLayout__FormatRange, clip *QRectF) { +func (this *QTextLayout) Draw3(p *QPainter, pos *QPointF, selections []QTextLayout__FormatRange, clip *QRectF) { selections_CArray := (*[0xffff]*C.QTextLayout__FormatRange)(C.malloc(C.size_t(8 * len(selections)))) defer C.free(unsafe.Pointer(selections_CArray)) for i := range selections { selections_CArray[i] = selections[i].cPointer() } selections_ma := C.struct_miqt_array{len: C.size_t(len(selections)), data: unsafe.Pointer(selections_CArray)} - C.QTextLayout_draw4(this.h, p.cPointer(), pos.cPointer(), selections_ma, clip.cPointer()) + C.QTextLayout_draw3(this.h, p.cPointer(), pos.cPointer(), selections_ma, clip.cPointer()) } -func (this *QTextLayout) GlyphRuns1(from int) []QGlyphRun { - var _ma C.struct_miqt_array = C.QTextLayout_glyphRuns1(this.h, (C.int)(from)) +func (this *QTextLayout) GlyphRunsWithFrom(from int) []QGlyphRun { + var _ma C.struct_miqt_array = C.QTextLayout_glyphRunsWithFrom(this.h, (C.int)(from)) _ret := make([]QGlyphRun, int(_ma.len)) _outCast := (*[0xffff]*C.QGlyphRun)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -650,16 +650,16 @@ func (this *QTextLine) CursorToX2(cursorPos *int, edge QTextLine__Edge) float64 return (float64)(C.QTextLine_cursorToX2(this.h, (*C.int)(unsafe.Pointer(cursorPos)), (C.int)(edge))) } -func (this *QTextLine) CursorToX22(cursorPos int, edge QTextLine__Edge) float64 { - return (float64)(C.QTextLine_cursorToX22(this.h, (C.int)(cursorPos), (C.int)(edge))) +func (this *QTextLine) CursorToX3(cursorPos int, edge QTextLine__Edge) float64 { + return (float64)(C.QTextLine_cursorToX3(this.h, (C.int)(cursorPos), (C.int)(edge))) } func (this *QTextLine) XToCursor2(x float64, param2 QTextLine__CursorPosition) int { return (int)(C.QTextLine_xToCursor2(this.h, (C.double)(x), (C.int)(param2))) } -func (this *QTextLine) GlyphRuns1(from int) []QGlyphRun { - var _ma C.struct_miqt_array = C.QTextLine_glyphRuns1(this.h, (C.int)(from)) +func (this *QTextLine) GlyphRunsWithFrom(from int) []QGlyphRun { + var _ma C.struct_miqt_array = C.QTextLine_glyphRunsWithFrom(this.h, (C.int)(from)) _ret := make([]QGlyphRun, int(_ma.len)) _outCast := (*[0xffff]*C.QGlyphRun)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt6/gen_qtextlayout.h b/qt6/gen_qtextlayout.h index da60bb20..7465ac27 100644 --- a/qt6/gen_qtextlayout.h +++ b/qt6/gen_qtextlayout.h @@ -112,9 +112,9 @@ struct miqt_array /* of QGlyphRun* */ QTextLayout_glyphRuns(const QTextLayout* void QTextLayout_setFlags(QTextLayout* self, int flags); int QTextLayout_nextCursorPosition2(const QTextLayout* self, int oldPos, int mode); int QTextLayout_previousCursorPosition2(const QTextLayout* self, int oldPos, int mode); -void QTextLayout_draw3(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections); -void QTextLayout_draw4(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections, QRectF* clip); -struct miqt_array /* of QGlyphRun* */ QTextLayout_glyphRuns1(const QTextLayout* self, int from); +void QTextLayout_draw2(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections); +void QTextLayout_draw3(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array /* of QTextLayout__FormatRange* */ selections, QRectF* clip); +struct miqt_array /* of QGlyphRun* */ QTextLayout_glyphRunsWithFrom(const QTextLayout* self, int from); struct miqt_array /* of QGlyphRun* */ QTextLayout_glyphRuns2(const QTextLayout* self, int from, int length); void QTextLayout_delete(QTextLayout* self); @@ -147,9 +147,9 @@ int QTextLine_lineNumber(const QTextLine* self); void QTextLine_draw(const QTextLine* self, QPainter* painter, QPointF* position); struct miqt_array /* of QGlyphRun* */ QTextLine_glyphRuns(const QTextLine* self); double QTextLine_cursorToX2(const QTextLine* self, int* cursorPos, int edge); -double QTextLine_cursorToX22(const QTextLine* self, int cursorPos, int edge); +double QTextLine_cursorToX3(const QTextLine* self, int cursorPos, int edge); int QTextLine_xToCursor2(const QTextLine* self, double x, int param2); -struct miqt_array /* of QGlyphRun* */ QTextLine_glyphRuns1(const QTextLine* self, int from); +struct miqt_array /* of QGlyphRun* */ QTextLine_glyphRunsWithFrom(const QTextLine* self, int from); struct miqt_array /* of QGlyphRun* */ QTextLine_glyphRuns2(const QTextLine* self, int from, int length); void QTextLine_delete(QTextLine* self); diff --git a/qt6/gen_qtextobject.cpp b/qt6/gen_qtextobject.cpp index 38cf77a1..d5bf40b0 100644 --- a/qt6/gen_qtextobject.cpp +++ b/qt6/gen_qtextobject.cpp @@ -850,7 +850,7 @@ struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRuns(const QTextFragme return _out; } -struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRuns1(const QTextFragment* self, int from) { +struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRunsWithFrom(const QTextFragment* self, int from) { QList _ret = self->glyphRuns(static_cast(from)); // Convert QList<> from C++ memory to manually-managed C memory QGlyphRun** _arr = static_cast(malloc(sizeof(QGlyphRun*) * _ret.length())); diff --git a/qt6/gen_qtextobject.go b/qt6/gen_qtextobject.go index b3fd3141..46e66cf5 100644 --- a/qt6/gen_qtextobject.go +++ b/qt6/gen_qtextobject.go @@ -1035,8 +1035,8 @@ func (this *QTextFragment) GlyphRuns() []QGlyphRun { return _ret } -func (this *QTextFragment) GlyphRuns1(from int) []QGlyphRun { - var _ma C.struct_miqt_array = C.QTextFragment_glyphRuns1(this.h, (C.int)(from)) +func (this *QTextFragment) GlyphRunsWithFrom(from int) []QGlyphRun { + var _ma C.struct_miqt_array = C.QTextFragment_glyphRunsWithFrom(this.h, (C.int)(from)) _ret := make([]QGlyphRun, int(_ma.len)) _outCast := (*[0xffff]*C.QGlyphRun)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt6/gen_qtextobject.h b/qt6/gen_qtextobject.h index 4a533fbe..b9779df8 100644 --- a/qt6/gen_qtextobject.h +++ b/qt6/gen_qtextobject.h @@ -201,7 +201,7 @@ QTextCharFormat* QTextFragment_charFormat(const QTextFragment* self); int QTextFragment_charFormatIndex(const QTextFragment* self); struct miqt_string QTextFragment_text(const QTextFragment* self); struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRuns(const QTextFragment* self); -struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRuns1(const QTextFragment* self, int from); +struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRunsWithFrom(const QTextFragment* self, int from); struct miqt_array /* of QGlyphRun* */ QTextFragment_glyphRuns2(const QTextFragment* self, int from, int length); void QTextFragment_delete(QTextFragment* self); diff --git a/qt6/gen_qtextstream.cpp b/qt6/gen_qtextstream.cpp index 4b05c98a..82f9b892 100644 --- a/qt6/gen_qtextstream.cpp +++ b/qt6/gen_qtextstream.cpp @@ -234,13 +234,13 @@ QTextStream* QTextStream_operatorShiftRightWithCh(QTextStream* self, char* ch) { return &_ret; } -QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, int16_t* i) { +QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, short* i) { QTextStream& _ret = self->operator>>(static_cast(*i)); // Cast returned reference into pointer return &_ret; } -QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, uint16_t* i) { +QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, unsigned short* i) { QTextStream& _ret = self->operator>>(static_cast(*i)); // Cast returned reference into pointer return &_ret; @@ -326,13 +326,13 @@ QTextStream* QTextStream_operatorShiftLeftWithCh(QTextStream* self, char ch) { return &_ret; } -QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, int16_t i) { +QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, short i) { QTextStream& _ret = self->operator<<(static_cast(i)); // Cast returned reference into pointer return &_ret; } -QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, uint16_t i) { +QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, unsigned short i) { QTextStream& _ret = self->operator<<(static_cast(i)); // Cast returned reference into pointer return &_ret; @@ -412,7 +412,7 @@ QTextStream* QTextStream_operatorShiftLeftWithPtr(QTextStream* self, const void* return &_ret; } -struct miqt_string QTextStream_readLine1(QTextStream* self, long long maxlen) { +struct miqt_string QTextStream_readLineWithMaxlen(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(); diff --git a/qt6/gen_qtextstream.go b/qt6/gen_qtextstream.go index 43c41d5a..57368699 100644 --- a/qt6/gen_qtextstream.go +++ b/qt6/gen_qtextstream.go @@ -296,11 +296,11 @@ func (this *QTextStream) OperatorShiftRightWithCh(ch *int8) *QTextStream { } func (this *QTextStream) OperatorShiftRightWithShort(i *int16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftRightWithShort(this.h, (*C.int16_t)(unsafe.Pointer(i)))) + return newQTextStream(C.QTextStream_operatorShiftRightWithShort(this.h, (*C.short)(unsafe.Pointer(i)))) } func (this *QTextStream) OperatorShiftRightWithUnsignedshort(i *uint16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftRightWithUnsignedshort(this.h, (*C.uint16_t)(unsafe.Pointer(i)))) + return newQTextStream(C.QTextStream_operatorShiftRightWithUnsignedshort(this.h, (*C.ushort)(unsafe.Pointer(i)))) } func (this *QTextStream) OperatorShiftRightWithInt(i *int) *QTextStream { @@ -369,11 +369,11 @@ func (this *QTextStream) OperatorShiftLeftWithCh(ch int8) *QTextStream { } func (this *QTextStream) OperatorShiftLeftWithShort(i int16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftLeftWithShort(this.h, (C.int16_t)(i))) + return newQTextStream(C.QTextStream_operatorShiftLeftWithShort(this.h, (C.short)(i))) } func (this *QTextStream) OperatorShiftLeftWithUnsignedshort(i uint16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftLeftWithUnsignedshort(this.h, (C.uint16_t)(i))) + return newQTextStream(C.QTextStream_operatorShiftLeftWithUnsignedshort(this.h, (C.ushort)(i))) } func (this *QTextStream) OperatorShiftLeftWithInt(i int) *QTextStream { @@ -437,8 +437,8 @@ func (this *QTextStream) OperatorShiftLeftWithPtr(ptr unsafe.Pointer) *QTextStre return newQTextStream(C.QTextStream_operatorShiftLeftWithPtr(this.h, ptr)) } -func (this *QTextStream) ReadLine1(maxlen int64) string { - var _ms C.struct_miqt_string = C.QTextStream_readLine1(this.h, (C.longlong)(maxlen)) +func (this *QTextStream) ReadLineWithMaxlen(maxlen int64) string { + var _ms C.struct_miqt_string = C.QTextStream_readLineWithMaxlen(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/qt6/gen_qtextstream.h b/qt6/gen_qtextstream.h index 57eb36bc..310fb694 100644 --- a/qt6/gen_qtextstream.h +++ b/qt6/gen_qtextstream.h @@ -72,8 +72,8 @@ void QTextStream_setRealNumberPrecision(QTextStream* self, int precision); int QTextStream_realNumberPrecision(const QTextStream* self); QTextStream* QTextStream_operatorShiftRight(QTextStream* self, QChar* ch); QTextStream* QTextStream_operatorShiftRightWithCh(QTextStream* self, char* ch); -QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, int16_t* i); -QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, uint16_t* i); +QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, short* i); +QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, unsigned short* i); QTextStream* QTextStream_operatorShiftRightWithInt(QTextStream* self, int* i); QTextStream* QTextStream_operatorShiftRightWithUnsignedint(QTextStream* self, unsigned int* i); QTextStream* QTextStream_operatorShiftRightWithLong(QTextStream* self, long* i); @@ -87,8 +87,8 @@ QTextStream* QTextStream_operatorShiftRightWithArray(QTextStream* self, struct m QTextStream* QTextStream_operatorShiftRightWithChar(QTextStream* self, char* c); QTextStream* QTextStream_operatorShiftLeft(QTextStream* self, QChar* ch); QTextStream* QTextStream_operatorShiftLeftWithCh(QTextStream* self, char ch); -QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, int16_t i); -QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, uint16_t i); +QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, short i); +QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, unsigned short i); QTextStream* QTextStream_operatorShiftLeftWithInt(QTextStream* self, int i); QTextStream* QTextStream_operatorShiftLeftWithUnsignedint(QTextStream* self, unsigned int i); QTextStream* QTextStream_operatorShiftLeftWithLong(QTextStream* self, long i); @@ -101,7 +101,7 @@ QTextStream* QTextStream_operatorShiftLeftWithQString(QTextStream* self, struct 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_readLineWithMaxlen(QTextStream* self, long long maxlen); void QTextStream_delete(QTextStream* self); #ifdef __cplusplus diff --git a/qt6/gen_qthread.cpp b/qt6/gen_qthread.cpp index 0358a78e..519dddf9 100644 --- a/qt6/gen_qthread.cpp +++ b/qt6/gen_qthread.cpp @@ -355,15 +355,15 @@ struct miqt_string QThread_tr3(const char* s, const char* c, int n) { return _ms; } -void QThread_start1(QThread* self, int param1) { +void QThread_startWithQThreadPriority(QThread* self, int param1) { self->start(static_cast(param1)); } -void QThread_exit1(QThread* self, int retcode) { +void QThread_exitWithRetcode(QThread* self, int retcode) { self->exit(static_cast(retcode)); } -bool QThread_wait1(QThread* self, QDeadlineTimer* deadline) { +bool QThread_waitWithDeadline(QThread* self, QDeadlineTimer* deadline) { return self->wait(*deadline); } diff --git a/qt6/gen_qthread.go b/qt6/gen_qthread.go index 7346166e..c65a96a3 100644 --- a/qt6/gen_qthread.go +++ b/qt6/gen_qthread.go @@ -216,16 +216,16 @@ func QThread_Tr3(s string, c string, n int) string { return _ret } -func (this *QThread) Start1(param1 QThread__Priority) { - C.QThread_start1(this.h, (C.int)(param1)) +func (this *QThread) StartWithQThreadPriority(param1 QThread__Priority) { + C.QThread_startWithQThreadPriority(this.h, (C.int)(param1)) } -func (this *QThread) Exit1(retcode int) { - C.QThread_exit1(this.h, (C.int)(retcode)) +func (this *QThread) ExitWithRetcode(retcode int) { + C.QThread_exitWithRetcode(this.h, (C.int)(retcode)) } -func (this *QThread) Wait1(deadline QDeadlineTimer) bool { - return (bool)(C.QThread_wait1(this.h, deadline.cPointer())) +func (this *QThread) WaitWithDeadline(deadline QDeadlineTimer) bool { + return (bool)(C.QThread_waitWithDeadline(this.h, deadline.cPointer())) } // Exec can only be called from a QThread that was directly constructed. diff --git a/qt6/gen_qthread.h b/qt6/gen_qthread.h index afa3cb68..c4cafb1c 100644 --- a/qt6/gen_qthread.h +++ b/qt6/gen_qthread.h @@ -70,9 +70,9 @@ void QThread_usleep(unsigned long param1); void QThread_run(QThread* self); struct miqt_string QThread_tr2(const char* s, const char* c); struct miqt_string QThread_tr3(const char* s, const char* c, int n); -void QThread_start1(QThread* self, int param1); -void QThread_exit1(QThread* self, int retcode); -bool QThread_wait1(QThread* self, QDeadlineTimer* deadline); +void QThread_startWithQThreadPriority(QThread* self, int param1); +void QThread_exitWithRetcode(QThread* self, int retcode); +bool QThread_waitWithDeadline(QThread* self, QDeadlineTimer* deadline); bool QThread_override_virtual_event(void* self, intptr_t slot); bool QThread_virtualbase_event(void* self, QEvent* event); bool QThread_override_virtual_run(void* self, intptr_t slot); diff --git a/qt6/gen_qthreadpool.cpp b/qt6/gen_qthreadpool.cpp index ce94fb46..fb070145 100644 --- a/qt6/gen_qthreadpool.cpp +++ b/qt6/gen_qthreadpool.cpp @@ -314,7 +314,7 @@ void QThreadPool_start2(QThreadPool* self, QRunnable* runnable, int priority) { self->start(runnable, static_cast(priority)); } -bool QThreadPool_waitForDone1(QThreadPool* self, int msecs) { +bool QThreadPool_waitForDoneWithMsecs(QThreadPool* self, int msecs) { return self->waitForDone(static_cast(msecs)); } diff --git a/qt6/gen_qthreadpool.go b/qt6/gen_qthreadpool.go index f0cf469e..bac45dda 100644 --- a/qt6/gen_qthreadpool.go +++ b/qt6/gen_qthreadpool.go @@ -183,8 +183,8 @@ func (this *QThreadPool) Start2(runnable *QRunnable, priority int) { C.QThreadPool_start2(this.h, runnable.cPointer(), (C.int)(priority)) } -func (this *QThreadPool) WaitForDone1(msecs int) bool { - return (bool)(C.QThreadPool_waitForDone1(this.h, (C.int)(msecs))) +func (this *QThreadPool) WaitForDoneWithMsecs(msecs int) bool { + return (bool)(C.QThreadPool_waitForDoneWithMsecs(this.h, (C.int)(msecs))) } // Sender can only be called from a QThreadPool that was directly constructed. diff --git a/qt6/gen_qthreadpool.h b/qt6/gen_qthreadpool.h index 754a4620..84bb756e 100644 --- a/qt6/gen_qthreadpool.h +++ b/qt6/gen_qthreadpool.h @@ -64,7 +64,7 @@ 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); void QThreadPool_start2(QThreadPool* self, QRunnable* runnable, int priority); -bool QThreadPool_waitForDone1(QThreadPool* self, int msecs); +bool QThreadPool_waitForDoneWithMsecs(QThreadPool* self, int msecs); bool QThreadPool_override_virtual_event(void* self, intptr_t slot); bool QThreadPool_virtualbase_event(void* self, QEvent* event); bool QThreadPool_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt6/gen_qtimezone.cpp b/qt6/gen_qtimezone.cpp index 63c2e76f..69e60b83 100644 --- a/qt6/gen_qtimezone.cpp +++ b/qt6/gen_qtimezone.cpp @@ -42,14 +42,14 @@ QTimeZone* QTimeZone_new5(QTimeZone* other) { return new QTimeZone(*other); } -QTimeZone* QTimeZone_new6(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, uint16_t territory) { +QTimeZone* QTimeZone_new6(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, unsigned short territory) { 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(territory)); } -QTimeZone* QTimeZone_new7(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, uint16_t territory, struct miqt_string comment) { +QTimeZone* QTimeZone_new7(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, unsigned short territory, 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); @@ -78,14 +78,14 @@ struct miqt_string QTimeZone_id(const QTimeZone* self) { return _ms; } -uint16_t QTimeZone_territory(const QTimeZone* self) { +unsigned short QTimeZone_territory(const QTimeZone* self) { QLocale::Territory _ret = self->territory(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QTimeZone_country(const QTimeZone* self) { +unsigned short QTimeZone_country(const QTimeZone* self) { QLocale::Country _ret = self->country(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string QTimeZone_comment(const QTimeZone* self) { @@ -221,7 +221,7 @@ struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIds() return _out; } -struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIdsWithTerritory(uint16_t territory) { +struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIdsWithTerritory(unsigned short territory) { QList _ret = QTimeZone::availableTimeZoneIds(static_cast(territory)); // Convert QList<> from C++ memory to manually-managed C memory struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); @@ -277,7 +277,7 @@ struct miqt_string QTimeZone_windowsIdToDefaultIanaId(struct miqt_string windows return _ms; } -struct miqt_string QTimeZone_windowsIdToDefaultIanaId2(struct miqt_string windowsId, uint16_t territory) { +struct miqt_string QTimeZone_windowsIdToDefaultIanaId2(struct miqt_string windowsId, unsigned short territory) { QByteArray windowsId_QByteArray(windowsId.data, windowsId.len); QByteArray _qb = QTimeZone::windowsIdToDefaultIanaId(windowsId_QByteArray, static_cast(territory)); struct miqt_string _ms; @@ -306,7 +306,7 @@ struct miqt_array /* of struct miqt_string */ QTimeZone_windowsIdToIanaIds(stru return _out; } -struct miqt_array /* of struct miqt_string */ QTimeZone_windowsIdToIanaIds2(struct miqt_string windowsId, uint16_t territory) { +struct miqt_array /* of struct miqt_string */ QTimeZone_windowsIdToIanaIds2(struct miqt_string windowsId, unsigned short territory) { QByteArray windowsId_QByteArray(windowsId.data, windowsId.len); QList _ret = QTimeZone::windowsIdToIanaIds(windowsId_QByteArray, static_cast(territory)); // Convert QList<> from C++ memory to manually-managed C memory @@ -347,7 +347,7 @@ struct miqt_string QTimeZone_displayName3(const QTimeZone* self, QDateTime* atDa return _ms; } -struct miqt_string QTimeZone_displayName22(const QTimeZone* self, int timeType, int nameType) { +struct miqt_string QTimeZone_displayName4(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(); @@ -358,7 +358,7 @@ struct miqt_string QTimeZone_displayName22(const QTimeZone* self, int timeType, return _ms; } -struct miqt_string QTimeZone_displayName32(const QTimeZone* self, int timeType, int nameType, QLocale* locale) { +struct miqt_string QTimeZone_displayName5(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(); diff --git a/qt6/gen_qtimezone.go b/qt6/gen_qtimezone.go index fa35a82f..c10a94a2 100644 --- a/qt6/gen_qtimezone.go +++ b/qt6/gen_qtimezone.go @@ -139,7 +139,7 @@ func NewQTimeZone6(zoneId []byte, offsetSeconds int, name string, abbreviation s abbreviation_ms.len = C.size_t(len(abbreviation)) defer C.free(unsafe.Pointer(abbreviation_ms.data)) - return newQTimeZone(C.QTimeZone_new6(zoneId_alias, (C.int)(offsetSeconds), name_ms, abbreviation_ms, (C.uint16_t)(territory))) + return newQTimeZone(C.QTimeZone_new6(zoneId_alias, (C.int)(offsetSeconds), name_ms, abbreviation_ms, (C.ushort)(territory))) } // NewQTimeZone7 constructs a new QTimeZone object. @@ -164,7 +164,7 @@ func NewQTimeZone7(zoneId []byte, offsetSeconds int, name string, abbreviation s comment_ms.len = C.size_t(len(comment)) defer C.free(unsafe.Pointer(comment_ms.data)) - return newQTimeZone(C.QTimeZone_new7(zoneId_alias, (C.int)(offsetSeconds), name_ms, abbreviation_ms, (C.uint16_t)(territory), comment_ms)) + return newQTimeZone(C.QTimeZone_new7(zoneId_alias, (C.int)(offsetSeconds), name_ms, abbreviation_ms, (C.ushort)(territory), comment_ms)) } func (this *QTimeZone) OperatorAssign(other *QTimeZone) { @@ -320,7 +320,7 @@ func QTimeZone_AvailableTimeZoneIds() [][]byte { } func QTimeZone_AvailableTimeZoneIdsWithTerritory(territory QLocale__Country) [][]byte { - var _ma C.struct_miqt_array = C.QTimeZone_availableTimeZoneIdsWithTerritory((C.uint16_t)(territory)) + var _ma C.struct_miqt_array = C.QTimeZone_availableTimeZoneIdsWithTerritory((C.ushort)(territory)) _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++ { @@ -381,7 +381,7 @@ func QTimeZone_WindowsIdToDefaultIanaId2(windowsId []byte, territory QLocale__Co windowsId_alias.data = (*C.char)(unsafe.Pointer(nil)) } windowsId_alias.len = C.size_t(len(windowsId)) - var _bytearray C.struct_miqt_string = C.QTimeZone_windowsIdToDefaultIanaId2(windowsId_alias, (C.uint16_t)(territory)) + var _bytearray C.struct_miqt_string = C.QTimeZone_windowsIdToDefaultIanaId2(windowsId_alias, (C.ushort)(territory)) _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) C.free(unsafe.Pointer(_bytearray.data)) return _ret @@ -415,7 +415,7 @@ func QTimeZone_WindowsIdToIanaIds2(windowsId []byte, territory QLocale__Country) windowsId_alias.data = (*C.char)(unsafe.Pointer(nil)) } windowsId_alias.len = C.size_t(len(windowsId)) - var _ma C.struct_miqt_array = C.QTimeZone_windowsIdToIanaIds2(windowsId_alias, (C.uint16_t)(territory)) + var _ma C.struct_miqt_array = C.QTimeZone_windowsIdToIanaIds2(windowsId_alias, (C.ushort)(territory)) _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++ { @@ -441,15 +441,15 @@ func (this *QTimeZone) DisplayName3(atDateTime *QDateTime, nameType QTimeZone__N 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)) +func (this *QTimeZone) DisplayName4(timeType QTimeZone__TimeType, nameType QTimeZone__NameType) string { + var _ms C.struct_miqt_string = C.QTimeZone_displayName4(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()) +func (this *QTimeZone) DisplayName5(timeType QTimeZone__TimeType, nameType QTimeZone__NameType, locale *QLocale) string { + var _ms C.struct_miqt_string = C.QTimeZone_displayName5(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/qt6/gen_qtimezone.h b/qt6/gen_qtimezone.h index 7a764ef8..f6953353 100644 --- a/qt6/gen_qtimezone.h +++ b/qt6/gen_qtimezone.h @@ -35,14 +35,14 @@ QTimeZone* QTimeZone_new2(struct miqt_string ianaId); QTimeZone* QTimeZone_new3(int offsetSeconds); 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(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, uint16_t territory); -QTimeZone* QTimeZone_new7(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, uint16_t territory, struct miqt_string comment); +QTimeZone* QTimeZone_new6(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, unsigned short territory); +QTimeZone* QTimeZone_new7(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, unsigned short territory, struct miqt_string comment); void QTimeZone_operatorAssign(QTimeZone* self, QTimeZone* other); void QTimeZone_swap(QTimeZone* self, QTimeZone* other); bool QTimeZone_isValid(const QTimeZone* self); struct miqt_string QTimeZone_id(const QTimeZone* self); -uint16_t QTimeZone_territory(const QTimeZone* self); -uint16_t QTimeZone_country(const QTimeZone* self); +unsigned short QTimeZone_territory(const QTimeZone* self); +unsigned short 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); @@ -62,17 +62,17 @@ QTimeZone* QTimeZone_systemTimeZone(); QTimeZone* QTimeZone_utc(); bool QTimeZone_isTimeZoneIdAvailable(struct miqt_string ianaId); struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIds(); -struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIdsWithTerritory(uint16_t territory); +struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIdsWithTerritory(unsigned short territory); struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIdsWithOffsetSeconds(int offsetSeconds); 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, uint16_t territory); +struct miqt_string QTimeZone_windowsIdToDefaultIanaId2(struct miqt_string windowsId, unsigned short territory); struct miqt_array /* of struct miqt_string */ QTimeZone_windowsIdToIanaIds(struct miqt_string windowsId); -struct miqt_array /* of struct miqt_string */ QTimeZone_windowsIdToIanaIds2(struct miqt_string windowsId, uint16_t territory); +struct miqt_array /* of struct miqt_string */ QTimeZone_windowsIdToIanaIds2(struct miqt_string windowsId, unsigned short territory); 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_displayName4(const QTimeZone* self, int timeType, int nameType); +struct miqt_string QTimeZone_displayName5(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/qt6/gen_qtooltip.cpp b/qt6/gen_qtooltip.cpp index 8e0b5d49..0b6ed46e 100644 --- a/qt6/gen_qtooltip.cpp +++ b/qt6/gen_qtooltip.cpp @@ -58,17 +58,17 @@ void QToolTip_setFont(QFont* font) { QToolTip::setFont(*font); } -void QToolTip_showText3(QPoint* pos, struct miqt_string text, QWidget* w) { +void QToolTip_showText2(QPoint* pos, struct miqt_string text, QWidget* w) { QString text_QString = QString::fromUtf8(text.data, text.len); QToolTip::showText(*pos, text_QString, w); } -void QToolTip_showText4(QPoint* pos, struct miqt_string text, QWidget* w, QRect* rect) { +void QToolTip_showText3(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_showText5(QPoint* pos, struct miqt_string text, QWidget* w, QRect* rect, int msecShowTime) { +void QToolTip_showText4(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)); } diff --git a/qt6/gen_qtooltip.go b/qt6/gen_qtooltip.go index 8a950b34..29bb55f1 100644 --- a/qt6/gen_qtooltip.go +++ b/qt6/gen_qtooltip.go @@ -88,28 +88,28 @@ func QToolTip_SetFont(font *QFont) { C.QToolTip_setFont(font.cPointer()) } -func QToolTip_ShowText3(pos *QPoint, text string, w *QWidget) { +func QToolTip_ShowText2(pos *QPoint, text string, w *QWidget) { text_ms := C.struct_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()) + C.QToolTip_showText2(pos.cPointer(), text_ms, w.cPointer()) } -func QToolTip_ShowText4(pos *QPoint, text string, w *QWidget, rect *QRect) { +func QToolTip_ShowText3(pos *QPoint, text string, w *QWidget, rect *QRect) { text_ms := C.struct_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_showText4(pos.cPointer(), text_ms, w.cPointer(), rect.cPointer()) + C.QToolTip_showText3(pos.cPointer(), text_ms, w.cPointer(), rect.cPointer()) } -func QToolTip_ShowText5(pos *QPoint, text string, w *QWidget, rect *QRect, msecShowTime int) { +func QToolTip_ShowText4(pos *QPoint, text string, w *QWidget, rect *QRect, msecShowTime int) { text_ms := C.struct_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_showText5(pos.cPointer(), text_ms, w.cPointer(), rect.cPointer(), (C.int)(msecShowTime)) + C.QToolTip_showText4(pos.cPointer(), text_ms, w.cPointer(), rect.cPointer(), (C.int)(msecShowTime)) } // Delete this object from C++ memory. diff --git a/qt6/gen_qtooltip.h b/qt6/gen_qtooltip.h index 7d868fe6..062e607d 100644 --- a/qt6/gen_qtooltip.h +++ b/qt6/gen_qtooltip.h @@ -38,9 +38,9 @@ QPalette* QToolTip_palette(); void QToolTip_setPalette(QPalette* palette); QFont* QToolTip_font(); void QToolTip_setFont(QFont* font); -void QToolTip_showText3(QPoint* pos, struct miqt_string text, QWidget* w); -void QToolTip_showText4(QPoint* pos, struct miqt_string text, QWidget* w, QRect* rect); -void QToolTip_showText5(QPoint* pos, struct miqt_string text, QWidget* w, QRect* rect, int msecShowTime); +void QToolTip_showText2(QPoint* pos, struct miqt_string text, QWidget* w); +void QToolTip_showText3(QPoint* pos, struct miqt_string text, QWidget* w, QRect* rect); +void QToolTip_showText4(QPoint* pos, struct miqt_string text, QWidget* w, QRect* rect, int msecShowTime); void QToolTip_delete(QToolTip* self); #ifdef __cplusplus diff --git a/qt6/gen_qtransform.cpp b/qt6/gen_qtransform.cpp index b5fe605f..0505d588 100644 --- a/qt6/gen_qtransform.cpp +++ b/qt6/gen_qtransform.cpp @@ -276,7 +276,7 @@ QTransform* QTransform_fromScale(double dx, double dy) { return new QTransform(QTransform::fromScale(static_cast(dx), static_cast(dy))); } -QTransform* QTransform_inverted1(const QTransform* self, bool* invertible) { +QTransform* QTransform_invertedWithInvertible(const QTransform* self, bool* invertible) { return new QTransform(self->inverted(invertible)); } diff --git a/qt6/gen_qtransform.go b/qt6/gen_qtransform.go index f987d754..19bdbc1d 100644 --- a/qt6/gen_qtransform.go +++ b/qt6/gen_qtransform.go @@ -320,8 +320,8 @@ func QTransform_FromScale(dx float64, dy float64) *QTransform { return _goptr } -func (this *QTransform) Inverted1(invertible *bool) *QTransform { - _goptr := newQTransform(C.QTransform_inverted1(this.h, (*C.bool)(unsafe.Pointer(invertible)))) +func (this *QTransform) InvertedWithInvertible(invertible *bool) *QTransform { + _goptr := newQTransform(C.QTransform_invertedWithInvertible(this.h, (*C.bool)(unsafe.Pointer(invertible)))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qtransform.h b/qt6/gen_qtransform.h index 7bacbdab..88be0879 100644 --- a/qt6/gen_qtransform.h +++ b/qt6/gen_qtransform.h @@ -94,7 +94,7 @@ QTransform* QTransform_operatorPlusAssign(QTransform* self, double div); QTransform* QTransform_operatorMinusAssign(QTransform* self, double div); QTransform* QTransform_fromTranslate(double dx, double dy); QTransform* QTransform_fromScale(double dx, double dy); -QTransform* QTransform_inverted1(const QTransform* self, bool* invertible); +QTransform* QTransform_invertedWithInvertible(const QTransform* self, bool* invertible); QTransform* QTransform_rotate2(QTransform* self, double a, int axis); QTransform* QTransform_rotateRadians2(QTransform* self, double a, int axis); void QTransform_delete(QTransform* self); diff --git a/qt6/gen_qtranslator.cpp b/qt6/gen_qtranslator.cpp index 9c2dd9f9..2ec6e132 100644 --- a/qt6/gen_qtranslator.cpp +++ b/qt6/gen_qtranslator.cpp @@ -323,20 +323,20 @@ struct miqt_string QTranslator_tr3(const char* s, const char* c, int n) { return _ms; } -bool QTranslator_load22(QTranslator* self, struct miqt_string filename, struct miqt_string directory) { +bool QTranslator_load4(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) { +bool QTranslator_load5(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) { +bool QTranslator_load6(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); @@ -344,20 +344,20 @@ bool QTranslator_load4(QTranslator* self, struct miqt_string filename, struct mi 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) { +bool QTranslator_load7(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) { +bool QTranslator_load8(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) { +bool QTranslator_load9(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); @@ -365,7 +365,7 @@ bool QTranslator_load5(QTranslator* self, QLocale* locale, struct miqt_string fi return self->load(*locale, filename_QString, prefix_QString, directory_QString, suffix_QString); } -bool QTranslator_load34(QTranslator* self, const unsigned char* data, int len, struct miqt_string directory) { +bool QTranslator_load10(QTranslator* self, const unsigned char* data, int len, struct miqt_string directory) { QString directory_QString = QString::fromUtf8(directory.data, directory.len); return self->load(static_cast(data), static_cast(len), directory_QString); } diff --git a/qt6/gen_qtranslator.go b/qt6/gen_qtranslator.go index 4166b51e..ad14c71d 100644 --- a/qt6/gen_qtranslator.go +++ b/qt6/gen_qtranslator.go @@ -154,7 +154,7 @@ func QTranslator_Tr3(s string, c string, n int) string { return _ret } -func (this *QTranslator) Load22(filename string, directory string) bool { +func (this *QTranslator) Load4(filename string, directory string) bool { filename_ms := C.struct_miqt_string{} filename_ms.data = C.CString(filename) filename_ms.len = C.size_t(len(filename)) @@ -163,10 +163,10 @@ func (this *QTranslator) Load22(filename string, directory string) bool { 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)) + return (bool)(C.QTranslator_load4(this.h, filename_ms, directory_ms)) } -func (this *QTranslator) Load32(filename string, directory string, search_delimiters string) bool { +func (this *QTranslator) Load5(filename string, directory string, search_delimiters string) bool { filename_ms := C.struct_miqt_string{} filename_ms.data = C.CString(filename) filename_ms.len = C.size_t(len(filename)) @@ -179,10 +179,10 @@ func (this *QTranslator) Load32(filename string, directory string, search_delimi 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)) + return (bool)(C.QTranslator_load5(this.h, filename_ms, directory_ms, search_delimiters_ms)) } -func (this *QTranslator) Load4(filename string, directory string, search_delimiters string, suffix string) bool { +func (this *QTranslator) Load6(filename string, directory string, search_delimiters string, suffix string) bool { filename_ms := C.struct_miqt_string{} filename_ms.data = C.CString(filename) filename_ms.len = C.size_t(len(filename)) @@ -199,10 +199,10 @@ func (this *QTranslator) Load4(filename string, directory string, search_delimit 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)) + return (bool)(C.QTranslator_load6(this.h, filename_ms, directory_ms, search_delimiters_ms, suffix_ms)) } -func (this *QTranslator) Load33(locale *QLocale, filename string, prefix string) bool { +func (this *QTranslator) Load7(locale *QLocale, filename string, prefix string) bool { filename_ms := C.struct_miqt_string{} filename_ms.data = C.CString(filename) filename_ms.len = C.size_t(len(filename)) @@ -211,10 +211,10 @@ func (this *QTranslator) Load33(locale *QLocale, filename string, prefix 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)) + return (bool)(C.QTranslator_load7(this.h, locale.cPointer(), filename_ms, prefix_ms)) } -func (this *QTranslator) Load42(locale *QLocale, filename string, prefix string, directory string) bool { +func (this *QTranslator) Load8(locale *QLocale, filename string, prefix string, directory string) bool { filename_ms := C.struct_miqt_string{} filename_ms.data = C.CString(filename) filename_ms.len = C.size_t(len(filename)) @@ -227,10 +227,10 @@ func (this *QTranslator) Load42(locale *QLocale, filename string, prefix 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)) + return (bool)(C.QTranslator_load8(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 { +func (this *QTranslator) Load9(locale *QLocale, filename string, prefix string, directory string, suffix string) bool { filename_ms := C.struct_miqt_string{} filename_ms.data = C.CString(filename) filename_ms.len = C.size_t(len(filename)) @@ -247,15 +247,15 @@ func (this *QTranslator) Load5(locale *QLocale, filename string, prefix 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)) + return (bool)(C.QTranslator_load9(this.h, locale.cPointer(), filename_ms, prefix_ms, directory_ms, suffix_ms)) } -func (this *QTranslator) Load34(data *byte, lenVal int, directory string) bool { +func (this *QTranslator) Load10(data *byte, lenVal int, directory string) bool { 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)) + return (bool)(C.QTranslator_load10(this.h, (*C.uchar)(unsafe.Pointer(data)), (C.int)(lenVal), directory_ms)) } // Sender can only be called from a QTranslator that was directly constructed. diff --git a/qt6/gen_qtranslator.h b/qt6/gen_qtranslator.h index 27a77103..ab58723b 100644 --- a/qt6/gen_qtranslator.h +++ b/qt6/gen_qtranslator.h @@ -49,13 +49,13 @@ bool QTranslator_load2(QTranslator* self, QLocale* locale, struct miqt_string fi bool QTranslator_load3(QTranslator* self, const unsigned char* data, int len); struct miqt_string QTranslator_tr2(const char* s, const char* c); struct miqt_string QTranslator_tr3(const char* s, const char* c, 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 len, struct miqt_string directory); +bool QTranslator_load4(QTranslator* self, struct miqt_string filename, struct miqt_string directory); +bool QTranslator_load5(QTranslator* self, struct miqt_string filename, struct miqt_string directory, struct miqt_string search_delimiters); +bool QTranslator_load6(QTranslator* self, struct miqt_string filename, struct miqt_string directory, struct miqt_string search_delimiters, struct miqt_string suffix); +bool QTranslator_load7(QTranslator* self, QLocale* locale, struct miqt_string filename, struct miqt_string prefix); +bool QTranslator_load8(QTranslator* self, QLocale* locale, struct miqt_string filename, struct miqt_string prefix, struct miqt_string directory); +bool QTranslator_load9(QTranslator* self, QLocale* locale, struct miqt_string filename, struct miqt_string prefix, struct miqt_string directory, struct miqt_string suffix); +bool QTranslator_load10(QTranslator* self, const unsigned char* data, int len, struct miqt_string directory); bool QTranslator_override_virtual_translate(void* self, intptr_t slot); struct miqt_string QTranslator_virtualbase_translate(const void* self, const char* context, const char* sourceText, const char* disambiguation, int n); bool QTranslator_override_virtual_isEmpty(void* self, intptr_t slot); diff --git a/qt6/gen_qtransposeproxymodel.cpp b/qt6/gen_qtransposeproxymodel.cpp index 0d7edbdb..9606ea86 100644 --- a/qt6/gen_qtransposeproxymodel.cpp +++ b/qt6/gen_qtransposeproxymodel.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/qt6/gen_qtreewidget.cpp b/qt6/gen_qtreewidget.cpp index e4f70ce7..a0683159 100644 --- a/qt6/gen_qtreewidget.cpp +++ b/qt6/gen_qtreewidget.cpp @@ -3184,7 +3184,7 @@ bool QTreeWidget_isPersistentEditorOpen2(const QTreeWidget* self, QTreeWidgetIte return self->isPersistentEditorOpen(item, static_cast(column)); } -struct miqt_array /* of QTreeWidgetItem* */ QTreeWidget_findItems3(const QTreeWidget* self, struct miqt_string text, int flags, int column) { +struct miqt_array /* of QTreeWidgetItem* */ QTreeWidget_findItems2(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 diff --git a/qt6/gen_qtreewidget.go b/qt6/gen_qtreewidget.go index 303e45f8..00885abd 100644 --- a/qt6/gen_qtreewidget.go +++ b/qt6/gen_qtreewidget.go @@ -1248,12 +1248,12 @@ func (this *QTreeWidget) IsPersistentEditorOpen2(item *QTreeWidgetItem, column i return (bool)(C.QTreeWidget_isPersistentEditorOpen2(this.h, item.cPointer(), (C.int)(column))) } -func (this *QTreeWidget) FindItems3(text string, flags MatchFlag, column int) []*QTreeWidgetItem { +func (this *QTreeWidget) FindItems2(text string, flags MatchFlag, column int) []*QTreeWidgetItem { text_ms := C.struct_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)) + var _ma C.struct_miqt_array = C.QTreeWidget_findItems2(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/qt6/gen_qtreewidget.h b/qt6/gen_qtreewidget.h index bf5495ee..5a02b45a 100644 --- a/qt6/gen_qtreewidget.h +++ b/qt6/gen_qtreewidget.h @@ -295,7 +295,7 @@ 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 /* of QTreeWidgetItem* */ QTreeWidget_findItems3(const QTreeWidget* self, struct miqt_string text, int flags, int column); +struct miqt_array /* of QTreeWidgetItem* */ QTreeWidget_findItems2(const QTreeWidget* self, struct miqt_string text, int flags, int column); QModelIndex* QTreeWidget_indexFromItem2(const QTreeWidget* self, QTreeWidgetItem* item, int column); void QTreeWidget_scrollToItem2(QTreeWidget* self, QTreeWidgetItem* item, int hint); bool QTreeWidget_override_virtual_setSelectionModel(void* self, intptr_t slot); diff --git a/qt6/gen_qundostack.cpp b/qt6/gen_qundostack.cpp index 9a577f10..27eda2c0 100644 --- a/qt6/gen_qundostack.cpp +++ b/qt6/gen_qundostack.cpp @@ -684,7 +684,7 @@ QAction* QUndoStack_createRedoAction2(const QUndoStack* self, QObject* parent, s return self->createRedoAction(parent, prefix_QString); } -void QUndoStack_setActive1(QUndoStack* self, bool active) { +void QUndoStack_setActiveWithActive(QUndoStack* self, bool active) { self->setActive(active); } diff --git a/qt6/gen_qundostack.go b/qt6/gen_qundostack.go index 4832fd1d..668fe184 100644 --- a/qt6/gen_qundostack.go +++ b/qt6/gen_qundostack.go @@ -597,8 +597,8 @@ func (this *QUndoStack) CreateRedoAction2(parent *QObject, prefix string) *QActi return newQAction(C.QUndoStack_createRedoAction2(this.h, parent.cPointer(), prefix_ms)) } -func (this *QUndoStack) SetActive1(active bool) { - C.QUndoStack_setActive1(this.h, (C.bool)(active)) +func (this *QUndoStack) SetActiveWithActive(active bool) { + C.QUndoStack_setActiveWithActive(this.h, (C.bool)(active)) } // Sender can only be called from a QUndoStack that was directly constructed. diff --git a/qt6/gen_qundostack.h b/qt6/gen_qundostack.h index 769cf97f..5514dcef 100644 --- a/qt6/gen_qundostack.h +++ b/qt6/gen_qundostack.h @@ -108,7 +108,7 @@ struct miqt_string QUndoStack_tr2(const char* s, const char* c); struct miqt_string QUndoStack_tr3(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_setActiveWithActive(QUndoStack* self, bool active); bool QUndoStack_override_virtual_event(void* self, intptr_t slot); bool QUndoStack_virtualbase_event(void* self, QEvent* event); bool QUndoStack_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt6/gen_qurl.cpp b/qt6/gen_qurl.cpp index 315cc34b..95d9848b 100644 --- a/qt6/gen_qurl.cpp +++ b/qt6/gen_qurl.cpp @@ -502,7 +502,7 @@ void QUrl_setAuthority2(QUrl* self, struct miqt_string authority, int mode) { self->setAuthority(authority_QString, static_cast(mode)); } -struct miqt_string QUrl_authority1(const QUrl* self, unsigned int options) { +struct miqt_string QUrl_authorityWithOptions(const QUrl* self, unsigned 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(); @@ -518,7 +518,7 @@ void QUrl_setUserInfo2(QUrl* self, struct miqt_string userInfo, int mode) { self->setUserInfo(userInfo_QString, static_cast(mode)); } -struct miqt_string QUrl_userInfo1(const QUrl* self, unsigned int options) { +struct miqt_string QUrl_userInfoWithOptions(const QUrl* self, unsigned 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(); @@ -534,7 +534,7 @@ void QUrl_setUserName2(QUrl* self, struct miqt_string userName, int mode) { self->setUserName(userName_QString, static_cast(mode)); } -struct miqt_string QUrl_userName1(const QUrl* self, unsigned int options) { +struct miqt_string QUrl_userNameWithOptions(const QUrl* self, unsigned 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(); @@ -550,7 +550,7 @@ void QUrl_setPassword2(QUrl* self, struct miqt_string password, int mode) { self->setPassword(password_QString, static_cast(mode)); } -struct miqt_string QUrl_password1(const QUrl* self, unsigned int param1) { +struct miqt_string QUrl_passwordWithQUrlComponentFormattingOptions(const QUrl* self, unsigned 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(); @@ -566,7 +566,7 @@ void QUrl_setHost2(QUrl* self, struct miqt_string host, int mode) { self->setHost(host_QString, static_cast(mode)); } -struct miqt_string QUrl_host1(const QUrl* self, unsigned int param1) { +struct miqt_string QUrl_hostWithQUrlComponentFormattingOptions(const QUrl* self, unsigned 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(); @@ -577,7 +577,7 @@ struct miqt_string QUrl_host1(const QUrl* self, unsigned int param1) { return _ms; } -int QUrl_port1(const QUrl* self, int defaultPort) { +int QUrl_portWithDefaultPort(const QUrl* self, int defaultPort) { return self->port(static_cast(defaultPort)); } @@ -586,7 +586,7 @@ void QUrl_setPath2(QUrl* self, struct miqt_string path, int mode) { self->setPath(path_QString, static_cast(mode)); } -struct miqt_string QUrl_path1(const QUrl* self, unsigned int options) { +struct miqt_string QUrl_pathWithOptions(const QUrl* self, unsigned 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(); @@ -597,7 +597,7 @@ struct miqt_string QUrl_path1(const QUrl* self, unsigned int options) { return _ms; } -struct miqt_string QUrl_fileName1(const QUrl* self, unsigned int options) { +struct miqt_string QUrl_fileNameWithOptions(const QUrl* self, unsigned 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(); @@ -613,7 +613,7 @@ void QUrl_setQuery2(QUrl* self, struct miqt_string query, int mode) { self->setQuery(query_QString, static_cast(mode)); } -struct miqt_string QUrl_query1(const QUrl* self, unsigned int param1) { +struct miqt_string QUrl_queryWithQUrlComponentFormattingOptions(const QUrl* self, unsigned 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(); @@ -624,7 +624,7 @@ struct miqt_string QUrl_query1(const QUrl* self, unsigned int param1) { return _ms; } -struct miqt_string QUrl_fragment1(const QUrl* self, unsigned int options) { +struct miqt_string QUrl_fragmentWithOptions(const QUrl* self, unsigned 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(); diff --git a/qt6/gen_qurl.go b/qt6/gen_qurl.go index 4ed63bf2..c80d32ee 100644 --- a/qt6/gen_qurl.go +++ b/qt6/gen_qurl.go @@ -616,8 +616,8 @@ func (this *QUrl) SetAuthority2(authority string, mode QUrl__ParsingMode) { 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.uint)(options)) +func (this *QUrl) AuthorityWithOptions(options QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_authorityWithOptions(this.h, (C.uint)(options)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -631,8 +631,8 @@ func (this *QUrl) SetUserInfo2(userInfo string, mode QUrl__ParsingMode) { 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.uint)(options)) +func (this *QUrl) UserInfoWithOptions(options QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_userInfoWithOptions(this.h, (C.uint)(options)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -646,8 +646,8 @@ func (this *QUrl) SetUserName2(userName string, mode QUrl__ParsingMode) { 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.uint)(options)) +func (this *QUrl) UserNameWithOptions(options QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_userNameWithOptions(this.h, (C.uint)(options)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -661,8 +661,8 @@ func (this *QUrl) SetPassword2(password string, mode QUrl__ParsingMode) { 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.uint)(param1)) +func (this *QUrl) PasswordWithQUrlComponentFormattingOptions(param1 QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_passwordWithQUrlComponentFormattingOptions(this.h, (C.uint)(param1)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -676,15 +676,15 @@ func (this *QUrl) SetHost2(host string, mode QUrl__ParsingMode) { 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.uint)(param1)) +func (this *QUrl) HostWithQUrlComponentFormattingOptions(param1 QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_hostWithQUrlComponentFormattingOptions(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 *QUrl) Port1(defaultPort int) int { - return (int)(C.QUrl_port1(this.h, (C.int)(defaultPort))) +func (this *QUrl) PortWithDefaultPort(defaultPort int) int { + return (int)(C.QUrl_portWithDefaultPort(this.h, (C.int)(defaultPort))) } func (this *QUrl) SetPath2(path string, mode QUrl__ParsingMode) { @@ -695,15 +695,15 @@ func (this *QUrl) SetPath2(path string, mode QUrl__ParsingMode) { 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.uint)(options)) +func (this *QUrl) PathWithOptions(options QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_pathWithOptions(this.h, (C.uint)(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.uint)(options)) +func (this *QUrl) FileNameWithOptions(options QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_fileNameWithOptions(this.h, (C.uint)(options)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -717,15 +717,15 @@ func (this *QUrl) SetQuery2(query string, mode QUrl__ParsingMode) { 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.uint)(param1)) +func (this *QUrl) QueryWithQUrlComponentFormattingOptions(param1 QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_queryWithQUrlComponentFormattingOptions(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 *QUrl) Fragment1(options QUrl__ComponentFormattingOption) string { - var _ms C.struct_miqt_string = C.QUrl_fragment1(this.h, (C.uint)(options)) +func (this *QUrl) FragmentWithOptions(options QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrl_fragmentWithOptions(this.h, (C.uint)(options)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret diff --git a/qt6/gen_qurl.h b/qt6/gen_qurl.h index 69b3a8d7..fe1d4c35 100644 --- a/qt6/gen_qurl.h +++ b/qt6/gen_qurl.h @@ -88,22 +88,22 @@ QUrl* QUrl_fromEncoded2(struct miqt_string url, int mode); QUrl* QUrl_fromUserInput2(struct miqt_string userInput, struct miqt_string workingDirectory); 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, unsigned int options); +struct miqt_string QUrl_authorityWithOptions(const QUrl* self, unsigned int options); void QUrl_setUserInfo2(QUrl* self, struct miqt_string userInfo, int mode); -struct miqt_string QUrl_userInfo1(const QUrl* self, unsigned int options); +struct miqt_string QUrl_userInfoWithOptions(const QUrl* self, unsigned int options); void QUrl_setUserName2(QUrl* self, struct miqt_string userName, int mode); -struct miqt_string QUrl_userName1(const QUrl* self, unsigned int options); +struct miqt_string QUrl_userNameWithOptions(const QUrl* self, unsigned int options); void QUrl_setPassword2(QUrl* self, struct miqt_string password, int mode); -struct miqt_string QUrl_password1(const QUrl* self, unsigned int param1); +struct miqt_string QUrl_passwordWithQUrlComponentFormattingOptions(const QUrl* self, unsigned int param1); void QUrl_setHost2(QUrl* self, struct miqt_string host, int mode); -struct miqt_string QUrl_host1(const QUrl* self, unsigned int param1); -int QUrl_port1(const QUrl* self, int defaultPort); +struct miqt_string QUrl_hostWithQUrlComponentFormattingOptions(const QUrl* self, unsigned int param1); +int QUrl_portWithDefaultPort(const QUrl* self, int defaultPort); void QUrl_setPath2(QUrl* self, struct miqt_string path, int mode); -struct miqt_string QUrl_path1(const QUrl* self, unsigned int options); -struct miqt_string QUrl_fileName1(const QUrl* self, unsigned int options); +struct miqt_string QUrl_pathWithOptions(const QUrl* self, unsigned int options); +struct miqt_string QUrl_fileNameWithOptions(const QUrl* self, unsigned int options); void QUrl_setQuery2(QUrl* self, struct miqt_string query, int mode); -struct miqt_string QUrl_query1(const QUrl* self, unsigned int param1); -struct miqt_string QUrl_fragment1(const QUrl* self, unsigned int options); +struct miqt_string QUrl_queryWithQUrlComponentFormattingOptions(const QUrl* self, unsigned int param1); +struct miqt_string QUrl_fragmentWithOptions(const QUrl* self, unsigned 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); diff --git a/qt6/gen_qurlquery.cpp b/qt6/gen_qurlquery.cpp index 69e71ea6..2b491ec5 100644 --- a/qt6/gen_qurlquery.cpp +++ b/qt6/gen_qurlquery.cpp @@ -209,7 +209,7 @@ void QUrlQuery_removeAllQueryItems(QUrlQuery* self, struct miqt_string key) { self->removeAllQueryItems(key_QString); } -struct miqt_string QUrlQuery_query1(const QUrlQuery* self, unsigned int encoding) { +struct miqt_string QUrlQuery_queryWithEncoding(const QUrlQuery* self, unsigned 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(); @@ -220,7 +220,7 @@ struct miqt_string QUrlQuery_query1(const QUrlQuery* self, unsigned int encoding return _ms; } -struct miqt_string QUrlQuery_toString1(const QUrlQuery* self, unsigned int encoding) { +struct miqt_string QUrlQuery_toStringWithEncoding(const QUrlQuery* self, unsigned 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(); @@ -231,7 +231,7 @@ struct miqt_string QUrlQuery_toString1(const QUrlQuery* self, unsigned int encod return _ms; } -struct miqt_array /* of struct miqt_map tuple of struct miqt_string and struct miqt_string */ QUrlQuery_queryItems1(const QUrlQuery* self, unsigned int encoding) { +struct miqt_array /* of struct miqt_map tuple of struct miqt_string and struct miqt_string */ QUrlQuery_queryItemsWithEncoding(const QUrlQuery* self, unsigned int encoding) { QList> _ret = self->queryItems(static_cast(encoding)); // Convert QList<> from C++ memory to manually-managed C memory struct miqt_map /* tuple of struct miqt_string and struct miqt_string */ * _arr = static_cast(malloc(sizeof(struct miqt_map /* tuple of struct miqt_string and struct miqt_string */ ) * _ret.length())); diff --git a/qt6/gen_qurlquery.go b/qt6/gen_qurlquery.go index a90820d7..e6e39a57 100644 --- a/qt6/gen_qurlquery.go +++ b/qt6/gen_qurlquery.go @@ -265,25 +265,25 @@ func (this *QUrlQuery) RemoveAllQueryItems(key string) { C.QUrlQuery_removeAllQueryItems(this.h, key_ms) } -func (this *QUrlQuery) Query1(encoding QUrl__ComponentFormattingOption) string { - var _ms C.struct_miqt_string = C.QUrlQuery_query1(this.h, (C.uint)(encoding)) +func (this *QUrlQuery) QueryWithEncoding(encoding QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrlQuery_queryWithEncoding(this.h, (C.uint)(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.uint)(encoding)) +func (this *QUrlQuery) ToStringWithEncoding(encoding QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QUrlQuery_toStringWithEncoding(this.h, (C.uint)(encoding)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } -func (this *QUrlQuery) QueryItems1(encoding QUrl__ComponentFormattingOption) []struct { +func (this *QUrlQuery) QueryItemsWithEncoding(encoding QUrl__ComponentFormattingOption) []struct { First string Second string } { - var _ma C.struct_miqt_array = C.QUrlQuery_queryItems1(this.h, (C.uint)(encoding)) + var _ma C.struct_miqt_array = C.QUrlQuery_queryItemsWithEncoding(this.h, (C.uint)(encoding)) _ret := make([]struct { First string Second string diff --git a/qt6/gen_qurlquery.h b/qt6/gen_qurlquery.h index 69553dc1..d9aa75ba 100644 --- a/qt6/gen_qurlquery.h +++ b/qt6/gen_qurlquery.h @@ -49,9 +49,9 @@ void QUrlQuery_removeQueryItem(QUrlQuery* self, struct miqt_string key); struct miqt_string QUrlQuery_queryItemValue(const QUrlQuery* self, struct miqt_string key); struct miqt_array /* of struct miqt_string */ QUrlQuery_allQueryItemValues(const QUrlQuery* self, struct miqt_string key); void QUrlQuery_removeAllQueryItems(QUrlQuery* self, struct miqt_string key); -struct miqt_string QUrlQuery_query1(const QUrlQuery* self, unsigned int encoding); -struct miqt_string QUrlQuery_toString1(const QUrlQuery* self, unsigned int encoding); -struct miqt_array /* of struct miqt_map tuple of struct miqt_string and struct miqt_string */ QUrlQuery_queryItems1(const QUrlQuery* self, unsigned int encoding); +struct miqt_string QUrlQuery_queryWithEncoding(const QUrlQuery* self, unsigned int encoding); +struct miqt_string QUrlQuery_toStringWithEncoding(const QUrlQuery* self, unsigned int encoding); +struct miqt_array /* of struct miqt_map tuple of struct miqt_string and struct miqt_string */ QUrlQuery_queryItemsWithEncoding(const QUrlQuery* self, unsigned int encoding); struct miqt_string QUrlQuery_queryItemValue2(const QUrlQuery* self, struct miqt_string key, unsigned int encoding); struct miqt_array /* of struct miqt_string */ QUrlQuery_allQueryItemValues2(const QUrlQuery* self, struct miqt_string key, unsigned int encoding); void QUrlQuery_delete(QUrlQuery* self); diff --git a/qt6/gen_quuid.cpp b/qt6/gen_quuid.cpp index 4e40a55b..203f73d2 100644 --- a/qt6/gen_quuid.cpp +++ b/qt6/gen_quuid.cpp @@ -20,7 +20,7 @@ QUuid* QUuid_new() { return new QUuid(); } -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_new2(unsigned int l, unsigned short w1, unsigned short 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) { 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)); } @@ -123,7 +123,7 @@ int QUuid_version(const QUuid* self) { return static_cast(_ret); } -struct miqt_string QUuid_toString1(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(); @@ -134,7 +134,7 @@ struct miqt_string QUuid_toString1(const QUuid* self, int mode) { return _ms; } -struct miqt_string QUuid_toByteArray1(const QUuid* self, int 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(); diff --git a/qt6/gen_quuid.go b/qt6/gen_quuid.go index 2d3ff989..cf5b215f 100644 --- a/qt6/gen_quuid.go +++ b/qt6/gen_quuid.go @@ -84,7 +84,7 @@ func NewQUuid() *QUuid { // NewQUuid2 constructs a new QUuid object. func NewQUuid2(l uint, w1 uint16, w2 uint16, b1 byte, b2 byte, b3 byte, b4 byte, b5 byte, b6 byte, b7 byte, b8 byte) *QUuid { - return newQUuid(C.QUuid_new2((C.uint)(l), (C.uint16_t)(w1), (C.uint16_t)(w2), (C.uchar)(b1), (C.uchar)(b2), (C.uchar)(b3), (C.uchar)(b4), (C.uchar)(b5), (C.uchar)(b6), (C.uchar)(b7), (C.uchar)(b8))) + return newQUuid(C.QUuid_new2((C.uint)(l), (C.ushort)(w1), (C.ushort)(w2), (C.uchar)(b1), (C.uchar)(b2), (C.uchar)(b3), (C.uchar)(b4), (C.uchar)(b5), (C.uchar)(b6), (C.uchar)(b7), (C.uchar)(b8))) } // NewQUuid3 constructs a new QUuid object. @@ -212,15 +212,15 @@ func (this *QUuid) Version() QUuid__Version { return (QUuid__Version)(C.QUuid_version(this.h)) } -func (this *QUuid) ToString1(mode QUuid__StringFormat) string { - var _ms C.struct_miqt_string = C.QUuid_toString1(this.h, (C.int)(mode)) +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.data)) return _ret } -func (this *QUuid) ToByteArray1(mode QUuid__StringFormat) []byte { - var _bytearray C.struct_miqt_string = C.QUuid_toByteArray1(this.h, (C.int)(mode)) +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 diff --git a/qt6/gen_quuid.h b/qt6/gen_quuid.h index 762127b6..1d530df5 100644 --- a/qt6/gen_quuid.h +++ b/qt6/gen_quuid.h @@ -25,7 +25,7 @@ typedef struct QUuid QUuid; #endif 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_new2(unsigned int l, unsigned short w1, unsigned short 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(QAnyStringView* string); QUuid* QUuid_new4(QUuid* param1); QUuid* QUuid_fromString(QAnyStringView* string); @@ -45,8 +45,8 @@ 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); -struct miqt_string QUuid_toString1(const QUuid* self, int mode); -struct miqt_string QUuid_toByteArray1(const QUuid* self, int mode); +struct miqt_string QUuid_toStringWithMode(const QUuid* self, int mode); +struct miqt_string QUuid_toByteArrayWithMode(const QUuid* self, int mode); void QUuid_delete(QUuid* self); #ifdef __cplusplus diff --git a/qt6/gen_qvariant.cpp b/qt6/gen_qvariant.cpp index f981c16b..a16d1a42 100644 --- a/qt6/gen_qvariant.cpp +++ b/qt6/gen_qvariant.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -236,6 +237,16 @@ QVariant* QVariant_new42(QMetaType* type, const void* copy) { return new QVariant(*type, copy); } +QVariant* QVariant_new43(struct miqt_array /* of QVariant* */ list) { + QList list_QList; + list_QList.reserve(list.len); + QVariant** list_arr = static_cast(list.data); + for(size_t i = 0; i < list.len; ++i) { + list_QList.push_back(*(list_arr[i])); + } + return new QVariant(list_QList); +} + void QVariant_operatorAssign(QVariant* self, QVariant* other) { self->operator=(*other); } @@ -396,6 +407,19 @@ QDateTime* QVariant_toDateTime(const QVariant* self) { return new QDateTime(self->toDateTime()); } +struct miqt_array /* of QVariant* */ QVariant_toList(const QVariant* self) { + QList _ret = self->toList(); + // Convert QList<> from C++ memory to manually-managed C memory + QVariant** _arr = static_cast(malloc(sizeof(QVariant*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = new QVariant(_ret[i]); + } + struct miqt_array _out; + _out.len = _ret.length(); + _out.data = static_cast(_arr); + return _out; +} + struct miqt_map /* of struct miqt_string to QVariant* */ QVariant_toMap(const QVariant* self) { QMap _ret = self->toMap(); // Convert QMap<> from C++ memory to manually-managed C memory @@ -564,34 +588,34 @@ QPartialOrdering* QVariant_compare(QVariant* lhs, QVariant* rhs) { return new QPartialOrdering(QVariant::compare(*lhs, *rhs)); } -int QVariant_toInt1(const QVariant* self, bool* ok) { +int QVariant_toIntWithOk(const QVariant* self, bool* ok) { return self->toInt(ok); } -unsigned int QVariant_toUInt1(const QVariant* self, bool* ok) { +unsigned int QVariant_toUIntWithOk(const QVariant* self, bool* ok) { uint _ret = self->toUInt(ok); return static_cast(_ret); } -long long QVariant_toLongLong1(const QVariant* self, bool* ok) { +long long QVariant_toLongLongWithOk(const QVariant* self, bool* ok) { qlonglong _ret = self->toLongLong(ok); return static_cast(_ret); } -unsigned long long QVariant_toULongLong1(const QVariant* self, bool* ok) { +unsigned long long QVariant_toULongLongWithOk(const QVariant* self, bool* ok) { qulonglong _ret = self->toULongLong(ok); return static_cast(_ret); } -double QVariant_toDouble1(const QVariant* self, bool* ok) { +double QVariant_toDoubleWithOk(const QVariant* self, bool* ok) { return self->toDouble(ok); } -float QVariant_toFloat1(const QVariant* self, bool* ok) { +float QVariant_toFloatWithOk(const QVariant* self, bool* ok) { return self->toFloat(ok); } -double QVariant_toReal1(const QVariant* self, bool* ok) { +double QVariant_toRealWithOk(const QVariant* self, bool* ok) { qreal _ret = self->toReal(ok); return static_cast(_ret); } diff --git a/qt6/gen_qvariant.go b/qt6/gen_qvariant.go index 39858818..bbb885c7 100644 --- a/qt6/gen_qvariant.go +++ b/qt6/gen_qvariant.go @@ -422,6 +422,18 @@ func NewQVariant42(typeVal QMetaType, copyVal unsafe.Pointer) *QVariant { return newQVariant(C.QVariant_new42(typeVal.cPointer(), copyVal)) } +// NewQVariant43 constructs a new QVariant object. +func NewQVariant43(list []QVariant) *QVariant { + list_CArray := (*[0xffff]*C.QVariant)(C.malloc(C.size_t(8 * len(list)))) + defer C.free(unsafe.Pointer(list_CArray)) + for i := range list { + list_CArray[i] = list[i].cPointer() + } + list_ma := C.struct_miqt_array{len: C.size_t(len(list)), data: unsafe.Pointer(list_CArray)} + + return newQVariant(C.QVariant_new43(list_ma)) +} + func (this *QVariant) OperatorAssign(other *QVariant) { C.QVariant_operatorAssign(this.h, other.cPointer()) } @@ -578,6 +590,18 @@ func (this *QVariant) ToDateTime() *QDateTime { return _goptr } +func (this *QVariant) ToList() []QVariant { + var _ma C.struct_miqt_array = C.QVariant_toList(this.h) + _ret := make([]QVariant, int(_ma.len)) + _outCast := (*[0xffff]*C.QVariant)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _lv_goptr := newQVariant(_outCast[i]) + _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + _ret[i] = *_lv_goptr + } + return _ret +} + func (this *QVariant) ToMap() map[string]QVariant { var _mm C.struct_miqt_map = C.QVariant_toMap(this.h) _ret := make(map[string]QVariant, int(_mm.len)) @@ -775,32 +799,32 @@ func QVariant_Compare(lhs *QVariant, rhs *QVariant) *QPartialOrdering { return _goptr } -func (this *QVariant) ToInt1(ok *bool) int { - return (int)(C.QVariant_toInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToIntWithOk(ok *bool) int { + return (int)(C.QVariant_toIntWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QVariant) ToUInt1(ok *bool) uint { - return (uint)(C.QVariant_toUInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToUIntWithOk(ok *bool) uint { + return (uint)(C.QVariant_toUIntWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QVariant) ToLongLong1(ok *bool) int64 { - return (int64)(C.QVariant_toLongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToLongLongWithOk(ok *bool) int64 { + return (int64)(C.QVariant_toLongLongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QVariant) ToULongLong1(ok *bool) uint64 { - return (uint64)(C.QVariant_toULongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToULongLongWithOk(ok *bool) uint64 { + return (uint64)(C.QVariant_toULongLongWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QVariant) ToDouble1(ok *bool) float64 { - return (float64)(C.QVariant_toDouble1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToDoubleWithOk(ok *bool) float64 { + return (float64)(C.QVariant_toDoubleWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QVariant) ToFloat1(ok *bool) float32 { - return (float32)(C.QVariant_toFloat1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToFloatWithOk(ok *bool) float32 { + return (float32)(C.QVariant_toFloatWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QVariant) ToReal1(ok *bool) float64 { - return (float64)(C.QVariant_toReal1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QVariant) ToRealWithOk(ok *bool) float64 { + return (float64)(C.QVariant_toRealWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } // Delete this object from C++ memory. diff --git a/qt6/gen_qvariant.h b/qt6/gen_qvariant.h index f272a226..69d822bb 100644 --- a/qt6/gen_qvariant.h +++ b/qt6/gen_qvariant.h @@ -118,6 +118,7 @@ QVariant* QVariant_new39(QModelIndex* modelIndex); QVariant* QVariant_new40(QPersistentModelIndex* modelIndex); QVariant* QVariant_new41(int type); QVariant* QVariant_new42(QMetaType* type, const void* copy); +QVariant* QVariant_new43(struct miqt_array /* of QVariant* */ list); void QVariant_operatorAssign(QVariant* self, QVariant* other); void QVariant_swap(QVariant* self, QVariant* other); int QVariant_userType(const QVariant* self); @@ -150,6 +151,7 @@ QChar* QVariant_toChar(const QVariant* self); QDate* QVariant_toDate(const QVariant* self); QTime* QVariant_toTime(const QVariant* self); QDateTime* QVariant_toDateTime(const QVariant* self); +struct miqt_array /* of QVariant* */ QVariant_toList(const QVariant* self); struct miqt_map /* of struct miqt_string to QVariant* */ QVariant_toMap(const QVariant* self); struct miqt_map /* of struct miqt_string to QVariant* */ QVariant_toHash(const QVariant* self); QPoint* QVariant_toPoint(const QVariant* self); @@ -181,13 +183,13 @@ const void* QVariant_constData(const QVariant* self); const void* QVariant_data2(const QVariant* self); void QVariant_setValue(QVariant* self, QVariant* avalue); QPartialOrdering* QVariant_compare(QVariant* lhs, QVariant* rhs); -int QVariant_toInt1(const QVariant* self, bool* ok); -unsigned int QVariant_toUInt1(const QVariant* self, bool* ok); -long long QVariant_toLongLong1(const QVariant* self, bool* ok); -unsigned long long QVariant_toULongLong1(const QVariant* self, bool* ok); -double QVariant_toDouble1(const QVariant* self, bool* ok); -float QVariant_toFloat1(const QVariant* self, bool* ok); -double QVariant_toReal1(const QVariant* self, bool* ok); +int QVariant_toIntWithOk(const QVariant* self, bool* ok); +unsigned int QVariant_toUIntWithOk(const QVariant* self, bool* ok); +long long QVariant_toLongLongWithOk(const QVariant* self, bool* ok); +unsigned long long QVariant_toULongLongWithOk(const QVariant* self, bool* ok); +double QVariant_toDoubleWithOk(const QVariant* self, bool* ok); +float QVariant_toFloatWithOk(const QVariant* self, bool* ok); +double QVariant_toRealWithOk(const QVariant* self, bool* ok); void QVariant_delete(QVariant* self); QVariantConstPointer* QVariantConstPointer_new(QVariant* variant); diff --git a/qt6/gen_qwaitcondition.cpp b/qt6/gen_qwaitcondition.cpp index 5030bd83..69da00a0 100644 --- a/qt6/gen_qwaitcondition.cpp +++ b/qt6/gen_qwaitcondition.cpp @@ -49,11 +49,11 @@ void QWaitCondition_notifyAll(QWaitCondition* self) { self->notify_all(); } -bool QWaitCondition_wait22(QWaitCondition* self, QMutex* lockedMutex, QDeadlineTimer* deadline) { +bool QWaitCondition_wait4(QWaitCondition* self, QMutex* lockedMutex, QDeadlineTimer* deadline) { return self->wait(lockedMutex, *deadline); } -bool QWaitCondition_wait23(QWaitCondition* self, QReadWriteLock* lockedReadWriteLock, QDeadlineTimer* deadline) { +bool QWaitCondition_wait5(QWaitCondition* self, QReadWriteLock* lockedReadWriteLock, QDeadlineTimer* deadline) { return self->wait(lockedReadWriteLock, *deadline); } diff --git a/qt6/gen_qwaitcondition.go b/qt6/gen_qwaitcondition.go index add73f5b..61a535f2 100644 --- a/qt6/gen_qwaitcondition.go +++ b/qt6/gen_qwaitcondition.go @@ -83,12 +83,12 @@ func (this *QWaitCondition) NotifyAll() { C.QWaitCondition_notifyAll(this.h) } -func (this *QWaitCondition) Wait22(lockedMutex *QMutex, deadline QDeadlineTimer) bool { - return (bool)(C.QWaitCondition_wait22(this.h, lockedMutex.cPointer(), deadline.cPointer())) +func (this *QWaitCondition) Wait4(lockedMutex *QMutex, deadline QDeadlineTimer) bool { + return (bool)(C.QWaitCondition_wait4(this.h, lockedMutex.cPointer(), deadline.cPointer())) } -func (this *QWaitCondition) Wait23(lockedReadWriteLock *QReadWriteLock, deadline QDeadlineTimer) bool { - return (bool)(C.QWaitCondition_wait23(this.h, lockedReadWriteLock.cPointer(), deadline.cPointer())) +func (this *QWaitCondition) Wait5(lockedReadWriteLock *QReadWriteLock, deadline QDeadlineTimer) bool { + return (bool)(C.QWaitCondition_wait5(this.h, lockedReadWriteLock.cPointer(), deadline.cPointer())) } // Delete this object from C++ memory. diff --git a/qt6/gen_qwaitcondition.h b/qt6/gen_qwaitcondition.h index bfe6394f..95cac95c 100644 --- a/qt6/gen_qwaitcondition.h +++ b/qt6/gen_qwaitcondition.h @@ -35,8 +35,8 @@ void QWaitCondition_wakeOne(QWaitCondition* self); void QWaitCondition_wakeAll(QWaitCondition* self); void QWaitCondition_notifyOne(QWaitCondition* self); void QWaitCondition_notifyAll(QWaitCondition* self); -bool QWaitCondition_wait22(QWaitCondition* self, QMutex* lockedMutex, QDeadlineTimer* deadline); -bool QWaitCondition_wait23(QWaitCondition* self, QReadWriteLock* lockedReadWriteLock, QDeadlineTimer* deadline); +bool QWaitCondition_wait4(QWaitCondition* self, QMutex* lockedMutex, QDeadlineTimer* deadline); +bool QWaitCondition_wait5(QWaitCondition* self, QReadWriteLock* lockedReadWriteLock, QDeadlineTimer* deadline); void QWaitCondition_delete(QWaitCondition* self); #ifdef __cplusplus diff --git a/qt6/gen_qwhatsthis.cpp b/qt6/gen_qwhatsthis.cpp index 74ec8b9c..7678805a 100644 --- a/qt6/gen_qwhatsthis.cpp +++ b/qt6/gen_qwhatsthis.cpp @@ -42,12 +42,12 @@ QAction* QWhatsThis_createAction() { return QWhatsThis::createAction(); } -void QWhatsThis_showText3(QPoint* pos, struct miqt_string text, QWidget* w) { +void QWhatsThis_showText2(QPoint* pos, struct miqt_string text, QWidget* w) { QString text_QString = QString::fromUtf8(text.data, text.len); QWhatsThis::showText(*pos, text_QString, w); } -QAction* QWhatsThis_createAction1(QObject* parent) { +QAction* QWhatsThis_createActionWithParent(QObject* parent) { return QWhatsThis::createAction(parent); } diff --git a/qt6/gen_qwhatsthis.go b/qt6/gen_qwhatsthis.go index be202eb2..0a650db7 100644 --- a/qt6/gen_qwhatsthis.go +++ b/qt6/gen_qwhatsthis.go @@ -73,16 +73,16 @@ func QWhatsThis_CreateAction() *QAction { return newQAction(C.QWhatsThis_createAction()) } -func QWhatsThis_ShowText3(pos *QPoint, text string, w *QWidget) { +func QWhatsThis_ShowText2(pos *QPoint, text string, w *QWidget) { text_ms := C.struct_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()) + C.QWhatsThis_showText2(pos.cPointer(), text_ms, w.cPointer()) } -func QWhatsThis_CreateAction1(parent *QObject) *QAction { - return newQAction(C.QWhatsThis_createAction1(parent.cPointer())) +func QWhatsThis_CreateActionWithParent(parent *QObject) *QAction { + return newQAction(C.QWhatsThis_createActionWithParent(parent.cPointer())) } // Delete this object from C++ memory. diff --git a/qt6/gen_qwhatsthis.h b/qt6/gen_qwhatsthis.h index 7604122e..fe1765a1 100644 --- a/qt6/gen_qwhatsthis.h +++ b/qt6/gen_qwhatsthis.h @@ -34,8 +34,8 @@ void QWhatsThis_leaveWhatsThisMode(); 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); -QAction* QWhatsThis_createAction1(QObject* parent); +void QWhatsThis_showText2(QPoint* pos, struct miqt_string text, QWidget* w); +QAction* QWhatsThis_createActionWithParent(QObject* parent); void QWhatsThis_delete(QWhatsThis* self); #ifdef __cplusplus diff --git a/qt6/gen_qwidget.cpp b/qt6/gen_qwidget.cpp index 3e1ddc74..de8a2766 100644 --- a/qt6/gen_qwidget.cpp +++ b/qt6/gen_qwidget.cpp @@ -1036,11 +1036,11 @@ public: friend void QWidget_protectedbase_destroy(bool* _dynamic_cast_ok, void* self); friend bool QWidget_protectedbase_focusNextChild(bool* _dynamic_cast_ok, void* self); friend bool QWidget_protectedbase_focusPreviousChild(bool* _dynamic_cast_ok, void* self); - friend void QWidget_protectedbase_updateMicroFocus1(bool* _dynamic_cast_ok, void* self, int query); - friend void QWidget_protectedbase_create1(bool* _dynamic_cast_ok, void* self, uintptr_t param1); + friend void QWidget_protectedbase_updateMicroFocusWithQuery(bool* _dynamic_cast_ok, void* self, int query); + friend void QWidget_protectedbase_createWithWId(bool* _dynamic_cast_ok, void* self, uintptr_t param1); friend void QWidget_protectedbase_create2(bool* _dynamic_cast_ok, void* self, uintptr_t param1, bool initializeWindow); friend void QWidget_protectedbase_create3(bool* _dynamic_cast_ok, void* self, uintptr_t param1, bool initializeWindow, bool destroyOldWindow); - friend void QWidget_protectedbase_destroy1(bool* _dynamic_cast_ok, void* self, bool destroyWindow); + friend void QWidget_protectedbase_destroyWithDestroyWindow(bool* _dynamic_cast_ok, void* self, bool destroyWindow); friend void QWidget_protectedbase_destroy2(bool* _dynamic_cast_ok, void* self, bool destroyWindow, bool destroySubWindows); friend QObject* QWidget_protectedbase_sender(bool* _dynamic_cast_ok, const void* self); friend int QWidget_protectedbase_senderSignalIndex(bool* _dynamic_cast_ok, const void* self); @@ -2337,19 +2337,19 @@ void QWidget_render4(QWidget* self, QPaintDevice* target, QPoint* targetOffset, self->render(target, *targetOffset, *sourceRegion, static_cast(renderFlags)); } -void QWidget_render22(QWidget* self, QPainter* painter, QPoint* targetOffset) { +void QWidget_render5(QWidget* self, QPainter* painter, QPoint* targetOffset) { self->render(painter, *targetOffset); } -void QWidget_render32(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion) { +void QWidget_render6(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion) { self->render(painter, *targetOffset, *sourceRegion); } -void QWidget_render42(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion, int renderFlags) { +void QWidget_render7(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion, int renderFlags) { self->render(painter, *targetOffset, *sourceRegion, static_cast(renderFlags)); } -QPixmap* QWidget_grab1(QWidget* self, QRect* rectangle) { +QPixmap* QWidget_grabWithRectangle(QWidget* self, QRect* rectangle) { return new QPixmap(self->grab(*rectangle)); } @@ -3203,7 +3203,7 @@ bool QWidget_protectedbase_focusPreviousChild(bool* _dynamic_cast_ok, void* self } -void QWidget_protectedbase_updateMicroFocus1(bool* _dynamic_cast_ok, void* self, int query) { +void QWidget_protectedbase_updateMicroFocusWithQuery(bool* _dynamic_cast_ok, void* self, int query) { MiqtVirtualQWidget* self_cast = dynamic_cast( (QWidget*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -3216,7 +3216,7 @@ void QWidget_protectedbase_updateMicroFocus1(bool* _dynamic_cast_ok, void* self, } -void QWidget_protectedbase_create1(bool* _dynamic_cast_ok, void* self, uintptr_t param1) { +void QWidget_protectedbase_createWithWId(bool* _dynamic_cast_ok, void* self, uintptr_t param1) { MiqtVirtualQWidget* self_cast = dynamic_cast( (QWidget*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -3255,7 +3255,7 @@ void QWidget_protectedbase_create3(bool* _dynamic_cast_ok, void* self, uintptr_t } -void QWidget_protectedbase_destroy1(bool* _dynamic_cast_ok, void* self, bool destroyWindow) { +void QWidget_protectedbase_destroyWithDestroyWindow(bool* _dynamic_cast_ok, void* self, bool destroyWindow) { MiqtVirtualQWidget* self_cast = dynamic_cast( (QWidget*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/gen_qwidget.go b/qt6/gen_qwidget.go index ce0a27ba..506bc103 100644 --- a/qt6/gen_qwidget.go +++ b/qt6/gen_qwidget.go @@ -1496,20 +1496,20 @@ func (this *QWidget) Render4(target *QPaintDevice, targetOffset *QPoint, sourceR C.QWidget_render4(this.h, target.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer(), (C.int)(renderFlags)) } -func (this *QWidget) Render22(painter *QPainter, targetOffset *QPoint) { - C.QWidget_render22(this.h, painter.cPointer(), targetOffset.cPointer()) +func (this *QWidget) Render5(painter *QPainter, targetOffset *QPoint) { + C.QWidget_render5(this.h, painter.cPointer(), targetOffset.cPointer()) } -func (this *QWidget) Render32(painter *QPainter, targetOffset *QPoint, sourceRegion *QRegion) { - C.QWidget_render32(this.h, painter.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer()) +func (this *QWidget) Render6(painter *QPainter, targetOffset *QPoint, sourceRegion *QRegion) { + C.QWidget_render6(this.h, painter.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer()) } -func (this *QWidget) Render42(painter *QPainter, targetOffset *QPoint, sourceRegion *QRegion, renderFlags QWidget__RenderFlag) { - C.QWidget_render42(this.h, painter.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer(), (C.int)(renderFlags)) +func (this *QWidget) Render7(painter *QPainter, targetOffset *QPoint, sourceRegion *QRegion, renderFlags QWidget__RenderFlag) { + C.QWidget_render7(this.h, painter.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer(), (C.int)(renderFlags)) } -func (this *QWidget) Grab1(rectangle *QRect) *QPixmap { - _goptr := newQPixmap(C.QWidget_grab1(this.h, rectangle.cPointer())) +func (this *QWidget) GrabWithRectangle(rectangle *QRect) *QPixmap { + _goptr := newQPixmap(C.QWidget_grabWithRectangle(this.h, rectangle.cPointer())) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1610,11 +1610,11 @@ func (this *QWidget) FocusPreviousChild() bool { } -// UpdateMicroFocus1 can only be called from a QWidget that was directly constructed. -func (this *QWidget) UpdateMicroFocus1(query InputMethodQuery) { +// UpdateMicroFocusWithQuery can only be called from a QWidget that was directly constructed. +func (this *QWidget) UpdateMicroFocusWithQuery(query InputMethodQuery) { var _dynamic_cast_ok C.bool = false - C.QWidget_protectedbase_updateMicroFocus1(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.int)(query)) + C.QWidget_protectedbase_updateMicroFocusWithQuery(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.int)(query)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -1622,11 +1622,11 @@ func (this *QWidget) UpdateMicroFocus1(query InputMethodQuery) { } -// Create1 can only be called from a QWidget that was directly constructed. -func (this *QWidget) Create1(param1 uintptr) { +// CreateWithWId can only be called from a QWidget that was directly constructed. +func (this *QWidget) CreateWithWId(param1 uintptr) { var _dynamic_cast_ok C.bool = false - C.QWidget_protectedbase_create1(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uintptr_t)(param1)) + C.QWidget_protectedbase_createWithWId(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uintptr_t)(param1)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -1658,11 +1658,11 @@ func (this *QWidget) Create3(param1 uintptr, initializeWindow bool, destroyOldWi } -// Destroy1 can only be called from a QWidget that was directly constructed. -func (this *QWidget) Destroy1(destroyWindow bool) { +// DestroyWithDestroyWindow can only be called from a QWidget that was directly constructed. +func (this *QWidget) DestroyWithDestroyWindow(destroyWindow bool) { var _dynamic_cast_ok C.bool = false - C.QWidget_protectedbase_destroy1(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.bool)(destroyWindow)) + C.QWidget_protectedbase_destroyWithDestroyWindow(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.bool)(destroyWindow)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") diff --git a/qt6/gen_qwidget.h b/qt6/gen_qwidget.h index f8dceedc..34f006a1 100644 --- a/qt6/gen_qwidget.h +++ b/qt6/gen_qwidget.h @@ -443,10 +443,10 @@ struct miqt_string QWidget_tr3(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); -void QWidget_render22(QWidget* self, QPainter* painter, QPoint* targetOffset); -void QWidget_render32(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion); -void QWidget_render42(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion, int renderFlags); -QPixmap* QWidget_grab1(QWidget* self, QRect* rectangle); +void QWidget_render5(QWidget* self, QPainter* painter, QPoint* targetOffset); +void QWidget_render6(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion); +void QWidget_render7(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion, int renderFlags); +QPixmap* QWidget_grabWithRectangle(QWidget* self, QRect* rectangle); void QWidget_grabGesture2(QWidget* self, int type, int flags); int QWidget_grabShortcut2(QWidget* self, QKeySequence* key, int context); void QWidget_setShortcutEnabled2(QWidget* self, int id, bool enable); @@ -554,11 +554,11 @@ void QWidget_protectedbase_create(bool* _dynamic_cast_ok, void* self); void QWidget_protectedbase_destroy(bool* _dynamic_cast_ok, void* self); bool QWidget_protectedbase_focusNextChild(bool* _dynamic_cast_ok, void* self); bool QWidget_protectedbase_focusPreviousChild(bool* _dynamic_cast_ok, void* self); -void QWidget_protectedbase_updateMicroFocus1(bool* _dynamic_cast_ok, void* self, int query); -void QWidget_protectedbase_create1(bool* _dynamic_cast_ok, void* self, uintptr_t param1); +void QWidget_protectedbase_updateMicroFocusWithQuery(bool* _dynamic_cast_ok, void* self, int query); +void QWidget_protectedbase_createWithWId(bool* _dynamic_cast_ok, void* self, uintptr_t param1); void QWidget_protectedbase_create2(bool* _dynamic_cast_ok, void* self, uintptr_t param1, bool initializeWindow); void QWidget_protectedbase_create3(bool* _dynamic_cast_ok, void* self, uintptr_t param1, bool initializeWindow, bool destroyOldWindow); -void QWidget_protectedbase_destroy1(bool* _dynamic_cast_ok, void* self, bool destroyWindow); +void QWidget_protectedbase_destroyWithDestroyWindow(bool* _dynamic_cast_ok, void* self, bool destroyWindow); void QWidget_protectedbase_destroy2(bool* _dynamic_cast_ok, void* self, bool destroyWindow, bool destroySubWindows); QObject* QWidget_protectedbase_sender(bool* _dynamic_cast_ok, const void* self); int QWidget_protectedbase_senderSignalIndex(bool* _dynamic_cast_ok, const void* self); diff --git a/qt6/gen_qwindow.cpp b/qt6/gen_qwindow.cpp index 797143ad..5227fd44 100644 --- a/qt6/gen_qwindow.cpp +++ b/qt6/gen_qwindow.cpp @@ -1443,7 +1443,7 @@ struct miqt_string QWindow_tr3(const char* s, const char* c, int n) { return _ms; } -QWindow* QWindow_parent1(const QWindow* self, int mode) { +QWindow* QWindow_parentWithMode(const QWindow* self, int mode) { return self->parent(static_cast(mode)); } diff --git a/qt6/gen_qwindow.go b/qt6/gen_qwindow.go index 3ab2a5b2..fbdd4705 100644 --- a/qt6/gen_qwindow.go +++ b/qt6/gen_qwindow.go @@ -1002,8 +1002,8 @@ func QWindow_Tr3(s string, c string, n int) string { return _ret } -func (this *QWindow) Parent1(mode QWindow__AncestorMode) *QWindow { - return newQWindow(C.QWindow_parent1(this.h, (C.int)(mode))) +func (this *QWindow) ParentWithMode(mode QWindow__AncestorMode) *QWindow { + return newQWindow(C.QWindow_parentWithMode(this.h, (C.int)(mode))) } func (this *QWindow) SetFlag2(param1 WindowType, on bool) { diff --git a/qt6/gen_qwindow.h b/qt6/gen_qwindow.h index b89f28f5..b6efad7b 100644 --- a/qt6/gen_qwindow.h +++ b/qt6/gen_qwindow.h @@ -258,7 +258,7 @@ void QWindow_tabletEvent(QWindow* self, QTabletEvent* param1); bool QWindow_nativeEvent(QWindow* self, struct miqt_string eventType, void* message, intptr_t* result); struct miqt_string QWindow_tr2(const char* s, const char* c); struct miqt_string QWindow_tr3(const char* s, const char* c, int n); -QWindow* QWindow_parent1(const QWindow* self, int mode); +QWindow* QWindow_parentWithMode(const QWindow* self, int mode); void QWindow_setFlag2(QWindow* self, int param1, bool on); bool QWindow_isAncestorOf2(const QWindow* self, QWindow* child, int mode); bool QWindow_override_virtual_surfaceType(void* self, intptr_t slot); diff --git a/qt6/gen_qwizard.cpp b/qt6/gen_qwizard.cpp index 04433af5..fc835357 100644 --- a/qt6/gen_qwizard.cpp +++ b/qt6/gen_qwizard.cpp @@ -3573,8 +3573,8 @@ public: friend QVariant* QWizardPage_protectedbase_field(bool* _dynamic_cast_ok, const void* self, struct miqt_string name); friend void QWizardPage_protectedbase_registerField(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget); friend QWizard* QWizardPage_protectedbase_wizard(bool* _dynamic_cast_ok, const void* self); - friend void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property); - friend void QWizardPage_protectedbase_registerField4(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property, const char* changedSignal); + friend void QWizardPage_protectedbase_registerField2(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property); + friend void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property, const char* changedSignal); friend void QWizardPage_protectedbase_updateMicroFocus(bool* _dynamic_cast_ok, void* self); friend void QWizardPage_protectedbase_create(bool* _dynamic_cast_ok, void* self); friend void QWizardPage_protectedbase_destroy(bool* _dynamic_cast_ok, void* self); @@ -4629,7 +4629,7 @@ QWizard* QWizardPage_protectedbase_wizard(bool* _dynamic_cast_ok, const void* se } -void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property) { +void QWizardPage_protectedbase_registerField2(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property) { MiqtVirtualQWizardPage* self_cast = dynamic_cast( (QWizardPage*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -4643,7 +4643,7 @@ void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self } -void QWizardPage_protectedbase_registerField4(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property, const char* changedSignal) { +void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property, const char* changedSignal) { MiqtVirtualQWizardPage* self_cast = dynamic_cast( (QWizardPage*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/gen_qwizard.go b/qt6/gen_qwizard.go index 69e5b04a..c8c3aa96 100644 --- a/qt6/gen_qwizard.go +++ b/qt6/gen_qwizard.go @@ -2365,8 +2365,8 @@ func (this *QWizardPage) Wizard() *QWizard { } -// RegisterField3 can only be called from a QWizardPage that was directly constructed. -func (this *QWizardPage) RegisterField3(name string, widget *QWidget, property string) { +// RegisterField2 can only be called from a QWizardPage that was directly constructed. +func (this *QWizardPage) RegisterField2(name string, widget *QWidget, property string) { name_ms := C.struct_miqt_string{} name_ms.data = C.CString(name) name_ms.len = C.size_t(len(name)) @@ -2375,7 +2375,7 @@ func (this *QWizardPage) RegisterField3(name string, widget *QWidget, property s defer C.free(unsafe.Pointer(property_Cstring)) var _dynamic_cast_ok C.bool = false - C.QWizardPage_protectedbase_registerField3(&_dynamic_cast_ok, unsafe.Pointer(this.h), name_ms, widget.cPointer(), property_Cstring) + C.QWizardPage_protectedbase_registerField2(&_dynamic_cast_ok, unsafe.Pointer(this.h), name_ms, widget.cPointer(), property_Cstring) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -2383,8 +2383,8 @@ func (this *QWizardPage) RegisterField3(name string, widget *QWidget, property s } -// RegisterField4 can only be called from a QWizardPage that was directly constructed. -func (this *QWizardPage) RegisterField4(name string, widget *QWidget, property string, changedSignal string) { +// RegisterField3 can only be called from a QWizardPage that was directly constructed. +func (this *QWizardPage) RegisterField3(name string, widget *QWidget, property string, changedSignal string) { name_ms := C.struct_miqt_string{} name_ms.data = C.CString(name) name_ms.len = C.size_t(len(name)) @@ -2395,7 +2395,7 @@ func (this *QWizardPage) RegisterField4(name string, widget *QWidget, property s defer C.free(unsafe.Pointer(changedSignal_Cstring)) var _dynamic_cast_ok C.bool = false - C.QWizardPage_protectedbase_registerField4(&_dynamic_cast_ok, unsafe.Pointer(this.h), name_ms, widget.cPointer(), property_Cstring, changedSignal_Cstring) + C.QWizardPage_protectedbase_registerField3(&_dynamic_cast_ok, unsafe.Pointer(this.h), name_ms, widget.cPointer(), property_Cstring, changedSignal_Cstring) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") diff --git a/qt6/gen_qwizard.h b/qt6/gen_qwizard.h index 528ac72e..348f4143 100644 --- a/qt6/gen_qwizard.h +++ b/qt6/gen_qwizard.h @@ -418,8 +418,8 @@ void QWizardPage_protectedbase_setField(bool* _dynamic_cast_ok, void* self, stru QVariant* QWizardPage_protectedbase_field(bool* _dynamic_cast_ok, const void* self, struct miqt_string name); void QWizardPage_protectedbase_registerField(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget); QWizard* QWizardPage_protectedbase_wizard(bool* _dynamic_cast_ok, const void* self); -void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property); -void QWizardPage_protectedbase_registerField4(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property, const char* changedSignal); +void QWizardPage_protectedbase_registerField2(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property); +void QWizardPage_protectedbase_registerField3(bool* _dynamic_cast_ok, void* self, struct miqt_string name, QWidget* widget, const char* property, const char* changedSignal); void QWizardPage_protectedbase_updateMicroFocus(bool* _dynamic_cast_ok, void* self); void QWizardPage_protectedbase_create(bool* _dynamic_cast_ok, void* self); void QWizardPage_protectedbase_destroy(bool* _dynamic_cast_ok, void* self); diff --git a/qt6/gen_qxmlstream.cpp b/qt6/gen_qxmlstream.cpp index ced1f18e..a62c2fca 100644 --- a/qt6/gen_qxmlstream.cpp +++ b/qt6/gen_qxmlstream.cpp @@ -402,7 +402,7 @@ QXmlStreamEntityResolver* QXmlStreamReader_entityResolver(const QXmlStreamReader return self->entityResolver(); } -struct miqt_string QXmlStreamReader_readElementText1(QXmlStreamReader* self, int behaviour) { +struct miqt_string QXmlStreamReader_readElementTextWithBehaviour(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(); @@ -413,7 +413,7 @@ struct miqt_string QXmlStreamReader_readElementText1(QXmlStreamReader* self, int return _ms; } -void QXmlStreamReader_raiseError1(QXmlStreamReader* self, struct miqt_string message) { +void QXmlStreamReader_raiseErrorWithMessage(QXmlStreamReader* self, struct miqt_string message) { QString message_QString = QString::fromUtf8(message.data, message.len); self->raiseError(message_QString); } diff --git a/qt6/gen_qxmlstream.go b/qt6/gen_qxmlstream.go index fb426d17..037ad02d 100644 --- a/qt6/gen_qxmlstream.go +++ b/qt6/gen_qxmlstream.go @@ -718,19 +718,19 @@ func (this *QXmlStreamReader) EntityResolver() *QXmlStreamEntityResolver { return newQXmlStreamEntityResolver(C.QXmlStreamReader_entityResolver(this.h)) } -func (this *QXmlStreamReader) ReadElementText1(behaviour QXmlStreamReader__ReadElementTextBehaviour) string { - var _ms C.struct_miqt_string = C.QXmlStreamReader_readElementText1(this.h, (C.int)(behaviour)) +func (this *QXmlStreamReader) ReadElementTextWithBehaviour(behaviour QXmlStreamReader__ReadElementTextBehaviour) string { + var _ms C.struct_miqt_string = C.QXmlStreamReader_readElementTextWithBehaviour(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) { +func (this *QXmlStreamReader) RaiseErrorWithMessage(message string) { 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) + C.QXmlStreamReader_raiseErrorWithMessage(this.h, message_ms) } // Delete this object from C++ memory. diff --git a/qt6/gen_qxmlstream.h b/qt6/gen_qxmlstream.h index 11f2367c..589fc3a4 100644 --- a/qt6/gen_qxmlstream.h +++ b/qt6/gen_qxmlstream.h @@ -112,8 +112,8 @@ 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_readElementTextWithBehaviour(QXmlStreamReader* self, int behaviour); +void QXmlStreamReader_raiseErrorWithMessage(QXmlStreamReader* self, struct miqt_string message); void QXmlStreamReader_delete(QXmlStreamReader* self); QXmlStreamWriter* QXmlStreamWriter_new(); diff --git a/qt6/multimedia/gen_qimagecapture.cpp b/qt6/multimedia/gen_qimagecapture.cpp index 2e748669..5cd92130 100644 --- a/qt6/multimedia/gen_qimagecapture.cpp +++ b/qt6/multimedia/gen_qimagecapture.cpp @@ -518,7 +518,7 @@ struct miqt_string QImageCapture_tr3(const char* s, const char* c, int n) { return _ms; } -int QImageCapture_captureToFile1(QImageCapture* self, struct miqt_string location) { +int QImageCapture_captureToFileWithLocation(QImageCapture* self, struct miqt_string location) { QString location_QString = QString::fromUtf8(location.data, location.len); return self->captureToFile(location_QString); } diff --git a/qt6/multimedia/gen_qimagecapture.go b/qt6/multimedia/gen_qimagecapture.go index ade78a90..2a98cc55 100644 --- a/qt6/multimedia/gen_qimagecapture.go +++ b/qt6/multimedia/gen_qimagecapture.go @@ -486,12 +486,12 @@ func QImageCapture_Tr3(s string, c string, n int) string { return _ret } -func (this *QImageCapture) CaptureToFile1(location string) int { +func (this *QImageCapture) CaptureToFileWithLocation(location string) int { location_ms := C.struct_miqt_string{} location_ms.data = C.CString(location) location_ms.len = C.size_t(len(location)) defer C.free(unsafe.Pointer(location_ms.data)) - return (int)(C.QImageCapture_captureToFile1(this.h, location_ms)) + return (int)(C.QImageCapture_captureToFileWithLocation(this.h, location_ms)) } // Sender can only be called from a QImageCapture that was directly constructed. diff --git a/qt6/multimedia/gen_qimagecapture.h b/qt6/multimedia/gen_qimagecapture.h index 5febaf0b..c68e341c 100644 --- a/qt6/multimedia/gen_qimagecapture.h +++ b/qt6/multimedia/gen_qimagecapture.h @@ -94,7 +94,7 @@ void QImageCapture_imageSaved(QImageCapture* self, int id, struct miqt_string fi void QImageCapture_connect_imageSaved(QImageCapture* self, intptr_t slot); struct miqt_string QImageCapture_tr2(const char* s, const char* c); struct miqt_string QImageCapture_tr3(const char* s, const char* c, int n); -int QImageCapture_captureToFile1(QImageCapture* self, struct miqt_string location); +int QImageCapture_captureToFileWithLocation(QImageCapture* self, struct miqt_string location); bool QImageCapture_override_virtual_event(void* self, intptr_t slot); bool QImageCapture_virtualbase_event(void* self, QEvent* event); bool QImageCapture_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt6/network/gen_qabstractnetworkcache.cpp b/qt6/network/gen_qabstractnetworkcache.cpp index 789d89cc..3ec1d6b6 100644 --- a/qt6/network/gen_qabstractnetworkcache.cpp +++ b/qt6/network/gen_qabstractnetworkcache.cpp @@ -1,9 +1,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/qt6/network/gen_qabstractsocket.cpp b/qt6/network/gen_qabstractsocket.cpp index c4895ff6..264f1136 100644 --- a/qt6/network/gen_qabstractsocket.cpp +++ b/qt6/network/gen_qabstractsocket.cpp @@ -28,8 +28,8 @@ void miqt_exec_callback_QAbstractSocket_stateChanged(intptr_t, int); void miqt_exec_callback_QAbstractSocket_errorOccurred(intptr_t, int); void miqt_exec_callback_QAbstractSocket_proxyAuthenticationRequired(intptr_t, QNetworkProxy*, QAuthenticator*); void miqt_exec_callback_QAbstractSocket_resume(QAbstractSocket*, intptr_t); -bool miqt_exec_callback_QAbstractSocket_bind(QAbstractSocket*, intptr_t, QHostAddress*, uint16_t, int); -void miqt_exec_callback_QAbstractSocket_connectToHost(QAbstractSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +bool miqt_exec_callback_QAbstractSocket_bind(QAbstractSocket*, intptr_t, QHostAddress*, unsigned short, int); +void miqt_exec_callback_QAbstractSocket_connectToHost(QAbstractSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QAbstractSocket_disconnectFromHost(QAbstractSocket*, intptr_t); long long miqt_exec_callback_QAbstractSocket_bytesAvailable(const QAbstractSocket*, intptr_t); long long miqt_exec_callback_QAbstractSocket_bytesToWrite(const QAbstractSocket*, intptr_t); @@ -104,7 +104,7 @@ public: // Cast returned reference into pointer QHostAddress* sigval1 = const_cast(&address_ret); quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QAbstractSocket::BindMode mode_ret = mode; int sigval3 = static_cast(mode_ret); @@ -113,7 +113,7 @@ public: return callback_return_value; } - friend bool QAbstractSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); + friend bool QAbstractSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); // cgo.Handle value for overwritten implementation intptr_t handle__connectToHost = 0; @@ -134,7 +134,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODeviceBase::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -145,7 +145,7 @@ public: } - friend void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -749,9 +749,9 @@ public: // Wrappers to allow calling protected methods: friend void QAbstractSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QAbstractSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QAbstractSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QAbstractSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QAbstractSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QAbstractSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -802,7 +802,7 @@ void QAbstractSocket_setPauseMode(QAbstractSocket* self, int pauseMode) { self->setPauseMode(static_cast(pauseMode)); } -bool QAbstractSocket_bind(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode) { +bool QAbstractSocket_bind(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode) { return self->bind(*address, static_cast(port), static_cast(mode)); } @@ -810,12 +810,12 @@ bool QAbstractSocket_bind2(QAbstractSocket* self) { return self->bind(); } -void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); } -void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, uint16_t port) { +void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, unsigned short port) { self->connectToHost(*address, static_cast(port)); } @@ -837,18 +837,18 @@ long long QAbstractSocket_bytesToWrite(const QAbstractSocket* self) { return static_cast(_ret); } -uint16_t QAbstractSocket_localPort(const QAbstractSocket* self) { +unsigned short QAbstractSocket_localPort(const QAbstractSocket* self) { quint16 _ret = self->localPort(); - return static_cast(_ret); + return static_cast(_ret); } QHostAddress* QAbstractSocket_localAddress(const QAbstractSocket* self) { return new QHostAddress(self->localAddress()); } -uint16_t QAbstractSocket_peerPort(const QAbstractSocket* self) { +unsigned short QAbstractSocket_peerPort(const QAbstractSocket* self) { quint16 _ret = self->peerPort(); - return static_cast(_ret); + return static_cast(_ret); } QHostAddress* QAbstractSocket_peerAddress(const QAbstractSocket* self) { @@ -1053,15 +1053,15 @@ struct miqt_string QAbstractSocket_tr3(const char* s, const char* c, int n) { return _ms; } -bool QAbstractSocket_bind1(QAbstractSocket* self, uint16_t port) { +bool QAbstractSocket_bindWithPort(QAbstractSocket* self, unsigned short port) { return self->bind(static_cast(port)); } -bool QAbstractSocket_bind22(QAbstractSocket* self, uint16_t port, int mode) { +bool QAbstractSocket_bind3(QAbstractSocket* self, unsigned short port, int mode) { return self->bind(static_cast(port), static_cast(mode)); } -void QAbstractSocket_connectToHost3(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode) { +void QAbstractSocket_connectToHost3(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode) { self->connectToHost(*address, static_cast(port), static_cast(mode)); } @@ -1091,7 +1091,7 @@ bool QAbstractSocket_override_virtual_bind(void* self, intptr_t slot) { return true; } -bool QAbstractSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode) { +bool QAbstractSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode) { return ( (MiqtVirtualQAbstractSocket*)(self) )->QAbstractSocket::bind(*address, static_cast(port), static_cast(mode)); @@ -1107,7 +1107,7 @@ bool QAbstractSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQAbstractSocket*)(self) )->QAbstractSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1661,7 +1661,7 @@ void QAbstractSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* } -void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQAbstractSocket* self_cast = dynamic_cast( (QAbstractSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1687,7 +1687,7 @@ void QAbstractSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* } -void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQAbstractSocket* self_cast = dynamic_cast( (QAbstractSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/network/gen_qabstractsocket.go b/qt6/network/gen_qabstractsocket.go index 12d47f74..696d11bd 100644 --- a/qt6/network/gen_qabstractsocket.go +++ b/qt6/network/gen_qabstractsocket.go @@ -177,7 +177,7 @@ func (this *QAbstractSocket) SetPauseMode(pauseMode QAbstractSocket__PauseMode) } func (this *QAbstractSocket) Bind(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QAbstractSocket_bind(this.h, address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QAbstractSocket_bind(this.h, address.cPointer(), (C.ushort)(port), (C.int)(mode))) } func (this *QAbstractSocket) Bind2() bool { @@ -189,11 +189,11 @@ func (this *QAbstractSocket) ConnectToHost(hostName string, port uint16, mode qt hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QAbstractSocket_connectToHost(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QAbstractSocket_connectToHost(this.h, hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QAbstractSocket) ConnectToHost2(address *QHostAddress, port uint16) { - C.QAbstractSocket_connectToHost2(this.h, address.cPointer(), (C.uint16_t)(port)) + C.QAbstractSocket_connectToHost2(this.h, address.cPointer(), (C.ushort)(port)) } func (this *QAbstractSocket) DisconnectFromHost() { @@ -469,16 +469,16 @@ func QAbstractSocket_Tr3(s string, c string, n int) string { return _ret } -func (this *QAbstractSocket) Bind1(port uint16) bool { - return (bool)(C.QAbstractSocket_bind1(this.h, (C.uint16_t)(port))) +func (this *QAbstractSocket) BindWithPort(port uint16) bool { + return (bool)(C.QAbstractSocket_bindWithPort(this.h, (C.ushort)(port))) } -func (this *QAbstractSocket) Bind22(port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QAbstractSocket_bind22(this.h, (C.uint16_t)(port), (C.int)(mode))) +func (this *QAbstractSocket) Bind3(port uint16, mode QAbstractSocket__BindFlag) bool { + return (bool)(C.QAbstractSocket_bind3(this.h, (C.ushort)(port), (C.int)(mode))) } func (this *QAbstractSocket) ConnectToHost3(address *QHostAddress, port uint16, mode qt6.QIODeviceBase__OpenModeFlag) { - C.QAbstractSocket_connectToHost3(this.h, address.cPointer(), (C.uint16_t)(port), (C.int)(mode)) + C.QAbstractSocket_connectToHost3(this.h, address.cPointer(), (C.ushort)(port), (C.int)(mode)) } // SetSocketState can only be called from a QAbstractSocket that was directly constructed. @@ -509,7 +509,7 @@ func (this *QAbstractSocket) SetSocketError(socketError QAbstractSocket__SocketE func (this *QAbstractSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QAbstractSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QAbstractSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -533,7 +533,7 @@ func (this *QAbstractSocket) SetLocalAddress(address *QHostAddress) { func (this *QAbstractSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QAbstractSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QAbstractSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -680,7 +680,7 @@ func miqt_exec_callback_QAbstractSocket_resume(self *C.QAbstractSocket, cb C.int func (this *QAbstractSocket) callVirtualBase_Bind(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QAbstractSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QAbstractSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.ushort)(port), (C.int)(mode))) } func (this *QAbstractSocket) OnBind(slot func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) { @@ -691,7 +691,7 @@ func (this *QAbstractSocket) OnBind(slot func(super func(address *QHostAddress, } //export miqt_exec_callback_QAbstractSocket_bind -func miqt_exec_callback_QAbstractSocket_bind(self *C.QAbstractSocket, cb C.intptr_t, address *C.QHostAddress, port C.uint16_t, mode C.int) C.bool { +func miqt_exec_callback_QAbstractSocket_bind(self *C.QAbstractSocket, cb C.intptr_t, address *C.QHostAddress, port C.ushort, mode C.int) C.bool { gofunc, ok := cgo.Handle(cb).Value().(func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -716,7 +716,7 @@ func (this *QAbstractSocket) callVirtualBase_ConnectToHost(hostName string, port hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QAbstractSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QAbstractSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QAbstractSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -727,7 +727,7 @@ func (this *QAbstractSocket) OnConnectToHost(slot func(super func(hostName strin } //export miqt_exec_callback_QAbstractSocket_connectToHost -func miqt_exec_callback_QAbstractSocket_connectToHost(self *C.QAbstractSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QAbstractSocket_connectToHost(self *C.QAbstractSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/network/gen_qabstractsocket.h b/qt6/network/gen_qabstractsocket.h index aeadc138..4d24b7b6 100644 --- a/qt6/network/gen_qabstractsocket.h +++ b/qt6/network/gen_qabstractsocket.h @@ -52,17 +52,17 @@ struct miqt_string QAbstractSocket_tr(const char* s); void QAbstractSocket_resume(QAbstractSocket* self); int QAbstractSocket_pauseMode(const QAbstractSocket* self); void QAbstractSocket_setPauseMode(QAbstractSocket* self, int pauseMode); -bool QAbstractSocket_bind(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode); +bool QAbstractSocket_bind(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode); bool QAbstractSocket_bind2(QAbstractSocket* self); -void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); -void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, uint16_t port); +void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); +void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, unsigned short port); void QAbstractSocket_disconnectFromHost(QAbstractSocket* self); bool QAbstractSocket_isValid(const QAbstractSocket* self); long long QAbstractSocket_bytesAvailable(const QAbstractSocket* self); long long QAbstractSocket_bytesToWrite(const QAbstractSocket* self); -uint16_t QAbstractSocket_localPort(const QAbstractSocket* self); +unsigned short QAbstractSocket_localPort(const QAbstractSocket* self); QHostAddress* QAbstractSocket_localAddress(const QAbstractSocket* self); -uint16_t QAbstractSocket_peerPort(const QAbstractSocket* self); +unsigned short QAbstractSocket_peerPort(const QAbstractSocket* self); QHostAddress* QAbstractSocket_peerAddress(const QAbstractSocket* self); struct miqt_string QAbstractSocket_peerName(const QAbstractSocket* self); long long QAbstractSocket_readBufferSize(const QAbstractSocket* self); @@ -104,15 +104,15 @@ long long QAbstractSocket_skipData(QAbstractSocket* self, long long maxSize); long long QAbstractSocket_writeData(QAbstractSocket* self, const char* data, long long len); struct miqt_string QAbstractSocket_tr2(const char* s, const char* c); struct miqt_string QAbstractSocket_tr3(const char* s, const char* c, int n); -bool QAbstractSocket_bind1(QAbstractSocket* self, uint16_t port); -bool QAbstractSocket_bind22(QAbstractSocket* self, uint16_t port, int mode); -void QAbstractSocket_connectToHost3(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode); +bool QAbstractSocket_bindWithPort(QAbstractSocket* self, unsigned short port); +bool QAbstractSocket_bind3(QAbstractSocket* self, unsigned short port, int mode); +void QAbstractSocket_connectToHost3(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode); bool QAbstractSocket_override_virtual_resume(void* self, intptr_t slot); void QAbstractSocket_virtualbase_resume(void* self); bool QAbstractSocket_override_virtual_bind(void* self, intptr_t slot); -bool QAbstractSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); +bool QAbstractSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); bool QAbstractSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QAbstractSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QAbstractSocket_virtualbase_disconnectFromHost(void* self); bool QAbstractSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); @@ -179,9 +179,9 @@ bool QAbstractSocket_override_virtual_disconnectNotify(void* self, intptr_t slot void QAbstractSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QAbstractSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QAbstractSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QAbstractSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QAbstractSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QAbstractSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QAbstractSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt6/network/gen_qauthenticator.cpp b/qt6/network/gen_qauthenticator.cpp index 1afd37b2..180ae3fd 100644 --- a/qt6/network/gen_qauthenticator.cpp +++ b/qt6/network/gen_qauthenticator.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/qt6/network/gen_qdnslookup.cpp b/qt6/network/gen_qdnslookup.cpp index 0691d3f9..0a343b2e 100644 --- a/qt6/network/gen_qdnslookup.cpp +++ b/qt6/network/gen_qdnslookup.cpp @@ -163,9 +163,9 @@ struct miqt_string QDnsMailExchangeRecord_name(const QDnsMailExchangeRecord* sel return _ms; } -uint16_t QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self) { +unsigned short QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self) { quint16 _ret = self->preference(); - return static_cast(_ret); + return static_cast(_ret); } unsigned int QDnsMailExchangeRecord_timeToLive(const QDnsMailExchangeRecord* self) { @@ -204,14 +204,14 @@ struct miqt_string QDnsServiceRecord_name(const QDnsServiceRecord* self) { return _ms; } -uint16_t QDnsServiceRecord_port(const QDnsServiceRecord* self) { +unsigned short QDnsServiceRecord_port(const QDnsServiceRecord* self) { quint16 _ret = self->port(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QDnsServiceRecord_priority(const QDnsServiceRecord* self) { +unsigned short QDnsServiceRecord_priority(const QDnsServiceRecord* self) { quint16 _ret = self->priority(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string QDnsServiceRecord_target(const QDnsServiceRecord* self) { @@ -230,9 +230,9 @@ unsigned int QDnsServiceRecord_timeToLive(const QDnsServiceRecord* self) { return static_cast(_ret); } -uint16_t QDnsServiceRecord_weight(const QDnsServiceRecord* self) { +unsigned short QDnsServiceRecord_weight(const QDnsServiceRecord* self) { quint16 _ret = self->weight(); - return static_cast(_ret); + return static_cast(_ret); } void QDnsServiceRecord_delete(QDnsServiceRecord* self) { diff --git a/qt6/network/gen_qdnslookup.h b/qt6/network/gen_qdnslookup.h index 1c7e73b0..3501bb7c 100644 --- a/qt6/network/gen_qdnslookup.h +++ b/qt6/network/gen_qdnslookup.h @@ -68,7 +68,7 @@ void QDnsMailExchangeRecord_operatorAssign(QDnsMailExchangeRecord* self, QDnsMai void QDnsMailExchangeRecord_swap(QDnsMailExchangeRecord* self, QDnsMailExchangeRecord* other); struct miqt_string QDnsMailExchangeRecord_exchange(const QDnsMailExchangeRecord* self); struct miqt_string QDnsMailExchangeRecord_name(const QDnsMailExchangeRecord* self); -uint16_t QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self); +unsigned short QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self); unsigned int QDnsMailExchangeRecord_timeToLive(const QDnsMailExchangeRecord* self); void QDnsMailExchangeRecord_delete(QDnsMailExchangeRecord* self); @@ -77,11 +77,11 @@ QDnsServiceRecord* QDnsServiceRecord_new2(QDnsServiceRecord* other); void QDnsServiceRecord_operatorAssign(QDnsServiceRecord* self, QDnsServiceRecord* other); void QDnsServiceRecord_swap(QDnsServiceRecord* self, QDnsServiceRecord* other); struct miqt_string QDnsServiceRecord_name(const QDnsServiceRecord* self); -uint16_t QDnsServiceRecord_port(const QDnsServiceRecord* self); -uint16_t QDnsServiceRecord_priority(const QDnsServiceRecord* self); +unsigned short QDnsServiceRecord_port(const QDnsServiceRecord* self); +unsigned short QDnsServiceRecord_priority(const QDnsServiceRecord* self); struct miqt_string QDnsServiceRecord_target(const QDnsServiceRecord* self); unsigned int QDnsServiceRecord_timeToLive(const QDnsServiceRecord* self); -uint16_t QDnsServiceRecord_weight(const QDnsServiceRecord* self); +unsigned short QDnsServiceRecord_weight(const QDnsServiceRecord* self); void QDnsServiceRecord_delete(QDnsServiceRecord* self); QDnsTextRecord* QDnsTextRecord_new(); diff --git a/qt6/network/gen_qdtls.cpp b/qt6/network/gen_qdtls.cpp index b928af4e..138f0844 100644 --- a/qt6/network/gen_qdtls.cpp +++ b/qt6/network/gen_qdtls.cpp @@ -235,7 +235,7 @@ QDtlsClientVerifier__GeneratorParameters* QDtlsClientVerifier_cookieGeneratorPar return new QDtlsClientVerifier::GeneratorParameters(self->cookieGeneratorParameters()); } -bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, uint16_t port) { +bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, unsigned short port) { QByteArray dgram_QByteArray(dgram.data, dgram.len); return self->verifyClient(socket, dgram_QByteArray, *address, static_cast(port)); } @@ -637,7 +637,7 @@ struct miqt_string QDtls_tr(const char* s) { return _ms; } -bool QDtls_setPeer(QDtls* self, QHostAddress* address, uint16_t port) { +bool QDtls_setPeer(QDtls* self, QHostAddress* address, unsigned short port) { return self->setPeer(*address, static_cast(port)); } @@ -650,9 +650,9 @@ QHostAddress* QDtls_peerAddress(const QDtls* self) { return new QHostAddress(self->peerAddress()); } -uint16_t QDtls_peerPort(const QDtls* self) { +unsigned short QDtls_peerPort(const QDtls* self) { quint16 _ret = self->peerPort(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string QDtls_peerVerificationName(const QDtls* self) { @@ -671,13 +671,13 @@ int QDtls_sslMode(const QDtls* self) { return static_cast(_ret); } -void QDtls_setMtuHint(QDtls* self, uint16_t mtuHint) { +void QDtls_setMtuHint(QDtls* self, unsigned short mtuHint) { self->setMtuHint(static_cast(mtuHint)); } -uint16_t QDtls_mtuHint(const QDtls* self) { +unsigned short QDtls_mtuHint(const QDtls* self) { quint16 _ret = self->mtuHint(); - return static_cast(_ret); + return static_cast(_ret); } bool QDtls_setCookieGeneratorParameters(QDtls* self, QDtlsClientVerifier__GeneratorParameters* params) { @@ -832,7 +832,7 @@ struct miqt_string QDtls_tr3(const char* s, const char* c, int n) { return _ms; } -bool QDtls_setPeer3(QDtls* self, QHostAddress* address, uint16_t port, struct miqt_string verificationName) { +bool QDtls_setPeer2(QDtls* self, QHostAddress* address, unsigned short port, struct miqt_string verificationName) { QString verificationName_QString = QString::fromUtf8(verificationName.data, verificationName.len); return self->setPeer(*address, static_cast(port), verificationName_QString); } diff --git a/qt6/network/gen_qdtls.go b/qt6/network/gen_qdtls.go index 18e4b9a9..e5371d77 100644 --- a/qt6/network/gen_qdtls.go +++ b/qt6/network/gen_qdtls.go @@ -123,7 +123,7 @@ func (this *QDtlsClientVerifier) VerifyClient(socket *QUdpSocket, dgram []byte, dgram_alias.data = (*C.char)(unsafe.Pointer(nil)) } dgram_alias.len = C.size_t(len(dgram)) - return (bool)(C.QDtlsClientVerifier_verifyClient(this.h, socket.cPointer(), dgram_alias, address.cPointer(), (C.uint16_t)(port))) + return (bool)(C.QDtlsClientVerifier_verifyClient(this.h, socket.cPointer(), dgram_alias, address.cPointer(), (C.ushort)(port))) } func (this *QDtlsClientVerifier) VerifiedHello() []byte { @@ -494,7 +494,7 @@ func QDtls_Tr(s string) string { } func (this *QDtls) SetPeer(address *QHostAddress, port uint16) bool { - return (bool)(C.QDtls_setPeer(this.h, address.cPointer(), (C.uint16_t)(port))) + return (bool)(C.QDtls_setPeer(this.h, address.cPointer(), (C.ushort)(port))) } func (this *QDtls) SetPeerVerificationName(name string) bool { @@ -527,7 +527,7 @@ func (this *QDtls) SslMode() QSslSocket__SslMode { } func (this *QDtls) SetMtuHint(mtuHint uint16) { - C.QDtls_setMtuHint(this.h, (C.uint16_t)(mtuHint)) + C.QDtls_setMtuHint(this.h, (C.ushort)(mtuHint)) } func (this *QDtls) MtuHint() uint16 { @@ -709,12 +709,12 @@ func QDtls_Tr3(s string, c string, n int) string { return _ret } -func (this *QDtls) SetPeer3(address *QHostAddress, port uint16, verificationName string) bool { +func (this *QDtls) SetPeer2(address *QHostAddress, port uint16, verificationName string) bool { verificationName_ms := C.struct_miqt_string{} verificationName_ms.data = C.CString(verificationName) verificationName_ms.len = C.size_t(len(verificationName)) defer C.free(unsafe.Pointer(verificationName_ms.data)) - return (bool)(C.QDtls_setPeer3(this.h, address.cPointer(), (C.uint16_t)(port), verificationName_ms)) + return (bool)(C.QDtls_setPeer2(this.h, address.cPointer(), (C.ushort)(port), verificationName_ms)) } func (this *QDtls) DoHandshake2(socket *QUdpSocket, dgram []byte) bool { diff --git a/qt6/network/gen_qdtls.h b/qt6/network/gen_qdtls.h index 6031a5e8..ec2aedb5 100644 --- a/qt6/network/gen_qdtls.h +++ b/qt6/network/gen_qdtls.h @@ -60,7 +60,7 @@ void* QDtlsClientVerifier_metacast(QDtlsClientVerifier* self, const char* param1 struct miqt_string QDtlsClientVerifier_tr(const char* s); bool QDtlsClientVerifier_setCookieGeneratorParameters(QDtlsClientVerifier* self, QDtlsClientVerifier__GeneratorParameters* params); QDtlsClientVerifier__GeneratorParameters* QDtlsClientVerifier_cookieGeneratorParameters(const QDtlsClientVerifier* self); -bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, uint16_t port); +bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, unsigned short port); struct miqt_string QDtlsClientVerifier_verifiedHello(const QDtlsClientVerifier* self); unsigned char QDtlsClientVerifier_dtlsError(const QDtlsClientVerifier* self); struct miqt_string QDtlsClientVerifier_dtlsErrorString(const QDtlsClientVerifier* self); @@ -92,14 +92,14 @@ void QDtls_virtbase(QDtls* src, QObject** outptr_QObject); QMetaObject* QDtls_metaObject(const QDtls* self); void* QDtls_metacast(QDtls* self, const char* param1); struct miqt_string QDtls_tr(const char* s); -bool QDtls_setPeer(QDtls* self, QHostAddress* address, uint16_t port); +bool QDtls_setPeer(QDtls* self, QHostAddress* address, unsigned short port); bool QDtls_setPeerVerificationName(QDtls* self, struct miqt_string name); QHostAddress* QDtls_peerAddress(const QDtls* self); -uint16_t QDtls_peerPort(const QDtls* self); +unsigned short QDtls_peerPort(const QDtls* self); struct miqt_string QDtls_peerVerificationName(const QDtls* self); int QDtls_sslMode(const QDtls* self); -void QDtls_setMtuHint(QDtls* self, uint16_t mtuHint); -uint16_t QDtls_mtuHint(const QDtls* self); +void QDtls_setMtuHint(QDtls* self, unsigned short mtuHint); +unsigned short QDtls_mtuHint(const QDtls* self); bool QDtls_setCookieGeneratorParameters(QDtls* self, QDtlsClientVerifier__GeneratorParameters* params); QDtlsClientVerifier__GeneratorParameters* QDtls_cookieGeneratorParameters(const QDtls* self); bool QDtls_setDtlsConfiguration(QDtls* self, QSslConfiguration* configuration); @@ -125,7 +125,7 @@ void QDtls_handshakeTimeout(QDtls* self); void QDtls_connect_handshakeTimeout(QDtls* self, intptr_t slot); struct miqt_string QDtls_tr2(const char* s, const char* c); struct miqt_string QDtls_tr3(const char* s, const char* c, int n); -bool QDtls_setPeer3(QDtls* self, QHostAddress* address, uint16_t port, struct miqt_string verificationName); +bool QDtls_setPeer2(QDtls* self, QHostAddress* address, unsigned short port, struct miqt_string verificationName); bool QDtls_doHandshake2(QDtls* self, QUdpSocket* socket, struct miqt_string dgram); bool QDtls_override_virtual_event(void* self, intptr_t slot); bool QDtls_virtualbase_event(void* self, QEvent* event); diff --git a/qt6/network/gen_qhostaddress.cpp b/qt6/network/gen_qhostaddress.cpp index b70ce43b..43b9ad03 100644 --- a/qt6/network/gen_qhostaddress.cpp +++ b/qt6/network/gen_qhostaddress.cpp @@ -211,7 +211,7 @@ struct miqt_map /* tuple of QHostAddress* and int */ QHostAddress_parseSubnet(s return _out; } -unsigned int QHostAddress_toIPv4Address1(const QHostAddress* self, bool* ok) { +unsigned int QHostAddress_toIPv4AddressWithOk(const QHostAddress* self, bool* ok) { quint32 _ret = self->toIPv4Address(ok); return static_cast(_ret); } diff --git a/qt6/network/gen_qhostaddress.go b/qt6/network/gen_qhostaddress.go index baaf3819..9eed2cc6 100644 --- a/qt6/network/gen_qhostaddress.go +++ b/qt6/network/gen_qhostaddress.go @@ -337,8 +337,8 @@ func QHostAddress_ParseSubnet(subnet string) struct { }{First: _entry_First, Second: _entry_Second} } -func (this *QHostAddress) ToIPv4Address1(ok *bool) uint { - return (uint)(C.QHostAddress_toIPv4Address1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +func (this *QHostAddress) ToIPv4AddressWithOk(ok *bool) uint { + return (uint)(C.QHostAddress_toIPv4AddressWithOk(this.h, (*C.bool)(unsafe.Pointer(ok)))) } func (this *QHostAddress) IsEqual2(address *QHostAddress, mode QHostAddress__ConversionModeFlag) bool { diff --git a/qt6/network/gen_qhostaddress.h b/qt6/network/gen_qhostaddress.h index 44d3be14..a7b3515a 100644 --- a/qt6/network/gen_qhostaddress.h +++ b/qt6/network/gen_qhostaddress.h @@ -63,7 +63,7 @@ bool QHostAddress_isUniqueLocalUnicast(const QHostAddress* self); bool QHostAddress_isMulticast(const QHostAddress* self); bool QHostAddress_isBroadcast(const QHostAddress* self); struct miqt_map /* tuple of QHostAddress* and int */ QHostAddress_parseSubnet(struct miqt_string subnet); -unsigned int QHostAddress_toIPv4Address1(const QHostAddress* self, bool* ok); +unsigned int QHostAddress_toIPv4AddressWithOk(const QHostAddress* self, bool* ok); bool QHostAddress_isEqual2(const QHostAddress* self, QHostAddress* address, int mode); void QHostAddress_delete(QHostAddress* self); diff --git a/qt6/network/gen_qhstspolicy.cpp b/qt6/network/gen_qhstspolicy.cpp index e045a1b5..60c91234 100644 --- a/qt6/network/gen_qhstspolicy.cpp +++ b/qt6/network/gen_qhstspolicy.cpp @@ -81,7 +81,7 @@ void QHstsPolicy_setHost2(QHstsPolicy* self, struct miqt_string host, int mode) self->setHost(host_QString, static_cast(mode)); } -struct miqt_string QHstsPolicy_host1(const QHstsPolicy* self, unsigned int options) { +struct miqt_string QHstsPolicy_hostWithOptions(const QHstsPolicy* self, unsigned int options) { QString _ret = self->host(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); diff --git a/qt6/network/gen_qhstspolicy.go b/qt6/network/gen_qhstspolicy.go index ccc99fa7..15971d91 100644 --- a/qt6/network/gen_qhstspolicy.go +++ b/qt6/network/gen_qhstspolicy.go @@ -137,8 +137,8 @@ func (this *QHstsPolicy) SetHost2(host string, mode qt6.QUrl__ParsingMode) { C.QHstsPolicy_setHost2(this.h, host_ms, (C.int)(mode)) } -func (this *QHstsPolicy) Host1(options qt6.QUrl__ComponentFormattingOption) string { - var _ms C.struct_miqt_string = C.QHstsPolicy_host1(this.h, (C.uint)(options)) +func (this *QHstsPolicy) HostWithOptions(options qt6.QUrl__ComponentFormattingOption) string { + var _ms C.struct_miqt_string = C.QHstsPolicy_hostWithOptions(this.h, (C.uint)(options)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret diff --git a/qt6/network/gen_qhstspolicy.h b/qt6/network/gen_qhstspolicy.h index a3ae1869..5ae7064b 100644 --- a/qt6/network/gen_qhstspolicy.h +++ b/qt6/network/gen_qhstspolicy.h @@ -36,7 +36,7 @@ void QHstsPolicy_setIncludesSubDomains(QHstsPolicy* self, bool include); bool QHstsPolicy_includesSubDomains(const QHstsPolicy* self); bool QHstsPolicy_isExpired(const QHstsPolicy* self); void QHstsPolicy_setHost2(QHstsPolicy* self, struct miqt_string host, int mode); -struct miqt_string QHstsPolicy_host1(const QHstsPolicy* self, unsigned int options); +struct miqt_string QHstsPolicy_hostWithOptions(const QHstsPolicy* self, unsigned int options); void QHstsPolicy_delete(QHstsPolicy* self); #ifdef __cplusplus diff --git a/qt6/network/gen_qlocalserver.cpp b/qt6/network/gen_qlocalserver.cpp index 6a36c506..4401fef4 100644 --- a/qt6/network/gen_qlocalserver.cpp +++ b/qt6/network/gen_qlocalserver.cpp @@ -401,7 +401,7 @@ struct miqt_string QLocalServer_tr3(const char* s, const char* c, int n) { return _ms; } -bool QLocalServer_waitForNewConnection1(QLocalServer* self, int msec) { +bool QLocalServer_waitForNewConnectionWithMsec(QLocalServer* self, int msec) { return self->waitForNewConnection(static_cast(msec)); } diff --git a/qt6/network/gen_qlocalserver.go b/qt6/network/gen_qlocalserver.go index 0cd541c0..3b19ca51 100644 --- a/qt6/network/gen_qlocalserver.go +++ b/qt6/network/gen_qlocalserver.go @@ -225,8 +225,8 @@ func QLocalServer_Tr3(s string, c string, n int) string { return _ret } -func (this *QLocalServer) WaitForNewConnection1(msec int) bool { - return (bool)(C.QLocalServer_waitForNewConnection1(this.h, (C.int)(msec))) +func (this *QLocalServer) WaitForNewConnectionWithMsec(msec int) bool { + return (bool)(C.QLocalServer_waitForNewConnectionWithMsec(this.h, (C.int)(msec))) } func (this *QLocalServer) WaitForNewConnection2(msec int, timedOut *bool) bool { diff --git a/qt6/network/gen_qlocalserver.h b/qt6/network/gen_qlocalserver.h index 72cf4f1f..8d3b06dc 100644 --- a/qt6/network/gen_qlocalserver.h +++ b/qt6/network/gen_qlocalserver.h @@ -64,7 +64,7 @@ intptr_t QLocalServer_socketDescriptor(const QLocalServer* self); void QLocalServer_incomingConnection(QLocalServer* self, uintptr_t socketDescriptor); struct miqt_string QLocalServer_tr2(const char* s, const char* c); struct miqt_string QLocalServer_tr3(const char* s, const char* c, int n); -bool QLocalServer_waitForNewConnection1(QLocalServer* self, int msec); +bool QLocalServer_waitForNewConnectionWithMsec(QLocalServer* self, int msec); bool QLocalServer_waitForNewConnection2(QLocalServer* self, int msec, bool* timedOut); bool QLocalServer_override_virtual_hasPendingConnections(void* self, intptr_t slot); bool QLocalServer_virtualbase_hasPendingConnections(const void* self); diff --git a/qt6/network/gen_qlocalsocket.cpp b/qt6/network/gen_qlocalsocket.cpp index d21ae4a7..b5af3ae6 100644 --- a/qt6/network/gen_qlocalsocket.cpp +++ b/qt6/network/gen_qlocalsocket.cpp @@ -737,7 +737,7 @@ struct miqt_string QLocalSocket_tr3(const char* s, const char* c, int n) { return _ms; } -void QLocalSocket_connectToServer1(QLocalSocket* self, int openMode) { +void QLocalSocket_connectToServerWithOpenMode(QLocalSocket* self, int openMode) { self->connectToServer(static_cast(openMode)); } @@ -754,11 +754,11 @@ bool QLocalSocket_setSocketDescriptor3(QLocalSocket* self, intptr_t socketDescri return self->setSocketDescriptor((qintptr)(socketDescriptor), static_cast(socketState), static_cast(openMode)); } -bool QLocalSocket_waitForConnected1(QLocalSocket* self, int msecs) { +bool QLocalSocket_waitForConnectedWithMsecs(QLocalSocket* self, int msecs) { return self->waitForConnected(static_cast(msecs)); } -bool QLocalSocket_waitForDisconnected1(QLocalSocket* self, int msecs) { +bool QLocalSocket_waitForDisconnectedWithMsecs(QLocalSocket* self, int msecs) { return self->waitForDisconnected(static_cast(msecs)); } diff --git a/qt6/network/gen_qlocalsocket.go b/qt6/network/gen_qlocalsocket.go index e3663c37..2e49b6ff 100644 --- a/qt6/network/gen_qlocalsocket.go +++ b/qt6/network/gen_qlocalsocket.go @@ -332,8 +332,8 @@ func QLocalSocket_Tr3(s string, c string, n int) string { return _ret } -func (this *QLocalSocket) ConnectToServer1(openMode qt6.QIODeviceBase__OpenModeFlag) { - C.QLocalSocket_connectToServer1(this.h, (C.int)(openMode)) +func (this *QLocalSocket) ConnectToServerWithOpenMode(openMode qt6.QIODeviceBase__OpenModeFlag) { + C.QLocalSocket_connectToServerWithOpenMode(this.h, (C.int)(openMode)) } func (this *QLocalSocket) ConnectToServer2(name string, openMode qt6.QIODeviceBase__OpenModeFlag) { @@ -352,12 +352,12 @@ func (this *QLocalSocket) SetSocketDescriptor3(socketDescriptor uintptr, socketS return (bool)(C.QLocalSocket_setSocketDescriptor3(this.h, (C.intptr_t)(socketDescriptor), (C.int)(socketState), (C.int)(openMode))) } -func (this *QLocalSocket) WaitForConnected1(msecs int) bool { - return (bool)(C.QLocalSocket_waitForConnected1(this.h, (C.int)(msecs))) +func (this *QLocalSocket) WaitForConnectedWithMsecs(msecs int) bool { + return (bool)(C.QLocalSocket_waitForConnectedWithMsecs(this.h, (C.int)(msecs))) } -func (this *QLocalSocket) WaitForDisconnected1(msecs int) bool { - return (bool)(C.QLocalSocket_waitForDisconnected1(this.h, (C.int)(msecs))) +func (this *QLocalSocket) WaitForDisconnectedWithMsecs(msecs int) bool { + return (bool)(C.QLocalSocket_waitForDisconnectedWithMsecs(this.h, (C.int)(msecs))) } // SetOpenMode can only be called from a QLocalSocket that was directly constructed. diff --git a/qt6/network/gen_qlocalsocket.h b/qt6/network/gen_qlocalsocket.h index 86069f51..8d4faa3c 100644 --- a/qt6/network/gen_qlocalsocket.h +++ b/qt6/network/gen_qlocalsocket.h @@ -83,12 +83,12 @@ long long QLocalSocket_skipData(QLocalSocket* self, long long maxSize); long long QLocalSocket_writeData(QLocalSocket* self, const char* param1, long long param2); struct miqt_string QLocalSocket_tr2(const char* s, const char* c); struct miqt_string QLocalSocket_tr3(const char* s, const char* c, int n); -void QLocalSocket_connectToServer1(QLocalSocket* self, int openMode); +void QLocalSocket_connectToServerWithOpenMode(QLocalSocket* self, int openMode); void QLocalSocket_connectToServer2(QLocalSocket* self, struct miqt_string name, int openMode); bool QLocalSocket_setSocketDescriptor2(QLocalSocket* self, intptr_t socketDescriptor, int socketState); bool QLocalSocket_setSocketDescriptor3(QLocalSocket* self, intptr_t socketDescriptor, int socketState, int openMode); -bool QLocalSocket_waitForConnected1(QLocalSocket* self, int msecs); -bool QLocalSocket_waitForDisconnected1(QLocalSocket* self, int msecs); +bool QLocalSocket_waitForConnectedWithMsecs(QLocalSocket* self, int msecs); +bool QLocalSocket_waitForDisconnectedWithMsecs(QLocalSocket* self, int msecs); bool QLocalSocket_override_virtual_isSequential(void* self, intptr_t slot); bool QLocalSocket_virtualbase_isSequential(const void* self); bool QLocalSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); diff --git a/qt6/network/gen_qnetworkaccessmanager.cpp b/qt6/network/gen_qnetworkaccessmanager.cpp index b4a73c9a..cdc36db2 100644 --- a/qt6/network/gen_qnetworkaccessmanager.cpp +++ b/qt6/network/gen_qnetworkaccessmanager.cpp @@ -437,7 +437,7 @@ void QNetworkAccessManager_connectToHostEncrypted(QNetworkAccessManager* self, s self->connectToHostEncrypted(hostName_QString); } -void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration, struct miqt_string peerName) { +void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration, struct miqt_string peerName) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString peerName_QString = QString::fromUtf8(peerName.data, peerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), *sslConfiguration, peerName_QString); @@ -587,27 +587,27 @@ void QNetworkAccessManager_enableStrictTransportSecurityStore2(QNetworkAccessMan self->enableStrictTransportSecurityStore(enabled, storeDir_QString); } -QNetworkReply* QNetworkAccessManager_sendCustomRequest32(QNetworkAccessManager* self, QNetworkRequest* request, struct miqt_string verb, QIODevice* data) { +QNetworkReply* QNetworkAccessManager_sendCustomRequest4(QNetworkAccessManager* self, QNetworkRequest* request, struct miqt_string verb, QIODevice* data) { QByteArray verb_QByteArray(verb.data, verb.len); return self->sendCustomRequest(*request, verb_QByteArray, data); } -void QNetworkAccessManager_connectToHostEncrypted22(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port) { +void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port)); } -void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration) { +void QNetworkAccessManager_connectToHostEncrypted4(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), *sslConfiguration); } -void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port) { +void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHost(hostName_QString, static_cast(port)); } -void QNetworkAccessManager_setTransferTimeout1(QNetworkAccessManager* self, int timeout) { +void QNetworkAccessManager_setTransferTimeoutWithTimeout(QNetworkAccessManager* self, int timeout) { self->setTransferTimeout(static_cast(timeout)); } diff --git a/qt6/network/gen_qnetworkaccessmanager.go b/qt6/network/gen_qnetworkaccessmanager.go index a61e5e1a..3b399931 100644 --- a/qt6/network/gen_qnetworkaccessmanager.go +++ b/qt6/network/gen_qnetworkaccessmanager.go @@ -294,7 +294,7 @@ func (this *QNetworkAccessManager) ConnectToHostEncrypted2(hostName string, port peerName_ms.data = C.CString(peerName) peerName_ms.len = C.size_t(len(peerName)) defer C.free(unsafe.Pointer(peerName_ms.data)) - C.QNetworkAccessManager_connectToHostEncrypted2(this.h, hostName_ms, (C.uint16_t)(port), sslConfiguration.cPointer(), peerName_ms) + C.QNetworkAccessManager_connectToHostEncrypted2(this.h, hostName_ms, (C.ushort)(port), sslConfiguration.cPointer(), peerName_ms) } func (this *QNetworkAccessManager) ConnectToHost(hostName string) { @@ -501,7 +501,7 @@ func (this *QNetworkAccessManager) EnableStrictTransportSecurityStore2(enabled b C.QNetworkAccessManager_enableStrictTransportSecurityStore2(this.h, (C.bool)(enabled), storeDir_ms) } -func (this *QNetworkAccessManager) SendCustomRequest32(request *QNetworkRequest, verb []byte, data *qt6.QIODevice) *QNetworkReply { +func (this *QNetworkAccessManager) SendCustomRequest4(request *QNetworkRequest, verb []byte, data *qt6.QIODevice) *QNetworkReply { verb_alias := C.struct_miqt_string{} if len(verb) > 0 { verb_alias.data = (*C.char)(unsafe.Pointer(&verb[0])) @@ -509,23 +509,23 @@ func (this *QNetworkAccessManager) SendCustomRequest32(request *QNetworkRequest, verb_alias.data = (*C.char)(unsafe.Pointer(nil)) } verb_alias.len = C.size_t(len(verb)) - return newQNetworkReply(C.QNetworkAccessManager_sendCustomRequest32(this.h, request.cPointer(), verb_alias, (*C.QIODevice)(data.UnsafePointer()))) + return newQNetworkReply(C.QNetworkAccessManager_sendCustomRequest4(this.h, request.cPointer(), verb_alias, (*C.QIODevice)(data.UnsafePointer()))) } -func (this *QNetworkAccessManager) ConnectToHostEncrypted22(hostName string, port uint16) { +func (this *QNetworkAccessManager) ConnectToHostEncrypted3(hostName string, port uint16) { hostName_ms := C.struct_miqt_string{} hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QNetworkAccessManager_connectToHostEncrypted22(this.h, hostName_ms, (C.uint16_t)(port)) + C.QNetworkAccessManager_connectToHostEncrypted3(this.h, hostName_ms, (C.ushort)(port)) } -func (this *QNetworkAccessManager) ConnectToHostEncrypted3(hostName string, port uint16, sslConfiguration *QSslConfiguration) { +func (this *QNetworkAccessManager) ConnectToHostEncrypted4(hostName string, port uint16, sslConfiguration *QSslConfiguration) { hostName_ms := C.struct_miqt_string{} hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QNetworkAccessManager_connectToHostEncrypted3(this.h, hostName_ms, (C.uint16_t)(port), sslConfiguration.cPointer()) + C.QNetworkAccessManager_connectToHostEncrypted4(this.h, hostName_ms, (C.ushort)(port), sslConfiguration.cPointer()) } func (this *QNetworkAccessManager) ConnectToHost2(hostName string, port uint16) { @@ -533,11 +533,11 @@ func (this *QNetworkAccessManager) ConnectToHost2(hostName string, port uint16) hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QNetworkAccessManager_connectToHost2(this.h, hostName_ms, (C.uint16_t)(port)) + C.QNetworkAccessManager_connectToHost2(this.h, hostName_ms, (C.ushort)(port)) } -func (this *QNetworkAccessManager) SetTransferTimeout1(timeout int) { - C.QNetworkAccessManager_setTransferTimeout1(this.h, (C.int)(timeout)) +func (this *QNetworkAccessManager) SetTransferTimeoutWithTimeout(timeout int) { + C.QNetworkAccessManager_setTransferTimeoutWithTimeout(this.h, (C.int)(timeout)) } // SupportedSchemesImplementation can only be called from a QNetworkAccessManager that was directly constructed. diff --git a/qt6/network/gen_qnetworkaccessmanager.h b/qt6/network/gen_qnetworkaccessmanager.h index a072b9f5..34cdbe35 100644 --- a/qt6/network/gen_qnetworkaccessmanager.h +++ b/qt6/network/gen_qnetworkaccessmanager.h @@ -94,7 +94,7 @@ QNetworkReply* QNetworkAccessManager_post3(QNetworkAccessManager* self, QNetwork QNetworkReply* QNetworkAccessManager_put3(QNetworkAccessManager* self, QNetworkRequest* request, QHttpMultiPart* multiPart); QNetworkReply* QNetworkAccessManager_sendCustomRequest3(QNetworkAccessManager* self, QNetworkRequest* request, struct miqt_string verb, QHttpMultiPart* multiPart); void QNetworkAccessManager_connectToHostEncrypted(QNetworkAccessManager* self, struct miqt_string hostName); -void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration, struct miqt_string peerName); +void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration, struct miqt_string peerName); void QNetworkAccessManager_connectToHost(QNetworkAccessManager* self, struct miqt_string hostName); void QNetworkAccessManager_setRedirectPolicy(QNetworkAccessManager* self, int policy); int QNetworkAccessManager_redirectPolicy(const QNetworkAccessManager* self); @@ -118,11 +118,11 @@ QNetworkReply* QNetworkAccessManager_createRequest(QNetworkAccessManager* self, struct miqt_string QNetworkAccessManager_tr2(const char* s, const char* c); struct miqt_string QNetworkAccessManager_tr3(const char* s, const char* c, int n); void QNetworkAccessManager_enableStrictTransportSecurityStore2(QNetworkAccessManager* self, bool enabled, struct miqt_string storeDir); -QNetworkReply* QNetworkAccessManager_sendCustomRequest32(QNetworkAccessManager* self, QNetworkRequest* request, struct miqt_string verb, QIODevice* data); -void QNetworkAccessManager_connectToHostEncrypted22(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port); -void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration); -void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port); -void QNetworkAccessManager_setTransferTimeout1(QNetworkAccessManager* self, int timeout); +QNetworkReply* QNetworkAccessManager_sendCustomRequest4(QNetworkAccessManager* self, QNetworkRequest* request, struct miqt_string verb, QIODevice* data); +void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port); +void QNetworkAccessManager_connectToHostEncrypted4(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration); +void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port); +void QNetworkAccessManager_setTransferTimeoutWithTimeout(QNetworkAccessManager* self, int timeout); bool QNetworkAccessManager_override_virtual_supportedSchemes(void* self, intptr_t slot); struct miqt_array /* of struct miqt_string */ QNetworkAccessManager_virtualbase_supportedSchemes(const void* self); bool QNetworkAccessManager_override_virtual_createRequest(void* self, intptr_t slot); diff --git a/qt6/network/gen_qnetworkcookie.cpp b/qt6/network/gen_qnetworkcookie.cpp index a0903c34..c4773697 100644 --- a/qt6/network/gen_qnetworkcookie.cpp +++ b/qt6/network/gen_qnetworkcookie.cpp @@ -180,7 +180,7 @@ struct miqt_array /* of QNetworkCookie* */ QNetworkCookie_parseCookies(struct m return _out; } -struct miqt_string QNetworkCookie_toRawForm1(const QNetworkCookie* self, int form) { +struct miqt_string QNetworkCookie_toRawFormWithForm(const QNetworkCookie* self, int form) { QByteArray _qb = self->toRawForm(static_cast(form)); struct miqt_string _ms; _ms.len = _qb.length(); diff --git a/qt6/network/gen_qnetworkcookie.go b/qt6/network/gen_qnetworkcookie.go index ffec0333..1583f50f 100644 --- a/qt6/network/gen_qnetworkcookie.go +++ b/qt6/network/gen_qnetworkcookie.go @@ -261,8 +261,8 @@ func QNetworkCookie_ParseCookies(cookieString []byte) []QNetworkCookie { return _ret } -func (this *QNetworkCookie) ToRawForm1(form QNetworkCookie__RawForm) []byte { - var _bytearray C.struct_miqt_string = C.QNetworkCookie_toRawForm1(this.h, (C.int)(form)) +func (this *QNetworkCookie) ToRawFormWithForm(form QNetworkCookie__RawForm) []byte { + var _bytearray C.struct_miqt_string = C.QNetworkCookie_toRawFormWithForm(this.h, (C.int)(form)) _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) C.free(unsafe.Pointer(_bytearray.data)) return _ret diff --git a/qt6/network/gen_qnetworkcookie.h b/qt6/network/gen_qnetworkcookie.h index eb807aaf..72bc0293 100644 --- a/qt6/network/gen_qnetworkcookie.h +++ b/qt6/network/gen_qnetworkcookie.h @@ -53,7 +53,7 @@ struct miqt_string QNetworkCookie_toRawForm(const QNetworkCookie* self); bool QNetworkCookie_hasSameIdentifier(const QNetworkCookie* self, QNetworkCookie* other); void QNetworkCookie_normalize(QNetworkCookie* self, QUrl* url); struct miqt_array /* of QNetworkCookie* */ QNetworkCookie_parseCookies(struct miqt_string cookieString); -struct miqt_string QNetworkCookie_toRawForm1(const QNetworkCookie* self, int form); +struct miqt_string QNetworkCookie_toRawFormWithForm(const QNetworkCookie* self, int form); void QNetworkCookie_delete(QNetworkCookie* self); #ifdef __cplusplus diff --git a/qt6/network/gen_qnetworkdatagram.cpp b/qt6/network/gen_qnetworkdatagram.cpp index 9987452c..594b1349 100644 --- a/qt6/network/gen_qnetworkdatagram.cpp +++ b/qt6/network/gen_qnetworkdatagram.cpp @@ -30,7 +30,7 @@ QNetworkDatagram* QNetworkDatagram_new4(struct miqt_string data, QHostAddress* d return new QNetworkDatagram(data_QByteArray, *destinationAddress); } -QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, uint16_t port) { +QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, unsigned short port) { QByteArray data_QByteArray(data.data, data.len); return new QNetworkDatagram(data_QByteArray, *destinationAddress, static_cast(port)); } @@ -84,7 +84,7 @@ void QNetworkDatagram_setSender(QNetworkDatagram* self, QHostAddress* address) { self->setSender(*address); } -void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, uint16_t port) { +void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, unsigned short port) { self->setDestination(*address, static_cast(port)); } @@ -115,7 +115,7 @@ QNetworkDatagram* QNetworkDatagram_makeReply(const QNetworkDatagram* self, struc return new QNetworkDatagram(self->makeReply(payload_QByteArray)); } -void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, uint16_t port) { +void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, unsigned short port) { self->setSender(*address, static_cast(port)); } diff --git a/qt6/network/gen_qnetworkdatagram.go b/qt6/network/gen_qnetworkdatagram.go index 156b85bd..b3fafe93 100644 --- a/qt6/network/gen_qnetworkdatagram.go +++ b/qt6/network/gen_qnetworkdatagram.go @@ -93,7 +93,7 @@ func NewQNetworkDatagram5(data []byte, destinationAddress *QHostAddress, port ui } data_alias.len = C.size_t(len(data)) - return newQNetworkDatagram(C.QNetworkDatagram_new5(data_alias, destinationAddress.cPointer(), (C.uint16_t)(port))) + return newQNetworkDatagram(C.QNetworkDatagram_new5(data_alias, destinationAddress.cPointer(), (C.ushort)(port))) } func (this *QNetworkDatagram) OperatorAssign(other *QNetworkDatagram) { @@ -149,7 +149,7 @@ func (this *QNetworkDatagram) SetSender(address *QHostAddress) { } func (this *QNetworkDatagram) SetDestination(address *QHostAddress, port uint16) { - C.QNetworkDatagram_setDestination(this.h, address.cPointer(), (C.uint16_t)(port)) + C.QNetworkDatagram_setDestination(this.h, address.cPointer(), (C.ushort)(port)) } func (this *QNetworkDatagram) HopLimit() int { @@ -192,7 +192,7 @@ func (this *QNetworkDatagram) MakeReply(payload []byte) *QNetworkDatagram { } func (this *QNetworkDatagram) SetSender2(address *QHostAddress, port uint16) { - C.QNetworkDatagram_setSender2(this.h, address.cPointer(), (C.uint16_t)(port)) + C.QNetworkDatagram_setSender2(this.h, address.cPointer(), (C.ushort)(port)) } // Delete this object from C++ memory. diff --git a/qt6/network/gen_qnetworkdatagram.h b/qt6/network/gen_qnetworkdatagram.h index 377dd3d4..0d860b08 100644 --- a/qt6/network/gen_qnetworkdatagram.h +++ b/qt6/network/gen_qnetworkdatagram.h @@ -26,7 +26,7 @@ QNetworkDatagram* QNetworkDatagram_new(); QNetworkDatagram* QNetworkDatagram_new2(struct miqt_string data); QNetworkDatagram* QNetworkDatagram_new3(QNetworkDatagram* other); QNetworkDatagram* QNetworkDatagram_new4(struct miqt_string data, QHostAddress* destinationAddress); -QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, uint16_t port); +QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, unsigned short port); void QNetworkDatagram_operatorAssign(QNetworkDatagram* self, QNetworkDatagram* other); void QNetworkDatagram_swap(QNetworkDatagram* self, QNetworkDatagram* other); void QNetworkDatagram_clear(QNetworkDatagram* self); @@ -39,13 +39,13 @@ QHostAddress* QNetworkDatagram_destinationAddress(const QNetworkDatagram* self); int QNetworkDatagram_senderPort(const QNetworkDatagram* self); int QNetworkDatagram_destinationPort(const QNetworkDatagram* self); void QNetworkDatagram_setSender(QNetworkDatagram* self, QHostAddress* address); -void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, uint16_t port); +void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, unsigned short port); int QNetworkDatagram_hopLimit(const QNetworkDatagram* self); void QNetworkDatagram_setHopLimit(QNetworkDatagram* self, int count); struct miqt_string QNetworkDatagram_data(const QNetworkDatagram* self); void QNetworkDatagram_setData(QNetworkDatagram* self, struct miqt_string data); QNetworkDatagram* QNetworkDatagram_makeReply(const QNetworkDatagram* self, struct miqt_string payload); -void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, uint16_t port); +void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, unsigned short port); void QNetworkDatagram_delete(QNetworkDatagram* self); #ifdef __cplusplus diff --git a/qt6/network/gen_qnetworkproxy.cpp b/qt6/network/gen_qnetworkproxy.cpp index bbe122a0..7b180205 100644 --- a/qt6/network/gen_qnetworkproxy.cpp +++ b/qt6/network/gen_qnetworkproxy.cpp @@ -33,7 +33,7 @@ QNetworkProxyQuery* QNetworkProxyQuery_new3(struct miqt_string hostname, int por return new QNetworkProxyQuery(hostname_QString, static_cast(port)); } -QNetworkProxyQuery* QNetworkProxyQuery_new4(uint16_t bindPort) { +QNetworkProxyQuery* QNetworkProxyQuery_new4(unsigned short bindPort) { return new QNetworkProxyQuery(static_cast(bindPort)); } @@ -57,12 +57,12 @@ QNetworkProxyQuery* QNetworkProxyQuery_new8(struct miqt_string hostname, int por return new QNetworkProxyQuery(hostname_QString, static_cast(port), protocolTag_QString, static_cast(queryType)); } -QNetworkProxyQuery* QNetworkProxyQuery_new9(uint16_t bindPort, struct miqt_string protocolTag) { +QNetworkProxyQuery* QNetworkProxyQuery_new9(unsigned short bindPort, struct miqt_string protocolTag) { QString protocolTag_QString = QString::fromUtf8(protocolTag.data, protocolTag.len); return new QNetworkProxyQuery(static_cast(bindPort), protocolTag_QString); } -QNetworkProxyQuery* QNetworkProxyQuery_new10(uint16_t bindPort, struct miqt_string protocolTag, int queryType) { +QNetworkProxyQuery* QNetworkProxyQuery_new10(unsigned short bindPort, struct miqt_string protocolTag, int queryType) { QString protocolTag_QString = QString::fromUtf8(protocolTag.data, protocolTag.len); return new QNetworkProxyQuery(static_cast(bindPort), protocolTag_QString, static_cast(queryType)); } @@ -169,18 +169,18 @@ QNetworkProxy* QNetworkProxy_new4(int type, struct miqt_string hostName) { return new QNetworkProxy(static_cast(type), hostName_QString); } -QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, uint16_t port) { +QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); return new QNetworkProxy(static_cast(type), hostName_QString, static_cast(port)); } -QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user) { +QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString user_QString = QString::fromUtf8(user.data, user.len); return new QNetworkProxy(static_cast(type), hostName_QString, static_cast(port), user_QString); } -QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user, struct miqt_string password) { +QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user, struct miqt_string password) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString user_QString = QString::fromUtf8(user.data, user.len); QString password_QString = QString::fromUtf8(password.data, password.len); @@ -277,13 +277,13 @@ struct miqt_string QNetworkProxy_hostName(const QNetworkProxy* self) { return _ms; } -void QNetworkProxy_setPort(QNetworkProxy* self, uint16_t port) { +void QNetworkProxy_setPort(QNetworkProxy* self, unsigned short port) { self->setPort(static_cast(port)); } -uint16_t QNetworkProxy_port(const QNetworkProxy* self) { +unsigned short QNetworkProxy_port(const QNetworkProxy* self) { quint16 _ret = self->port(); - return static_cast(_ret); + return static_cast(_ret); } void QNetworkProxy_setApplicationProxy(QNetworkProxy* proxy) { @@ -437,7 +437,7 @@ void QNetworkProxyFactory_operatorAssign(QNetworkProxyFactory* self, QNetworkPro self->operator=(*param1); } -struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_systemProxyForQuery1(QNetworkProxyQuery* query) { +struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_systemProxyForQueryWithQuery(QNetworkProxyQuery* query) { QList _ret = QNetworkProxyFactory::systemProxyForQuery(*query); // Convert QList<> from C++ memory to manually-managed C memory QNetworkProxy** _arr = static_cast(malloc(sizeof(QNetworkProxy*) * _ret.length())); diff --git a/qt6/network/gen_qnetworkproxy.go b/qt6/network/gen_qnetworkproxy.go index c62e5941..003b036a 100644 --- a/qt6/network/gen_qnetworkproxy.go +++ b/qt6/network/gen_qnetworkproxy.go @@ -106,7 +106,7 @@ func NewQNetworkProxyQuery3(hostname string, port int) *QNetworkProxyQuery { // NewQNetworkProxyQuery4 constructs a new QNetworkProxyQuery object. func NewQNetworkProxyQuery4(bindPort uint16) *QNetworkProxyQuery { - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new4((C.uint16_t)(bindPort))) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new4((C.ushort)(bindPort))) } // NewQNetworkProxyQuery5 constructs a new QNetworkProxyQuery object. @@ -156,7 +156,7 @@ func NewQNetworkProxyQuery9(bindPort uint16, protocolTag string) *QNetworkProxyQ protocolTag_ms.len = C.size_t(len(protocolTag)) defer C.free(unsafe.Pointer(protocolTag_ms.data)) - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new9((C.uint16_t)(bindPort), protocolTag_ms)) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new9((C.ushort)(bindPort), protocolTag_ms)) } // NewQNetworkProxyQuery10 constructs a new QNetworkProxyQuery object. @@ -166,7 +166,7 @@ func NewQNetworkProxyQuery10(bindPort uint16, protocolTag string, queryType QNet protocolTag_ms.len = C.size_t(len(protocolTag)) defer C.free(unsafe.Pointer(protocolTag_ms.data)) - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new10((C.uint16_t)(bindPort), protocolTag_ms, (C.int)(queryType))) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new10((C.ushort)(bindPort), protocolTag_ms, (C.int)(queryType))) } func (this *QNetworkProxyQuery) OperatorAssign(other *QNetworkProxyQuery) { @@ -330,7 +330,7 @@ func NewQNetworkProxy5(typeVal QNetworkProxy__ProxyType, hostName string, port u hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - return newQNetworkProxy(C.QNetworkProxy_new5((C.int)(typeVal), hostName_ms, (C.uint16_t)(port))) + return newQNetworkProxy(C.QNetworkProxy_new5((C.int)(typeVal), hostName_ms, (C.ushort)(port))) } // NewQNetworkProxy6 constructs a new QNetworkProxy object. @@ -344,7 +344,7 @@ func NewQNetworkProxy6(typeVal QNetworkProxy__ProxyType, hostName string, port u user_ms.len = C.size_t(len(user)) defer C.free(unsafe.Pointer(user_ms.data)) - return newQNetworkProxy(C.QNetworkProxy_new6((C.int)(typeVal), hostName_ms, (C.uint16_t)(port), user_ms)) + return newQNetworkProxy(C.QNetworkProxy_new6((C.int)(typeVal), hostName_ms, (C.ushort)(port), user_ms)) } // NewQNetworkProxy7 constructs a new QNetworkProxy object. @@ -362,7 +362,7 @@ func NewQNetworkProxy7(typeVal QNetworkProxy__ProxyType, hostName string, port u password_ms.len = C.size_t(len(password)) defer C.free(unsafe.Pointer(password_ms.data)) - return newQNetworkProxy(C.QNetworkProxy_new7((C.int)(typeVal), hostName_ms, (C.uint16_t)(port), user_ms, password_ms)) + return newQNetworkProxy(C.QNetworkProxy_new7((C.int)(typeVal), hostName_ms, (C.ushort)(port), user_ms, password_ms)) } func (this *QNetworkProxy) OperatorAssign(other *QNetworkProxy) { @@ -451,7 +451,7 @@ func (this *QNetworkProxy) HostName() string { } func (this *QNetworkProxy) SetPort(port uint16) { - C.QNetworkProxy_setPort(this.h, (C.uint16_t)(port)) + C.QNetworkProxy_setPort(this.h, (C.ushort)(port)) } func (this *QNetworkProxy) Port() uint16 { @@ -638,8 +638,8 @@ func (this *QNetworkProxyFactory) OperatorAssign(param1 *QNetworkProxyFactory) { C.QNetworkProxyFactory_operatorAssign(this.h, param1.cPointer()) } -func QNetworkProxyFactory_SystemProxyForQuery1(query *QNetworkProxyQuery) []QNetworkProxy { - var _ma C.struct_miqt_array = C.QNetworkProxyFactory_systemProxyForQuery1(query.cPointer()) +func QNetworkProxyFactory_SystemProxyForQueryWithQuery(query *QNetworkProxyQuery) []QNetworkProxy { + var _ma C.struct_miqt_array = C.QNetworkProxyFactory_systemProxyForQueryWithQuery(query.cPointer()) _ret := make([]QNetworkProxy, int(_ma.len)) _outCast := (*[0xffff]*C.QNetworkProxy)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt6/network/gen_qnetworkproxy.h b/qt6/network/gen_qnetworkproxy.h index 6ed3d729..d4250d76 100644 --- a/qt6/network/gen_qnetworkproxy.h +++ b/qt6/network/gen_qnetworkproxy.h @@ -31,13 +31,13 @@ typedef struct QVariant QVariant; QNetworkProxyQuery* QNetworkProxyQuery_new(); QNetworkProxyQuery* QNetworkProxyQuery_new2(QUrl* requestUrl); QNetworkProxyQuery* QNetworkProxyQuery_new3(struct miqt_string hostname, int port); -QNetworkProxyQuery* QNetworkProxyQuery_new4(uint16_t bindPort); +QNetworkProxyQuery* QNetworkProxyQuery_new4(unsigned short bindPort); QNetworkProxyQuery* QNetworkProxyQuery_new5(QNetworkProxyQuery* other); QNetworkProxyQuery* QNetworkProxyQuery_new6(QUrl* requestUrl, int queryType); QNetworkProxyQuery* QNetworkProxyQuery_new7(struct miqt_string hostname, int port, struct miqt_string protocolTag); QNetworkProxyQuery* QNetworkProxyQuery_new8(struct miqt_string hostname, int port, struct miqt_string protocolTag, int queryType); -QNetworkProxyQuery* QNetworkProxyQuery_new9(uint16_t bindPort, struct miqt_string protocolTag); -QNetworkProxyQuery* QNetworkProxyQuery_new10(uint16_t bindPort, struct miqt_string protocolTag, int queryType); +QNetworkProxyQuery* QNetworkProxyQuery_new9(unsigned short bindPort, struct miqt_string protocolTag); +QNetworkProxyQuery* QNetworkProxyQuery_new10(unsigned short bindPort, struct miqt_string protocolTag, int queryType); void QNetworkProxyQuery_operatorAssign(QNetworkProxyQuery* self, QNetworkProxyQuery* other); void QNetworkProxyQuery_swap(QNetworkProxyQuery* self, QNetworkProxyQuery* other); bool QNetworkProxyQuery_operatorEqual(const QNetworkProxyQuery* self, QNetworkProxyQuery* other); @@ -60,9 +60,9 @@ QNetworkProxy* QNetworkProxy_new(); QNetworkProxy* QNetworkProxy_new2(int type); QNetworkProxy* QNetworkProxy_new3(QNetworkProxy* other); QNetworkProxy* QNetworkProxy_new4(int type, struct miqt_string hostName); -QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, uint16_t port); -QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user); -QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user, struct miqt_string password); +QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, unsigned short port); +QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user); +QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user, struct miqt_string password); void QNetworkProxy_operatorAssign(QNetworkProxy* self, QNetworkProxy* other); void QNetworkProxy_swap(QNetworkProxy* self, QNetworkProxy* other); bool QNetworkProxy_operatorEqual(const QNetworkProxy* self, QNetworkProxy* other); @@ -79,8 +79,8 @@ void QNetworkProxy_setPassword(QNetworkProxy* self, struct miqt_string password) struct miqt_string QNetworkProxy_password(const QNetworkProxy* self); void QNetworkProxy_setHostName(QNetworkProxy* self, struct miqt_string hostName); struct miqt_string QNetworkProxy_hostName(const QNetworkProxy* self); -void QNetworkProxy_setPort(QNetworkProxy* self, uint16_t port); -uint16_t QNetworkProxy_port(const QNetworkProxy* self); +void QNetworkProxy_setPort(QNetworkProxy* self, unsigned short port); +unsigned short QNetworkProxy_port(const QNetworkProxy* self); void QNetworkProxy_setApplicationProxy(QNetworkProxy* proxy); QNetworkProxy* QNetworkProxy_applicationProxy(); QVariant* QNetworkProxy_header(const QNetworkProxy* self, int header); @@ -99,7 +99,7 @@ void QNetworkProxyFactory_setApplicationProxyFactory(QNetworkProxyFactory* facto struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_proxyForQuery(QNetworkProxyQuery* query); struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_systemProxyForQuery(); void QNetworkProxyFactory_operatorAssign(QNetworkProxyFactory* self, QNetworkProxyFactory* param1); -struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_systemProxyForQuery1(QNetworkProxyQuery* query); +struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_systemProxyForQueryWithQuery(QNetworkProxyQuery* query); bool QNetworkProxyFactory_override_virtual_queryProxy(void* self, intptr_t slot); struct miqt_array /* of QNetworkProxy* */ QNetworkProxyFactory_virtualbase_queryProxy(void* self, QNetworkProxyQuery* query); void QNetworkProxyFactory_delete(QNetworkProxyFactory* self); diff --git a/qt6/network/gen_qnetworkrequest.cpp b/qt6/network/gen_qnetworkrequest.cpp index f3a2caea..9a77676b 100644 --- a/qt6/network/gen_qnetworkrequest.cpp +++ b/qt6/network/gen_qnetworkrequest.cpp @@ -189,7 +189,7 @@ QVariant* QNetworkRequest_attribute2(const QNetworkRequest* self, int code, QVar return new QVariant(self->attribute(static_cast(code), *defaultValue)); } -void QNetworkRequest_setTransferTimeout1(QNetworkRequest* self, int timeout) { +void QNetworkRequest_setTransferTimeoutWithTimeout(QNetworkRequest* self, int timeout) { self->setTransferTimeout(static_cast(timeout)); } diff --git a/qt6/network/gen_qnetworkrequest.go b/qt6/network/gen_qnetworkrequest.go index a5e633dd..5f470ff1 100644 --- a/qt6/network/gen_qnetworkrequest.go +++ b/qt6/network/gen_qnetworkrequest.go @@ -339,8 +339,8 @@ func (this *QNetworkRequest) Attribute2(code QNetworkRequest__Attribute, default return _goptr } -func (this *QNetworkRequest) SetTransferTimeout1(timeout int) { - C.QNetworkRequest_setTransferTimeout1(this.h, (C.int)(timeout)) +func (this *QNetworkRequest) SetTransferTimeoutWithTimeout(timeout int) { + C.QNetworkRequest_setTransferTimeoutWithTimeout(this.h, (C.int)(timeout)) } // Delete this object from C++ memory. diff --git a/qt6/network/gen_qnetworkrequest.h b/qt6/network/gen_qnetworkrequest.h index 2085459f..410eb5a9 100644 --- a/qt6/network/gen_qnetworkrequest.h +++ b/qt6/network/gen_qnetworkrequest.h @@ -64,7 +64,7 @@ void QNetworkRequest_setDecompressedSafetyCheckThreshold(QNetworkRequest* self, int QNetworkRequest_transferTimeout(const QNetworkRequest* self); void QNetworkRequest_setTransferTimeout(QNetworkRequest* self); QVariant* QNetworkRequest_attribute2(const QNetworkRequest* self, int code, QVariant* defaultValue); -void QNetworkRequest_setTransferTimeout1(QNetworkRequest* self, int timeout); +void QNetworkRequest_setTransferTimeoutWithTimeout(QNetworkRequest* self, int timeout); void QNetworkRequest_delete(QNetworkRequest* self); #ifdef __cplusplus diff --git a/qt6/network/gen_qsctpsocket.cpp b/qt6/network/gen_qsctpsocket.cpp index dadf8c95..313d6c9c 100644 --- a/qt6/network/gen_qsctpsocket.cpp +++ b/qt6/network/gen_qsctpsocket.cpp @@ -27,8 +27,8 @@ void miqt_exec_callback_QSctpSocket_disconnectFromHost(QSctpSocket*, intptr_t); long long miqt_exec_callback_QSctpSocket_readData(QSctpSocket*, intptr_t, char*, long long); long long miqt_exec_callback_QSctpSocket_readLineData(QSctpSocket*, intptr_t, char*, long long); void miqt_exec_callback_QSctpSocket_resume(QSctpSocket*, intptr_t); -bool miqt_exec_callback_QSctpSocket_bind(QSctpSocket*, intptr_t, QHostAddress*, uint16_t, int); -void miqt_exec_callback_QSctpSocket_connectToHost(QSctpSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +bool miqt_exec_callback_QSctpSocket_bind(QSctpSocket*, intptr_t, QHostAddress*, unsigned short, int); +void miqt_exec_callback_QSctpSocket_connectToHost(QSctpSocket*, intptr_t, struct miqt_string, unsigned short, int, int); long long miqt_exec_callback_QSctpSocket_bytesAvailable(const QSctpSocket*, intptr_t); long long miqt_exec_callback_QSctpSocket_bytesToWrite(const QSctpSocket*, intptr_t); void miqt_exec_callback_QSctpSocket_setReadBufferSize(QSctpSocket*, intptr_t, long long); @@ -176,7 +176,7 @@ public: // Cast returned reference into pointer QHostAddress* sigval1 = const_cast(&address_ret); quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QAbstractSocket::BindMode mode_ret = mode; int sigval3 = static_cast(mode_ret); @@ -185,7 +185,7 @@ public: return callback_return_value; } - friend bool QSctpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); + friend bool QSctpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); // cgo.Handle value for overwritten implementation intptr_t handle__connectToHost = 0; @@ -206,7 +206,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODeviceBase::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -217,7 +217,7 @@ public: } - friend void QSctpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QSctpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__bytesAvailable = 0; @@ -745,9 +745,9 @@ public: // Wrappers to allow calling protected methods: friend void QSctpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QSctpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QSctpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QSctpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QSctpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QSctpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QSctpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QSctpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QSctpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QSctpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -931,7 +931,7 @@ bool QSctpSocket_override_virtual_bind(void* self, intptr_t slot) { return true; } -bool QSctpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode) { +bool QSctpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode) { return ( (MiqtVirtualQSctpSocket*)(self) )->QSctpSocket::bind(*address, static_cast(port), static_cast(mode)); @@ -947,7 +947,7 @@ bool QSctpSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QSctpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QSctpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQSctpSocket*)(self) )->QSctpSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1435,7 +1435,7 @@ void QSctpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self } -void QSctpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QSctpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQSctpSocket* self_cast = dynamic_cast( (QSctpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1461,7 +1461,7 @@ void QSctpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* sel } -void QSctpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QSctpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQSctpSocket* self_cast = dynamic_cast( (QSctpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/network/gen_qsctpsocket.go b/qt6/network/gen_qsctpsocket.go index 989d2f86..8a3dcdb6 100644 --- a/qt6/network/gen_qsctpsocket.go +++ b/qt6/network/gen_qsctpsocket.go @@ -162,7 +162,7 @@ func (this *QSctpSocket) SetSocketError(socketError QAbstractSocket__SocketError func (this *QSctpSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QSctpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QSctpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -186,7 +186,7 @@ func (this *QSctpSocket) SetLocalAddress(address *QHostAddress) { func (this *QSctpSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QSctpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QSctpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -445,7 +445,7 @@ func miqt_exec_callback_QSctpSocket_resume(self *C.QSctpSocket, cb C.intptr_t) { func (this *QSctpSocket) callVirtualBase_Bind(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QSctpSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QSctpSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.ushort)(port), (C.int)(mode))) } func (this *QSctpSocket) OnBind(slot func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) { @@ -456,7 +456,7 @@ func (this *QSctpSocket) OnBind(slot func(super func(address *QHostAddress, port } //export miqt_exec_callback_QSctpSocket_bind -func miqt_exec_callback_QSctpSocket_bind(self *C.QSctpSocket, cb C.intptr_t, address *C.QHostAddress, port C.uint16_t, mode C.int) C.bool { +func miqt_exec_callback_QSctpSocket_bind(self *C.QSctpSocket, cb C.intptr_t, address *C.QHostAddress, port C.ushort, mode C.int) C.bool { gofunc, ok := cgo.Handle(cb).Value().(func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -481,7 +481,7 @@ func (this *QSctpSocket) callVirtualBase_ConnectToHost(hostName string, port uin hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSctpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QSctpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QSctpSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -492,7 +492,7 @@ func (this *QSctpSocket) OnConnectToHost(slot func(super func(hostName string, p } //export miqt_exec_callback_QSctpSocket_connectToHost -func miqt_exec_callback_QSctpSocket_connectToHost(self *C.QSctpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QSctpSocket_connectToHost(self *C.QSctpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/network/gen_qsctpsocket.h b/qt6/network/gen_qsctpsocket.h index 11054edf..27f55109 100644 --- a/qt6/network/gen_qsctpsocket.h +++ b/qt6/network/gen_qsctpsocket.h @@ -74,9 +74,9 @@ long long QSctpSocket_virtualbase_readLineData(void* self, char* data, long long bool QSctpSocket_override_virtual_resume(void* self, intptr_t slot); void QSctpSocket_virtualbase_resume(void* self); bool QSctpSocket_override_virtual_bind(void* self, intptr_t slot); -bool QSctpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); +bool QSctpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); bool QSctpSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QSctpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QSctpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QSctpSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); long long QSctpSocket_virtualbase_bytesAvailable(const void* self); bool QSctpSocket_override_virtual_bytesToWrite(void* self, intptr_t slot); @@ -135,9 +135,9 @@ bool QSctpSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QSctpSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QSctpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QSctpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QSctpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QSctpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QSctpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QSctpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QSctpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QSctpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QSctpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QSctpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt6/network/gen_qsslcertificate.cpp b/qt6/network/gen_qsslcertificate.cpp index c72ef2d3..1a247f2d 100644 --- a/qt6/network/gen_qsslcertificate.cpp +++ b/qt6/network/gen_qsslcertificate.cpp @@ -368,7 +368,7 @@ void* QSslCertificate_handle(const QSslCertificate* self) { return static_cast(_ret); } -struct miqt_string QSslCertificate_digest1(const QSslCertificate* self, int algorithm) { +struct miqt_string QSslCertificate_digestWithAlgorithm(const QSslCertificate* self, int algorithm) { QByteArray _qb = self->digest(static_cast(algorithm)); struct miqt_string _ms; _ms.len = _qb.length(); @@ -452,7 +452,7 @@ struct miqt_array /* of QSslError* */ QSslCertificate_verify2(struct miqt_array return _out; } -bool QSslCertificate_importPkcs124(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates) { +bool QSslCertificate_importPkcs122(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates) { QList caCertificates_QList; caCertificates_QList.reserve(caCertificates.len); QSslCertificate** caCertificates_arr = static_cast(caCertificates.data); @@ -462,7 +462,7 @@ bool QSslCertificate_importPkcs124(QIODevice* device, QSslKey* key, QSslCertific return QSslCertificate::importPkcs12(device, key, cert, &caCertificates_QList); } -bool QSslCertificate_importPkcs125(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates, struct miqt_string passPhrase) { +bool QSslCertificate_importPkcs123(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates, struct miqt_string passPhrase) { QList caCertificates_QList; caCertificates_QList.reserve(caCertificates.len); QSslCertificate** caCertificates_arr = static_cast(caCertificates.data); diff --git a/qt6/network/gen_qsslcertificate.go b/qt6/network/gen_qsslcertificate.go index ef724efb..f64fbeb6 100644 --- a/qt6/network/gen_qsslcertificate.go +++ b/qt6/network/gen_qsslcertificate.go @@ -401,8 +401,8 @@ func (this *QSslCertificate) Handle() unsafe.Pointer { return (unsafe.Pointer)(C.QSslCertificate_handle(this.h)) } -func (this *QSslCertificate) Digest1(algorithm qt6.QCryptographicHash__Algorithm) []byte { - var _bytearray C.struct_miqt_string = C.QSslCertificate_digest1(this.h, (C.int)(algorithm)) +func (this *QSslCertificate) DigestWithAlgorithm(algorithm qt6.QCryptographicHash__Algorithm) []byte { + var _bytearray C.struct_miqt_string = C.QSslCertificate_digestWithAlgorithm(this.h, (C.int)(algorithm)) _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) C.free(unsafe.Pointer(_bytearray.data)) return _ret @@ -493,17 +493,17 @@ func QSslCertificate_Verify2(certificateChain []QSslCertificate, hostName string return _ret } -func QSslCertificate_ImportPkcs124(device *qt6.QIODevice, key *QSslKey, cert *QSslCertificate, caCertificates []QSslCertificate) bool { +func QSslCertificate_ImportPkcs122(device *qt6.QIODevice, key *QSslKey, cert *QSslCertificate, caCertificates []QSslCertificate) bool { caCertificates_CArray := (*[0xffff]*C.QSslCertificate)(C.malloc(C.size_t(8 * len(caCertificates)))) defer C.free(unsafe.Pointer(caCertificates_CArray)) for i := range caCertificates { caCertificates_CArray[i] = caCertificates[i].cPointer() } caCertificates_ma := C.struct_miqt_array{len: C.size_t(len(caCertificates)), data: unsafe.Pointer(caCertificates_CArray)} - return (bool)(C.QSslCertificate_importPkcs124((*C.QIODevice)(device.UnsafePointer()), key.cPointer(), cert.cPointer(), caCertificates_ma)) + return (bool)(C.QSslCertificate_importPkcs122((*C.QIODevice)(device.UnsafePointer()), key.cPointer(), cert.cPointer(), caCertificates_ma)) } -func QSslCertificate_ImportPkcs125(device *qt6.QIODevice, key *QSslKey, cert *QSslCertificate, caCertificates []QSslCertificate, passPhrase []byte) bool { +func QSslCertificate_ImportPkcs123(device *qt6.QIODevice, key *QSslKey, cert *QSslCertificate, caCertificates []QSslCertificate, passPhrase []byte) bool { caCertificates_CArray := (*[0xffff]*C.QSslCertificate)(C.malloc(C.size_t(8 * len(caCertificates)))) defer C.free(unsafe.Pointer(caCertificates_CArray)) for i := range caCertificates { @@ -517,7 +517,7 @@ func QSslCertificate_ImportPkcs125(device *qt6.QIODevice, key *QSslKey, cert *QS passPhrase_alias.data = (*C.char)(unsafe.Pointer(nil)) } passPhrase_alias.len = C.size_t(len(passPhrase)) - return (bool)(C.QSslCertificate_importPkcs125((*C.QIODevice)(device.UnsafePointer()), key.cPointer(), cert.cPointer(), caCertificates_ma, passPhrase_alias)) + return (bool)(C.QSslCertificate_importPkcs123((*C.QIODevice)(device.UnsafePointer()), key.cPointer(), cert.cPointer(), caCertificates_ma, passPhrase_alias)) } // Delete this object from C++ memory. diff --git a/qt6/network/gen_qsslcertificate.h b/qt6/network/gen_qsslcertificate.h index 6cd34bda..3ac9b18b 100644 --- a/qt6/network/gen_qsslcertificate.h +++ b/qt6/network/gen_qsslcertificate.h @@ -68,14 +68,14 @@ struct miqt_array /* of QSslCertificate* */ QSslCertificate_fromData(struct miq struct miqt_array /* of QSslError* */ QSslCertificate_verify(struct miqt_array /* of QSslCertificate* */ certificateChain); bool QSslCertificate_importPkcs12(QIODevice* device, QSslKey* key, QSslCertificate* cert); void* QSslCertificate_handle(const QSslCertificate* self); -struct miqt_string QSslCertificate_digest1(const QSslCertificate* self, int algorithm); +struct miqt_string QSslCertificate_digestWithAlgorithm(const QSslCertificate* self, int algorithm); struct miqt_array /* of QSslCertificate* */ QSslCertificate_fromPath2(struct miqt_string path, int format); struct miqt_array /* of QSslCertificate* */ QSslCertificate_fromPath3(struct miqt_string path, int format, int syntax); struct miqt_array /* of QSslCertificate* */ QSslCertificate_fromDevice2(QIODevice* device, int format); struct miqt_array /* of QSslCertificate* */ QSslCertificate_fromData2(struct miqt_string data, int format); struct miqt_array /* of QSslError* */ QSslCertificate_verify2(struct miqt_array /* of QSslCertificate* */ certificateChain, struct miqt_string hostName); -bool QSslCertificate_importPkcs124(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates); -bool QSslCertificate_importPkcs125(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates, struct miqt_string passPhrase); +bool QSslCertificate_importPkcs122(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates); +bool QSslCertificate_importPkcs123(QIODevice* device, QSslKey* key, QSslCertificate* cert, struct miqt_array /* of QSslCertificate* */ caCertificates, struct miqt_string passPhrase); void QSslCertificate_delete(QSslCertificate* self); #ifdef __cplusplus diff --git a/qt6/network/gen_qssldiffiehellmanparameters.cpp b/qt6/network/gen_qssldiffiehellmanparameters.cpp index 3d791f42..64d83d4a 100644 --- a/qt6/network/gen_qssldiffiehellmanparameters.cpp +++ b/qt6/network/gen_qssldiffiehellmanparameters.cpp @@ -73,7 +73,7 @@ QSslDiffieHellmanParameters* QSslDiffieHellmanParameters_fromEncoded2(struct miq return new QSslDiffieHellmanParameters(QSslDiffieHellmanParameters::fromEncoded(encoded_QByteArray, static_cast(format))); } -QSslDiffieHellmanParameters* QSslDiffieHellmanParameters_fromEncoded22(QIODevice* device, int format) { +QSslDiffieHellmanParameters* QSslDiffieHellmanParameters_fromEncoded3(QIODevice* device, int format) { return new QSslDiffieHellmanParameters(QSslDiffieHellmanParameters::fromEncoded(device, static_cast(format))); } diff --git a/qt6/network/gen_qssldiffiehellmanparameters.go b/qt6/network/gen_qssldiffiehellmanparameters.go index 3787c69b..b23723e7 100644 --- a/qt6/network/gen_qssldiffiehellmanparameters.go +++ b/qt6/network/gen_qssldiffiehellmanparameters.go @@ -131,8 +131,8 @@ func QSslDiffieHellmanParameters_FromEncoded2(encoded []byte, format QSsl__Encod return _goptr } -func QSslDiffieHellmanParameters_FromEncoded22(device *qt6.QIODevice, format QSsl__EncodingFormat) *QSslDiffieHellmanParameters { - _goptr := newQSslDiffieHellmanParameters(C.QSslDiffieHellmanParameters_fromEncoded22((*C.QIODevice)(device.UnsafePointer()), (C.int)(format))) +func QSslDiffieHellmanParameters_FromEncoded3(device *qt6.QIODevice, format QSsl__EncodingFormat) *QSslDiffieHellmanParameters { + _goptr := newQSslDiffieHellmanParameters(C.QSslDiffieHellmanParameters_fromEncoded3((*C.QIODevice)(device.UnsafePointer()), (C.int)(format))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/network/gen_qssldiffiehellmanparameters.h b/qt6/network/gen_qssldiffiehellmanparameters.h index 5480a494..349b41ed 100644 --- a/qt6/network/gen_qssldiffiehellmanparameters.h +++ b/qt6/network/gen_qssldiffiehellmanparameters.h @@ -34,7 +34,7 @@ bool QSslDiffieHellmanParameters_isValid(const QSslDiffieHellmanParameters* self int QSslDiffieHellmanParameters_error(const QSslDiffieHellmanParameters* self); struct miqt_string QSslDiffieHellmanParameters_errorString(const QSslDiffieHellmanParameters* self); QSslDiffieHellmanParameters* QSslDiffieHellmanParameters_fromEncoded2(struct miqt_string encoded, int format); -QSslDiffieHellmanParameters* QSslDiffieHellmanParameters_fromEncoded22(QIODevice* device, int format); +QSslDiffieHellmanParameters* QSslDiffieHellmanParameters_fromEncoded3(QIODevice* device, int format); void QSslDiffieHellmanParameters_delete(QSslDiffieHellmanParameters* self); #ifdef __cplusplus diff --git a/qt6/network/gen_qsslkey.cpp b/qt6/network/gen_qsslkey.cpp index b3f1eaf7..6b26f5ee 100644 --- a/qt6/network/gen_qsslkey.cpp +++ b/qt6/network/gen_qsslkey.cpp @@ -127,7 +127,7 @@ bool QSslKey_operatorNotEqual(const QSslKey* self, QSslKey* key) { return (*self != *key); } -struct miqt_string QSslKey_toPem1(const QSslKey* self, struct miqt_string passPhrase) { +struct miqt_string QSslKey_toPemWithPassPhrase(const QSslKey* self, struct miqt_string passPhrase) { QByteArray passPhrase_QByteArray(passPhrase.data, passPhrase.len); QByteArray _qb = self->toPem(passPhrase_QByteArray); struct miqt_string _ms; @@ -137,7 +137,7 @@ struct miqt_string QSslKey_toPem1(const QSslKey* self, struct miqt_string passPh return _ms; } -struct miqt_string QSslKey_toDer1(const QSslKey* self, struct miqt_string passPhrase) { +struct miqt_string QSslKey_toDerWithPassPhrase(const QSslKey* self, struct miqt_string passPhrase) { QByteArray passPhrase_QByteArray(passPhrase.data, passPhrase.len); QByteArray _qb = self->toDer(passPhrase_QByteArray); struct miqt_string _ms; diff --git a/qt6/network/gen_qsslkey.go b/qt6/network/gen_qsslkey.go index d1ee086d..aa273173 100644 --- a/qt6/network/gen_qsslkey.go +++ b/qt6/network/gen_qsslkey.go @@ -214,7 +214,7 @@ func (this *QSslKey) OperatorNotEqual(key *QSslKey) bool { return (bool)(C.QSslKey_operatorNotEqual(this.h, key.cPointer())) } -func (this *QSslKey) ToPem1(passPhrase []byte) []byte { +func (this *QSslKey) ToPemWithPassPhrase(passPhrase []byte) []byte { passPhrase_alias := C.struct_miqt_string{} if len(passPhrase) > 0 { passPhrase_alias.data = (*C.char)(unsafe.Pointer(&passPhrase[0])) @@ -222,13 +222,13 @@ func (this *QSslKey) ToPem1(passPhrase []byte) []byte { passPhrase_alias.data = (*C.char)(unsafe.Pointer(nil)) } passPhrase_alias.len = C.size_t(len(passPhrase)) - var _bytearray C.struct_miqt_string = C.QSslKey_toPem1(this.h, passPhrase_alias) + var _bytearray C.struct_miqt_string = C.QSslKey_toPemWithPassPhrase(this.h, passPhrase_alias) _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) C.free(unsafe.Pointer(_bytearray.data)) return _ret } -func (this *QSslKey) ToDer1(passPhrase []byte) []byte { +func (this *QSslKey) ToDerWithPassPhrase(passPhrase []byte) []byte { passPhrase_alias := C.struct_miqt_string{} if len(passPhrase) > 0 { passPhrase_alias.data = (*C.char)(unsafe.Pointer(&passPhrase[0])) @@ -236,7 +236,7 @@ func (this *QSslKey) ToDer1(passPhrase []byte) []byte { passPhrase_alias.data = (*C.char)(unsafe.Pointer(nil)) } passPhrase_alias.len = C.size_t(len(passPhrase)) - var _bytearray C.struct_miqt_string = C.QSslKey_toDer1(this.h, passPhrase_alias) + var _bytearray C.struct_miqt_string = C.QSslKey_toDerWithPassPhrase(this.h, passPhrase_alias) _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) C.free(unsafe.Pointer(_bytearray.data)) return _ret diff --git a/qt6/network/gen_qsslkey.h b/qt6/network/gen_qsslkey.h index 01416695..9586c3f9 100644 --- a/qt6/network/gen_qsslkey.h +++ b/qt6/network/gen_qsslkey.h @@ -46,8 +46,8 @@ struct miqt_string QSslKey_toDer(const QSslKey* self); void* QSslKey_handle(const QSslKey* self); bool QSslKey_operatorEqual(const QSslKey* self, QSslKey* key); bool QSslKey_operatorNotEqual(const QSslKey* self, QSslKey* key); -struct miqt_string QSslKey_toPem1(const QSslKey* self, struct miqt_string passPhrase); -struct miqt_string QSslKey_toDer1(const QSslKey* self, struct miqt_string passPhrase); +struct miqt_string QSslKey_toPemWithPassPhrase(const QSslKey* self, struct miqt_string passPhrase); +struct miqt_string QSslKey_toDerWithPassPhrase(const QSslKey* self, struct miqt_string passPhrase); void QSslKey_delete(QSslKey* self); #ifdef __cplusplus diff --git a/qt6/network/gen_qsslsocket.cpp b/qt6/network/gen_qsslsocket.cpp index 9a35e7fb..4a84c5ae 100644 --- a/qt6/network/gen_qsslsocket.cpp +++ b/qt6/network/gen_qsslsocket.cpp @@ -42,7 +42,7 @@ void miqt_exec_callback_QSslSocket_alertReceived(intptr_t, int, int, struct miqt void miqt_exec_callback_QSslSocket_handshakeInterruptedOnError(intptr_t, QSslError*); void miqt_exec_callback_QSslSocket_resume(QSslSocket*, intptr_t); bool miqt_exec_callback_QSslSocket_setSocketDescriptor(QSslSocket*, intptr_t, intptr_t, int, int); -void miqt_exec_callback_QSslSocket_connectToHost(QSslSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +void miqt_exec_callback_QSslSocket_connectToHost(QSslSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QSslSocket_disconnectFromHost(QSslSocket*, intptr_t); void miqt_exec_callback_QSslSocket_setSocketOption(QSslSocket*, intptr_t, int, QVariant*); QVariant* miqt_exec_callback_QSslSocket_socketOption(QSslSocket*, intptr_t, int); @@ -59,7 +59,7 @@ bool miqt_exec_callback_QSslSocket_waitForDisconnected(QSslSocket*, intptr_t, in long long miqt_exec_callback_QSslSocket_readData(QSslSocket*, intptr_t, char*, long long); long long miqt_exec_callback_QSslSocket_skipData(QSslSocket*, intptr_t, long long); long long miqt_exec_callback_QSslSocket_writeData(QSslSocket*, intptr_t, const char*, long long); -bool miqt_exec_callback_QSslSocket_bind(QSslSocket*, intptr_t, QHostAddress*, uint16_t, int); +bool miqt_exec_callback_QSslSocket_bind(QSslSocket*, intptr_t, QHostAddress*, unsigned short, int); intptr_t miqt_exec_callback_QSslSocket_socketDescriptor(const QSslSocket*, intptr_t); bool miqt_exec_callback_QSslSocket_isSequential(const QSslSocket*, intptr_t); long long miqt_exec_callback_QSslSocket_readLineData(QSslSocket*, intptr_t, char*, long long); @@ -147,7 +147,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODeviceBase::OpenMode openMode_ret = openMode; int sigval3 = static_cast(openMode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -158,7 +158,7 @@ public: } - friend void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol); + friend void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -470,7 +470,7 @@ public: // Cast returned reference into pointer QHostAddress* sigval1 = const_cast(&address_ret); quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QAbstractSocket::BindMode mode_ret = mode; int sigval3 = static_cast(mode_ret); @@ -479,7 +479,7 @@ public: return callback_return_value; } - friend bool QSslSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); + friend bool QSslSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); // cgo.Handle value for overwritten implementation intptr_t handle__socketDescriptor = 0; @@ -763,9 +763,9 @@ public: // Wrappers to allow calling protected methods: friend void QSslSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QSslSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QSslSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QSslSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QSslSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QSslSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -811,12 +811,12 @@ void QSslSocket_resume(QSslSocket* self) { self->resume(); } -void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, uint16_t port) { +void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port)); } -void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName) { +void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString sslPeerName_QString = QString::fromUtf8(sslPeerName.data, sslPeerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), sslPeerName_QString); @@ -826,7 +826,7 @@ bool QSslSocket_setSocketDescriptor(QSslSocket* self, intptr_t socketDescriptor, return self->setSocketDescriptor((qintptr)(socketDescriptor), static_cast(state), static_cast(openMode)); } -void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol) { +void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHost(hostName_QString, static_cast(port), static_cast(openMode), static_cast(protocol)); } @@ -1384,23 +1384,23 @@ struct miqt_string QSslSocket_tr3(const char* s, const char* c, int n) { return _ms; } -void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode) { +void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), static_cast(mode)); } -void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); } -void QSslSocket_connectToHostEncrypted42(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode) { +void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString sslPeerName_QString = QString::fromUtf8(sslPeerName.data, sslPeerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), sslPeerName_QString, static_cast(mode)); } -void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode, int protocol) { +void QSslSocket_connectToHostEncrypted6(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString sslPeerName_QString = QString::fromUtf8(sslPeerName.data, sslPeerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), sslPeerName_QString, static_cast(mode), static_cast(protocol)); @@ -1427,11 +1427,11 @@ void QSslSocket_setPrivateKey4(QSslSocket* self, struct miqt_string fileName, in self->setPrivateKey(fileName_QString, static_cast(algorithm), static_cast(format), passPhrase_QByteArray); } -bool QSslSocket_waitForEncrypted1(QSslSocket* self, int msecs) { +bool QSslSocket_waitForEncryptedWithMsecs(QSslSocket* self, int msecs) { return self->waitForEncrypted(static_cast(msecs)); } -struct miqt_array /* of int */ QSslSocket_supportedProtocols1(struct miqt_string backendName) { +struct miqt_array /* of int */ QSslSocket_supportedProtocolsWithBackendName(struct miqt_string backendName) { QString backendName_QString = QString::fromUtf8(backendName.data, backendName.len); QList _ret = QSslSocket::supportedProtocols(backendName_QString); // Convert QList<> from C++ memory to manually-managed C memory @@ -1451,7 +1451,7 @@ bool QSslSocket_isProtocolSupported2(int protocol, struct miqt_string backendNam return QSslSocket::isProtocolSupported(static_cast(protocol), backendName_QString); } -struct miqt_array /* of int */ QSslSocket_implementedClasses1(struct miqt_string backendName) { +struct miqt_array /* of int */ QSslSocket_implementedClassesWithBackendName(struct miqt_string backendName) { QString backendName_QString = QString::fromUtf8(backendName.data, backendName.len); QList _ret = QSslSocket::implementedClasses(backendName_QString); // Convert QList<> from C++ memory to manually-managed C memory @@ -1471,7 +1471,7 @@ bool QSslSocket_isClassImplemented2(int cl, struct miqt_string backendName) { return QSslSocket::isClassImplemented(static_cast(cl), backendName_QString); } -struct miqt_array /* of int */ QSslSocket_supportedFeatures1(struct miqt_string backendName) { +struct miqt_array /* of int */ QSslSocket_supportedFeaturesWithBackendName(struct miqt_string backendName) { QString backendName_QString = QString::fromUtf8(backendName.data, backendName.len); QList _ret = QSslSocket::supportedFeatures(backendName_QString); // Convert QList<> from C++ memory to manually-managed C memory @@ -1533,7 +1533,7 @@ bool QSslSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol) { +void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQSslSocket*)(self) )->QSslSocket::connectToHost(hostName_QString, static_cast(port), static_cast(openMode), static_cast(protocol)); @@ -1811,7 +1811,7 @@ bool QSslSocket_override_virtual_bind(void* self, intptr_t slot) { return true; } -bool QSslSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode) { +bool QSslSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode) { return ( (MiqtVirtualQSslSocket*)(self) )->QSslSocket::bind(*address, static_cast(port), static_cast(mode)); @@ -2087,7 +2087,7 @@ void QSslSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, } -void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQSslSocket* self_cast = dynamic_cast( (QSslSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -2113,7 +2113,7 @@ void QSslSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self } -void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQSslSocket* self_cast = dynamic_cast( (QSslSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/network/gen_qsslsocket.go b/qt6/network/gen_qsslsocket.go index ed954bf9..56a5ef23 100644 --- a/qt6/network/gen_qsslsocket.go +++ b/qt6/network/gen_qsslsocket.go @@ -108,7 +108,7 @@ func (this *QSslSocket) ConnectToHostEncrypted(hostName string, port uint16) { hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHostEncrypted(this.h, hostName_ms, (C.uint16_t)(port)) + C.QSslSocket_connectToHostEncrypted(this.h, hostName_ms, (C.ushort)(port)) } func (this *QSslSocket) ConnectToHostEncrypted2(hostName string, port uint16, sslPeerName string) { @@ -120,7 +120,7 @@ func (this *QSslSocket) ConnectToHostEncrypted2(hostName string, port uint16, ss sslPeerName_ms.data = C.CString(sslPeerName) sslPeerName_ms.len = C.size_t(len(sslPeerName)) defer C.free(unsafe.Pointer(sslPeerName_ms.data)) - C.QSslSocket_connectToHostEncrypted2(this.h, hostName_ms, (C.uint16_t)(port), sslPeerName_ms) + C.QSslSocket_connectToHostEncrypted2(this.h, hostName_ms, (C.ushort)(port), sslPeerName_ms) } func (this *QSslSocket) SetSocketDescriptor(socketDescriptor uintptr, state QAbstractSocket__SocketState, openMode qt6.QIODeviceBase__OpenModeFlag) bool { @@ -132,7 +132,7 @@ func (this *QSslSocket) ConnectToHost(hostName string, port uint16, openMode qt6 hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHost(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(openMode), (C.int)(protocol)) + C.QSslSocket_connectToHost(this.h, hostName_ms, (C.ushort)(port), (C.int)(openMode), (C.int)(protocol)) } func (this *QSslSocket) DisconnectFromHost() { @@ -747,7 +747,7 @@ func (this *QSslSocket) ConnectToHostEncrypted3(hostName string, port uint16, mo hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHostEncrypted3(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(mode)) + C.QSslSocket_connectToHostEncrypted3(this.h, hostName_ms, (C.ushort)(port), (C.int)(mode)) } func (this *QSslSocket) ConnectToHostEncrypted4(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol) { @@ -755,10 +755,10 @@ func (this *QSslSocket) ConnectToHostEncrypted4(hostName string, port uint16, mo hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHostEncrypted4(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QSslSocket_connectToHostEncrypted4(this.h, hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } -func (this *QSslSocket) ConnectToHostEncrypted42(hostName string, port uint16, sslPeerName string, mode qt6.QIODeviceBase__OpenModeFlag) { +func (this *QSslSocket) ConnectToHostEncrypted5(hostName string, port uint16, sslPeerName string, mode qt6.QIODeviceBase__OpenModeFlag) { hostName_ms := C.struct_miqt_string{} hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) @@ -767,10 +767,10 @@ func (this *QSslSocket) ConnectToHostEncrypted42(hostName string, port uint16, s sslPeerName_ms.data = C.CString(sslPeerName) sslPeerName_ms.len = C.size_t(len(sslPeerName)) defer C.free(unsafe.Pointer(sslPeerName_ms.data)) - C.QSslSocket_connectToHostEncrypted42(this.h, hostName_ms, (C.uint16_t)(port), sslPeerName_ms, (C.int)(mode)) + C.QSslSocket_connectToHostEncrypted5(this.h, hostName_ms, (C.ushort)(port), sslPeerName_ms, (C.int)(mode)) } -func (this *QSslSocket) ConnectToHostEncrypted5(hostName string, port uint16, sslPeerName string, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol) { +func (this *QSslSocket) ConnectToHostEncrypted6(hostName string, port uint16, sslPeerName string, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol) { hostName_ms := C.struct_miqt_string{} hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) @@ -779,7 +779,7 @@ func (this *QSslSocket) ConnectToHostEncrypted5(hostName string, port uint16, ss sslPeerName_ms.data = C.CString(sslPeerName) sslPeerName_ms.len = C.size_t(len(sslPeerName)) defer C.free(unsafe.Pointer(sslPeerName_ms.data)) - C.QSslSocket_connectToHostEncrypted5(this.h, hostName_ms, (C.uint16_t)(port), sslPeerName_ms, (C.int)(mode), (C.int)(protocol)) + C.QSslSocket_connectToHostEncrypted6(this.h, hostName_ms, (C.ushort)(port), sslPeerName_ms, (C.int)(mode), (C.int)(protocol)) } func (this *QSslSocket) SetLocalCertificate2(fileName string, format QSsl__EncodingFormat) { @@ -821,16 +821,16 @@ func (this *QSslSocket) SetPrivateKey4(fileName string, algorithm QSsl__KeyAlgor C.QSslSocket_setPrivateKey4(this.h, fileName_ms, (C.int)(algorithm), (C.int)(format), passPhrase_alias) } -func (this *QSslSocket) WaitForEncrypted1(msecs int) bool { - return (bool)(C.QSslSocket_waitForEncrypted1(this.h, (C.int)(msecs))) +func (this *QSslSocket) WaitForEncryptedWithMsecs(msecs int) bool { + return (bool)(C.QSslSocket_waitForEncryptedWithMsecs(this.h, (C.int)(msecs))) } -func QSslSocket_SupportedProtocols1(backendName string) []QSsl__SslProtocol { +func QSslSocket_SupportedProtocolsWithBackendName(backendName string) []QSsl__SslProtocol { backendName_ms := C.struct_miqt_string{} backendName_ms.data = C.CString(backendName) backendName_ms.len = C.size_t(len(backendName)) defer C.free(unsafe.Pointer(backendName_ms.data)) - var _ma C.struct_miqt_array = C.QSslSocket_supportedProtocols1(backendName_ms) + var _ma C.struct_miqt_array = C.QSslSocket_supportedProtocolsWithBackendName(backendName_ms) _ret := make([]QSsl__SslProtocol, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -847,12 +847,12 @@ func QSslSocket_IsProtocolSupported2(protocol QSsl__SslProtocol, backendName str return (bool)(C.QSslSocket_isProtocolSupported2((C.int)(protocol), backendName_ms)) } -func QSslSocket_ImplementedClasses1(backendName string) []QSsl__ImplementedClass { +func QSslSocket_ImplementedClassesWithBackendName(backendName string) []QSsl__ImplementedClass { backendName_ms := C.struct_miqt_string{} backendName_ms.data = C.CString(backendName) backendName_ms.len = C.size_t(len(backendName)) defer C.free(unsafe.Pointer(backendName_ms.data)) - var _ma C.struct_miqt_array = C.QSslSocket_implementedClasses1(backendName_ms) + var _ma C.struct_miqt_array = C.QSslSocket_implementedClassesWithBackendName(backendName_ms) _ret := make([]QSsl__ImplementedClass, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -869,12 +869,12 @@ func QSslSocket_IsClassImplemented2(cl QSsl__ImplementedClass, backendName strin return (bool)(C.QSslSocket_isClassImplemented2((C.int)(cl), backendName_ms)) } -func QSslSocket_SupportedFeatures1(backendName string) []QSsl__SupportedFeature { +func QSslSocket_SupportedFeaturesWithBackendName(backendName string) []QSsl__SupportedFeature { backendName_ms := C.struct_miqt_string{} backendName_ms.data = C.CString(backendName) backendName_ms.len = C.size_t(len(backendName)) defer C.free(unsafe.Pointer(backendName_ms.data)) - var _ma C.struct_miqt_array = C.QSslSocket_supportedFeatures1(backendName_ms) + var _ma C.struct_miqt_array = C.QSslSocket_supportedFeaturesWithBackendName(backendName_ms) _ret := make([]QSsl__SupportedFeature, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -919,7 +919,7 @@ func (this *QSslSocket) SetSocketError(socketError QAbstractSocket__SocketError) func (this *QSslSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QSslSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QSslSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -943,7 +943,7 @@ func (this *QSslSocket) SetLocalAddress(address *QHostAddress) { func (this *QSslSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QSslSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QSslSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -1126,7 +1126,7 @@ func (this *QSslSocket) callVirtualBase_ConnectToHost(hostName string, port uint hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(openMode), (C.int)(protocol)) + C.QSslSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(openMode), (C.int)(protocol)) } func (this *QSslSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, openMode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, openMode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -1137,7 +1137,7 @@ func (this *QSslSocket) OnConnectToHost(slot func(super func(hostName string, po } //export miqt_exec_callback_QSslSocket_connectToHost -func miqt_exec_callback_QSslSocket_connectToHost(self *C.QSslSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, openMode C.int, protocol C.int) { +func miqt_exec_callback_QSslSocket_connectToHost(self *C.QSslSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, openMode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, openMode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, openMode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -1596,7 +1596,7 @@ func miqt_exec_callback_QSslSocket_writeData(self *C.QSslSocket, cb C.intptr_t, func (this *QSslSocket) callVirtualBase_Bind(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QSslSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QSslSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.ushort)(port), (C.int)(mode))) } func (this *QSslSocket) OnBind(slot func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) { @@ -1607,7 +1607,7 @@ func (this *QSslSocket) OnBind(slot func(super func(address *QHostAddress, port } //export miqt_exec_callback_QSslSocket_bind -func miqt_exec_callback_QSslSocket_bind(self *C.QSslSocket, cb C.intptr_t, address *C.QHostAddress, port C.uint16_t, mode C.int) C.bool { +func miqt_exec_callback_QSslSocket_bind(self *C.QSslSocket, cb C.intptr_t, address *C.QHostAddress, port C.ushort, mode C.int) C.bool { gofunc, ok := cgo.Handle(cb).Value().(func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/network/gen_qsslsocket.h b/qt6/network/gen_qsslsocket.h index 124ee7c6..d2deee2c 100644 --- a/qt6/network/gen_qsslsocket.h +++ b/qt6/network/gen_qsslsocket.h @@ -65,10 +65,10 @@ QMetaObject* QSslSocket_metaObject(const QSslSocket* self); void* QSslSocket_metacast(QSslSocket* self, const char* param1); struct miqt_string QSslSocket_tr(const char* s); void QSslSocket_resume(QSslSocket* self); -void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, uint16_t port); -void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName); +void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, unsigned short port); +void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName); bool QSslSocket_setSocketDescriptor(QSslSocket* self, intptr_t socketDescriptor, int state, int openMode); -void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol); +void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol); void QSslSocket_disconnectFromHost(QSslSocket* self); void QSslSocket_setSocketOption(QSslSocket* self, int option, QVariant* value); QVariant* QSslSocket_socketOption(QSslSocket* self, int option); @@ -155,27 +155,27 @@ long long QSslSocket_skipData(QSslSocket* self, long long maxSize); long long QSslSocket_writeData(QSslSocket* self, const char* data, long long len); struct miqt_string QSslSocket_tr2(const char* s, const char* c); struct miqt_string QSslSocket_tr3(const char* s, const char* c, int n); -void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode); -void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); -void QSslSocket_connectToHostEncrypted42(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode); -void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode, int protocol); +void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode); +void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); +void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode); +void QSslSocket_connectToHostEncrypted6(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode, int protocol); void QSslSocket_setLocalCertificate2(QSslSocket* self, struct miqt_string fileName, int format); void QSslSocket_setPrivateKey2(QSslSocket* self, struct miqt_string fileName, int algorithm); void QSslSocket_setPrivateKey3(QSslSocket* self, struct miqt_string fileName, int algorithm, int format); void QSslSocket_setPrivateKey4(QSslSocket* self, struct miqt_string fileName, int algorithm, int format, struct miqt_string passPhrase); -bool QSslSocket_waitForEncrypted1(QSslSocket* self, int msecs); -struct miqt_array /* of int */ QSslSocket_supportedProtocols1(struct miqt_string backendName); +bool QSslSocket_waitForEncryptedWithMsecs(QSslSocket* self, int msecs); +struct miqt_array /* of int */ QSslSocket_supportedProtocolsWithBackendName(struct miqt_string backendName); bool QSslSocket_isProtocolSupported2(int protocol, struct miqt_string backendName); -struct miqt_array /* of int */ QSslSocket_implementedClasses1(struct miqt_string backendName); +struct miqt_array /* of int */ QSslSocket_implementedClassesWithBackendName(struct miqt_string backendName); bool QSslSocket_isClassImplemented2(int cl, struct miqt_string backendName); -struct miqt_array /* of int */ QSslSocket_supportedFeatures1(struct miqt_string backendName); +struct miqt_array /* of int */ QSslSocket_supportedFeaturesWithBackendName(struct miqt_string backendName); bool QSslSocket_isFeatureSupported2(int feat, struct miqt_string backendName); bool QSslSocket_override_virtual_resume(void* self, intptr_t slot); void QSslSocket_virtualbase_resume(void* self); bool QSslSocket_override_virtual_setSocketDescriptor(void* self, intptr_t slot); bool QSslSocket_virtualbase_setSocketDescriptor(void* self, intptr_t socketDescriptor, int state, int openMode); bool QSslSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol); +void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol); bool QSslSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QSslSocket_virtualbase_disconnectFromHost(void* self); bool QSslSocket_override_virtual_setSocketOption(void* self, intptr_t slot); @@ -209,7 +209,7 @@ long long QSslSocket_virtualbase_skipData(void* self, long long maxSize); bool QSslSocket_override_virtual_writeData(void* self, intptr_t slot); long long QSslSocket_virtualbase_writeData(void* self, const char* data, long long len); bool QSslSocket_override_virtual_bind(void* self, intptr_t slot); -bool QSslSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); +bool QSslSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); bool QSslSocket_override_virtual_socketDescriptor(void* self, intptr_t slot); intptr_t QSslSocket_virtualbase_socketDescriptor(const void* self); bool QSslSocket_override_virtual_isSequential(void* self, intptr_t slot); @@ -242,9 +242,9 @@ bool QSslSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QSslSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QSslSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QSslSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QSslSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QSslSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QSslSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QSslSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt6/network/gen_qtcpserver.cpp b/qt6/network/gen_qtcpserver.cpp index 3cde7042..5dc4a33e 100644 --- a/qt6/network/gen_qtcpserver.cpp +++ b/qt6/network/gen_qtcpserver.cpp @@ -299,9 +299,9 @@ int QTcpServer_listenBacklogSize(const QTcpServer* self) { return self->listenBacklogSize(); } -uint16_t QTcpServer_serverPort(const QTcpServer* self) { +unsigned short QTcpServer_serverPort(const QTcpServer* self) { quint16 _ret = self->serverPort(); - return static_cast(_ret); + return static_cast(_ret); } QHostAddress* QTcpServer_serverAddress(const QTcpServer* self) { @@ -405,15 +405,15 @@ struct miqt_string QTcpServer_tr3(const char* s, const char* c, int n) { return _ms; } -bool QTcpServer_listen1(QTcpServer* self, QHostAddress* address) { +bool QTcpServer_listenWithAddress(QTcpServer* self, QHostAddress* address) { return self->listen(*address); } -bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, uint16_t port) { +bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, unsigned short port) { return self->listen(*address, static_cast(port)); } -bool QTcpServer_waitForNewConnection1(QTcpServer* self, int msec) { +bool QTcpServer_waitForNewConnectionWithMsec(QTcpServer* self, int msec) { return self->waitForNewConnection(static_cast(msec)); } diff --git a/qt6/network/gen_qtcpserver.go b/qt6/network/gen_qtcpserver.go index a3f68ab8..7178f6a8 100644 --- a/qt6/network/gen_qtcpserver.go +++ b/qt6/network/gen_qtcpserver.go @@ -228,16 +228,16 @@ func QTcpServer_Tr3(s string, c string, n int) string { return _ret } -func (this *QTcpServer) Listen1(address *QHostAddress) bool { - return (bool)(C.QTcpServer_listen1(this.h, address.cPointer())) +func (this *QTcpServer) ListenWithAddress(address *QHostAddress) bool { + return (bool)(C.QTcpServer_listenWithAddress(this.h, address.cPointer())) } func (this *QTcpServer) Listen2(address *QHostAddress, port uint16) bool { - return (bool)(C.QTcpServer_listen2(this.h, address.cPointer(), (C.uint16_t)(port))) + return (bool)(C.QTcpServer_listen2(this.h, address.cPointer(), (C.ushort)(port))) } -func (this *QTcpServer) WaitForNewConnection1(msec int) bool { - return (bool)(C.QTcpServer_waitForNewConnection1(this.h, (C.int)(msec))) +func (this *QTcpServer) WaitForNewConnectionWithMsec(msec int) bool { + return (bool)(C.QTcpServer_waitForNewConnectionWithMsec(this.h, (C.int)(msec))) } func (this *QTcpServer) WaitForNewConnection2(msec int, timedOut *bool) bool { diff --git a/qt6/network/gen_qtcpserver.h b/qt6/network/gen_qtcpserver.h index 77684581..b0dd14a0 100644 --- a/qt6/network/gen_qtcpserver.h +++ b/qt6/network/gen_qtcpserver.h @@ -51,7 +51,7 @@ void QTcpServer_setMaxPendingConnections(QTcpServer* self, int numConnections); int QTcpServer_maxPendingConnections(const QTcpServer* self); void QTcpServer_setListenBacklogSize(QTcpServer* self, int size); int QTcpServer_listenBacklogSize(const QTcpServer* self); -uint16_t QTcpServer_serverPort(const QTcpServer* self); +unsigned short QTcpServer_serverPort(const QTcpServer* self); QHostAddress* QTcpServer_serverAddress(const QTcpServer* self); intptr_t QTcpServer_socketDescriptor(const QTcpServer* self); bool QTcpServer_setSocketDescriptor(QTcpServer* self, intptr_t socketDescriptor); @@ -71,9 +71,9 @@ void QTcpServer_acceptError(QTcpServer* self, int socketError); void QTcpServer_connect_acceptError(QTcpServer* self, intptr_t slot); struct miqt_string QTcpServer_tr2(const char* s, const char* c); struct miqt_string QTcpServer_tr3(const char* s, const char* c, int n); -bool QTcpServer_listen1(QTcpServer* self, QHostAddress* address); -bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, uint16_t port); -bool QTcpServer_waitForNewConnection1(QTcpServer* self, int msec); +bool QTcpServer_listenWithAddress(QTcpServer* self, QHostAddress* address); +bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, unsigned short port); +bool QTcpServer_waitForNewConnectionWithMsec(QTcpServer* self, int msec); bool QTcpServer_waitForNewConnection2(QTcpServer* self, int msec, bool* timedOut); bool QTcpServer_override_virtual_hasPendingConnections(void* self, intptr_t slot); bool QTcpServer_virtualbase_hasPendingConnections(const void* self); diff --git a/qt6/network/gen_qtcpsocket.cpp b/qt6/network/gen_qtcpsocket.cpp index b0b9e67b..c9d8c90a 100644 --- a/qt6/network/gen_qtcpsocket.cpp +++ b/qt6/network/gen_qtcpsocket.cpp @@ -21,8 +21,8 @@ extern "C" { #endif void miqt_exec_callback_QTcpSocket_resume(QTcpSocket*, intptr_t); -bool miqt_exec_callback_QTcpSocket_bind(QTcpSocket*, intptr_t, QHostAddress*, uint16_t, int); -void miqt_exec_callback_QTcpSocket_connectToHost(QTcpSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +bool miqt_exec_callback_QTcpSocket_bind(QTcpSocket*, intptr_t, QHostAddress*, unsigned short, int); +void miqt_exec_callback_QTcpSocket_connectToHost(QTcpSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QTcpSocket_disconnectFromHost(QTcpSocket*, intptr_t); long long miqt_exec_callback_QTcpSocket_bytesAvailable(const QTcpSocket*, intptr_t); long long miqt_exec_callback_QTcpSocket_bytesToWrite(const QTcpSocket*, intptr_t); @@ -98,7 +98,7 @@ public: // Cast returned reference into pointer QHostAddress* sigval1 = const_cast(&address_ret); quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QAbstractSocket::BindMode mode_ret = mode; int sigval3 = static_cast(mode_ret); @@ -107,7 +107,7 @@ public: return callback_return_value; } - friend bool QTcpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); + friend bool QTcpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); // cgo.Handle value for overwritten implementation intptr_t handle__connectToHost = 0; @@ -128,7 +128,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODeviceBase::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -139,7 +139,7 @@ public: } - friend void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -743,9 +743,9 @@ public: // Wrappers to allow calling protected methods: friend void QTcpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QTcpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QTcpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QTcpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QTcpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QTcpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -813,11 +813,11 @@ struct miqt_string QTcpSocket_tr3(const char* s, const char* c, int n) { return _ms; } -bool QTcpSocket_bind2(QTcpSocket* self, int addr, uint16_t port) { +bool QTcpSocket_bind2(QTcpSocket* self, int addr, unsigned short port) { return self->bind(static_cast(addr), static_cast(port)); } -bool QTcpSocket_bind3(QTcpSocket* self, int addr, uint16_t port, int mode) { +bool QTcpSocket_bind3(QTcpSocket* self, int addr, unsigned short port, int mode) { return self->bind(static_cast(addr), static_cast(port), static_cast(mode)); } @@ -847,7 +847,7 @@ bool QTcpSocket_override_virtual_bind(void* self, intptr_t slot) { return true; } -bool QTcpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode) { +bool QTcpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode) { return ( (MiqtVirtualQTcpSocket*)(self) )->QTcpSocket::bind(*address, static_cast(port), static_cast(mode)); @@ -863,7 +863,7 @@ bool QTcpSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQTcpSocket*)(self) )->QTcpSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1417,7 +1417,7 @@ void QTcpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, } -void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQTcpSocket* self_cast = dynamic_cast( (QTcpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1443,7 +1443,7 @@ void QTcpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self } -void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQTcpSocket* self_cast = dynamic_cast( (QTcpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/network/gen_qtcpsocket.go b/qt6/network/gen_qtcpsocket.go index 2d7edb24..ada37ad3 100644 --- a/qt6/network/gen_qtcpsocket.go +++ b/qt6/network/gen_qtcpsocket.go @@ -109,11 +109,11 @@ func QTcpSocket_Tr3(s string, c string, n int) string { } func (this *QTcpSocket) Bind2(addr QHostAddress__SpecialAddress, port uint16) bool { - return (bool)(C.QTcpSocket_bind2(this.h, (C.int)(addr), (C.uint16_t)(port))) + return (bool)(C.QTcpSocket_bind2(this.h, (C.int)(addr), (C.ushort)(port))) } func (this *QTcpSocket) Bind3(addr QHostAddress__SpecialAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QTcpSocket_bind3(this.h, (C.int)(addr), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QTcpSocket_bind3(this.h, (C.int)(addr), (C.ushort)(port), (C.int)(mode))) } // SetSocketState can only be called from a QTcpSocket that was directly constructed. @@ -144,7 +144,7 @@ func (this *QTcpSocket) SetSocketError(socketError QAbstractSocket__SocketError) func (this *QTcpSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QTcpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QTcpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -168,7 +168,7 @@ func (this *QTcpSocket) SetLocalAddress(address *QHostAddress) { func (this *QTcpSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QTcpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QTcpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -315,7 +315,7 @@ func miqt_exec_callback_QTcpSocket_resume(self *C.QTcpSocket, cb C.intptr_t) { func (this *QTcpSocket) callVirtualBase_Bind(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QTcpSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QTcpSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.ushort)(port), (C.int)(mode))) } func (this *QTcpSocket) OnBind(slot func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) { @@ -326,7 +326,7 @@ func (this *QTcpSocket) OnBind(slot func(super func(address *QHostAddress, port } //export miqt_exec_callback_QTcpSocket_bind -func miqt_exec_callback_QTcpSocket_bind(self *C.QTcpSocket, cb C.intptr_t, address *C.QHostAddress, port C.uint16_t, mode C.int) C.bool { +func miqt_exec_callback_QTcpSocket_bind(self *C.QTcpSocket, cb C.intptr_t, address *C.QHostAddress, port C.ushort, mode C.int) C.bool { gofunc, ok := cgo.Handle(cb).Value().(func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -351,7 +351,7 @@ func (this *QTcpSocket) callVirtualBase_ConnectToHost(hostName string, port uint hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QTcpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QTcpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QTcpSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -362,7 +362,7 @@ func (this *QTcpSocket) OnConnectToHost(slot func(super func(hostName string, po } //export miqt_exec_callback_QTcpSocket_connectToHost -func miqt_exec_callback_QTcpSocket_connectToHost(self *C.QTcpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QTcpSocket_connectToHost(self *C.QTcpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/network/gen_qtcpsocket.h b/qt6/network/gen_qtcpsocket.h index 12d612a9..7b02b6ac 100644 --- a/qt6/network/gen_qtcpsocket.h +++ b/qt6/network/gen_qtcpsocket.h @@ -51,14 +51,14 @@ struct miqt_string QTcpSocket_tr(const char* s); bool QTcpSocket_bind(QTcpSocket* self, int addr); struct miqt_string QTcpSocket_tr2(const char* s, const char* c); struct miqt_string QTcpSocket_tr3(const char* s, const char* c, int n); -bool QTcpSocket_bind2(QTcpSocket* self, int addr, uint16_t port); -bool QTcpSocket_bind3(QTcpSocket* self, int addr, uint16_t port, int mode); +bool QTcpSocket_bind2(QTcpSocket* self, int addr, unsigned short port); +bool QTcpSocket_bind3(QTcpSocket* self, int addr, unsigned short port, int mode); bool QTcpSocket_override_virtual_resume(void* self, intptr_t slot); void QTcpSocket_virtualbase_resume(void* self); bool QTcpSocket_override_virtual_bind(void* self, intptr_t slot); -bool QTcpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); +bool QTcpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); bool QTcpSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QTcpSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QTcpSocket_virtualbase_disconnectFromHost(void* self); bool QTcpSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); @@ -125,9 +125,9 @@ bool QTcpSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QTcpSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QTcpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QTcpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QTcpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QTcpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QTcpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QTcpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt6/network/gen_qudpsocket.cpp b/qt6/network/gen_qudpsocket.cpp index b0dcaab0..50261089 100644 --- a/qt6/network/gen_qudpsocket.cpp +++ b/qt6/network/gen_qudpsocket.cpp @@ -24,8 +24,8 @@ extern "C" { #endif void miqt_exec_callback_QUdpSocket_resume(QUdpSocket*, intptr_t); -bool miqt_exec_callback_QUdpSocket_bind(QUdpSocket*, intptr_t, QHostAddress*, uint16_t, int); -void miqt_exec_callback_QUdpSocket_connectToHost(QUdpSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +bool miqt_exec_callback_QUdpSocket_bind(QUdpSocket*, intptr_t, QHostAddress*, unsigned short, int); +void miqt_exec_callback_QUdpSocket_connectToHost(QUdpSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QUdpSocket_disconnectFromHost(QUdpSocket*, intptr_t); long long miqt_exec_callback_QUdpSocket_bytesAvailable(const QUdpSocket*, intptr_t); long long miqt_exec_callback_QUdpSocket_bytesToWrite(const QUdpSocket*, intptr_t); @@ -101,7 +101,7 @@ public: // Cast returned reference into pointer QHostAddress* sigval1 = const_cast(&address_ret); quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QAbstractSocket::BindMode mode_ret = mode; int sigval3 = static_cast(mode_ret); @@ -110,7 +110,7 @@ public: return callback_return_value; } - friend bool QUdpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); + friend bool QUdpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); // cgo.Handle value for overwritten implementation intptr_t handle__connectToHost = 0; @@ -131,7 +131,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODeviceBase::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -142,7 +142,7 @@ public: } - friend void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -746,9 +746,9 @@ public: // Wrappers to allow calling protected methods: friend void QUdpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QUdpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QUdpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QUdpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QUdpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QUdpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -841,12 +841,12 @@ long long QUdpSocket_writeDatagram(QUdpSocket* self, QNetworkDatagram* datagram) return static_cast(_ret); } -long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, uint16_t port) { +long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, unsigned short port) { qint64 _ret = self->writeDatagram(data, static_cast(len), *host, static_cast(port)); return static_cast(_ret); } -long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, uint16_t port) { +long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, unsigned short port) { QByteArray datagram_QByteArray(datagram.data, datagram.len); qint64 _ret = self->writeDatagram(datagram_QByteArray, *host, static_cast(port)); return static_cast(_ret); @@ -874,24 +874,24 @@ struct miqt_string QUdpSocket_tr3(const char* s, const char* c, int n) { return _ms; } -bool QUdpSocket_bind2(QUdpSocket* self, int addr, uint16_t port) { +bool QUdpSocket_bind2(QUdpSocket* self, int addr, unsigned short port) { return self->bind(static_cast(addr), static_cast(port)); } -bool QUdpSocket_bind3(QUdpSocket* self, int addr, uint16_t port, int mode) { +bool QUdpSocket_bind3(QUdpSocket* self, int addr, unsigned short port, int mode) { return self->bind(static_cast(addr), static_cast(port), static_cast(mode)); } -QNetworkDatagram* QUdpSocket_receiveDatagram1(QUdpSocket* self, long long maxSize) { +QNetworkDatagram* QUdpSocket_receiveDatagramWithMaxSize(QUdpSocket* self, long long maxSize) { return new QNetworkDatagram(self->receiveDatagram(static_cast(maxSize))); } -long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host) { +long long QUdpSocket_readDatagram2(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host) { qint64 _ret = self->readDatagram(data, static_cast(maxlen), host); return static_cast(_ret); } -long long QUdpSocket_readDatagram4(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, uint16_t* port) { +long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, unsigned short* port) { qint64 _ret = self->readDatagram(data, static_cast(maxlen), host, static_cast(port)); return static_cast(_ret); } @@ -922,7 +922,7 @@ bool QUdpSocket_override_virtual_bind(void* self, intptr_t slot) { return true; } -bool QUdpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode) { +bool QUdpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode) { return ( (MiqtVirtualQUdpSocket*)(self) )->QUdpSocket::bind(*address, static_cast(port), static_cast(mode)); @@ -938,7 +938,7 @@ bool QUdpSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQUdpSocket*)(self) )->QUdpSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1492,7 +1492,7 @@ void QUdpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, } -void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQUdpSocket* self_cast = dynamic_cast( (QUdpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1518,7 +1518,7 @@ void QUdpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self } -void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQUdpSocket* self_cast = dynamic_cast( (QUdpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/network/gen_qudpsocket.go b/qt6/network/gen_qudpsocket.go index 67c81448..cbac7371 100644 --- a/qt6/network/gen_qudpsocket.go +++ b/qt6/network/gen_qudpsocket.go @@ -139,7 +139,7 @@ func (this *QUdpSocket) WriteDatagram(datagram *QNetworkDatagram) int64 { func (this *QUdpSocket) WriteDatagram2(data string, lenVal int64, host *QHostAddress, port uint16) int64 { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - return (int64)(C.QUdpSocket_writeDatagram2(this.h, data_Cstring, (C.longlong)(lenVal), host.cPointer(), (C.uint16_t)(port))) + return (int64)(C.QUdpSocket_writeDatagram2(this.h, data_Cstring, (C.longlong)(lenVal), host.cPointer(), (C.ushort)(port))) } func (this *QUdpSocket) WriteDatagram3(datagram []byte, host *QHostAddress, port uint16) int64 { @@ -150,7 +150,7 @@ func (this *QUdpSocket) WriteDatagram3(datagram []byte, host *QHostAddress, port datagram_alias.data = (*C.char)(unsafe.Pointer(nil)) } datagram_alias.len = C.size_t(len(datagram)) - return (int64)(C.QUdpSocket_writeDatagram3(this.h, datagram_alias, host.cPointer(), (C.uint16_t)(port))) + return (int64)(C.QUdpSocket_writeDatagram3(this.h, datagram_alias, host.cPointer(), (C.ushort)(port))) } func QUdpSocket_Tr2(s string, c string) string { @@ -176,29 +176,29 @@ func QUdpSocket_Tr3(s string, c string, n int) string { } func (this *QUdpSocket) Bind2(addr QHostAddress__SpecialAddress, port uint16) bool { - return (bool)(C.QUdpSocket_bind2(this.h, (C.int)(addr), (C.uint16_t)(port))) + return (bool)(C.QUdpSocket_bind2(this.h, (C.int)(addr), (C.ushort)(port))) } func (this *QUdpSocket) Bind3(addr QHostAddress__SpecialAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QUdpSocket_bind3(this.h, (C.int)(addr), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QUdpSocket_bind3(this.h, (C.int)(addr), (C.ushort)(port), (C.int)(mode))) } -func (this *QUdpSocket) ReceiveDatagram1(maxSize int64) *QNetworkDatagram { - _goptr := newQNetworkDatagram(C.QUdpSocket_receiveDatagram1(this.h, (C.longlong)(maxSize))) +func (this *QUdpSocket) ReceiveDatagramWithMaxSize(maxSize int64) *QNetworkDatagram { + _goptr := newQNetworkDatagram(C.QUdpSocket_receiveDatagramWithMaxSize(this.h, (C.longlong)(maxSize))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QUdpSocket) ReadDatagram3(data string, maxlen int64, host *QHostAddress) int64 { +func (this *QUdpSocket) ReadDatagram2(data string, maxlen int64, host *QHostAddress) int64 { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - return (int64)(C.QUdpSocket_readDatagram3(this.h, data_Cstring, (C.longlong)(maxlen), host.cPointer())) + return (int64)(C.QUdpSocket_readDatagram2(this.h, data_Cstring, (C.longlong)(maxlen), host.cPointer())) } -func (this *QUdpSocket) ReadDatagram4(data string, maxlen int64, host *QHostAddress, port *uint16) int64 { +func (this *QUdpSocket) ReadDatagram3(data string, maxlen int64, host *QHostAddress, port *uint16) int64 { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - return (int64)(C.QUdpSocket_readDatagram4(this.h, data_Cstring, (C.longlong)(maxlen), host.cPointer(), (*C.uint16_t)(unsafe.Pointer(port)))) + return (int64)(C.QUdpSocket_readDatagram3(this.h, data_Cstring, (C.longlong)(maxlen), host.cPointer(), (*C.ushort)(unsafe.Pointer(port)))) } // SetSocketState can only be called from a QUdpSocket that was directly constructed. @@ -229,7 +229,7 @@ func (this *QUdpSocket) SetSocketError(socketError QAbstractSocket__SocketError) func (this *QUdpSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QUdpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QUdpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -253,7 +253,7 @@ func (this *QUdpSocket) SetLocalAddress(address *QHostAddress) { func (this *QUdpSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QUdpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QUdpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -400,7 +400,7 @@ func miqt_exec_callback_QUdpSocket_resume(self *C.QUdpSocket, cb C.intptr_t) { func (this *QUdpSocket) callVirtualBase_Bind(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QUdpSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QUdpSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.ushort)(port), (C.int)(mode))) } func (this *QUdpSocket) OnBind(slot func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) { @@ -411,7 +411,7 @@ func (this *QUdpSocket) OnBind(slot func(super func(address *QHostAddress, port } //export miqt_exec_callback_QUdpSocket_bind -func miqt_exec_callback_QUdpSocket_bind(self *C.QUdpSocket, cb C.intptr_t, address *C.QHostAddress, port C.uint16_t, mode C.int) C.bool { +func miqt_exec_callback_QUdpSocket_bind(self *C.QUdpSocket, cb C.intptr_t, address *C.QHostAddress, port C.ushort, mode C.int) C.bool { gofunc, ok := cgo.Handle(cb).Value().(func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -436,7 +436,7 @@ func (this *QUdpSocket) callVirtualBase_ConnectToHost(hostName string, port uint hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QUdpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QUdpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QUdpSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -447,7 +447,7 @@ func (this *QUdpSocket) OnConnectToHost(slot func(super func(hostName string, po } //export miqt_exec_callback_QUdpSocket_connectToHost -func miqt_exec_callback_QUdpSocket_connectToHost(self *C.QUdpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QUdpSocket_connectToHost(self *C.QUdpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/network/gen_qudpsocket.h b/qt6/network/gen_qudpsocket.h index 24eb45e1..f5022feb 100644 --- a/qt6/network/gen_qudpsocket.h +++ b/qt6/network/gen_qudpsocket.h @@ -64,21 +64,21 @@ long long QUdpSocket_pendingDatagramSize(const QUdpSocket* self); QNetworkDatagram* QUdpSocket_receiveDatagram(QUdpSocket* self); long long QUdpSocket_readDatagram(QUdpSocket* self, char* data, long long maxlen); long long QUdpSocket_writeDatagram(QUdpSocket* self, QNetworkDatagram* datagram); -long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, uint16_t port); -long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, uint16_t port); +long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, unsigned short port); +long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, unsigned short port); struct miqt_string QUdpSocket_tr2(const char* s, const char* c); struct miqt_string QUdpSocket_tr3(const char* s, const char* c, int n); -bool QUdpSocket_bind2(QUdpSocket* self, int addr, uint16_t port); -bool QUdpSocket_bind3(QUdpSocket* self, int addr, uint16_t port, int mode); -QNetworkDatagram* QUdpSocket_receiveDatagram1(QUdpSocket* self, long long maxSize); -long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host); -long long QUdpSocket_readDatagram4(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, uint16_t* port); +bool QUdpSocket_bind2(QUdpSocket* self, int addr, unsigned short port); +bool QUdpSocket_bind3(QUdpSocket* self, int addr, unsigned short port, int mode); +QNetworkDatagram* QUdpSocket_receiveDatagramWithMaxSize(QUdpSocket* self, long long maxSize); +long long QUdpSocket_readDatagram2(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host); +long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, unsigned short* port); bool QUdpSocket_override_virtual_resume(void* self, intptr_t slot); void QUdpSocket_virtualbase_resume(void* self); bool QUdpSocket_override_virtual_bind(void* self, intptr_t slot); -bool QUdpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); +bool QUdpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); bool QUdpSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QUdpSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QUdpSocket_virtualbase_disconnectFromHost(void* self); bool QUdpSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); @@ -145,9 +145,9 @@ bool QUdpSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QUdpSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QUdpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QUdpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QUdpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QUdpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QUdpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QUdpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt6/printsupport/gen_qprintpreviewwidget.cpp b/qt6/printsupport/gen_qprintpreviewwidget.cpp index a7aa83f9..e6c308c7 100644 --- a/qt6/printsupport/gen_qprintpreviewwidget.cpp +++ b/qt6/printsupport/gen_qprintpreviewwidget.cpp @@ -1194,11 +1194,11 @@ struct miqt_string QPrintPreviewWidget_tr3(const char* s, const char* c, int n) return _ms; } -void QPrintPreviewWidget_zoomIn1(QPrintPreviewWidget* self, double zoom) { +void QPrintPreviewWidget_zoomInWithZoom(QPrintPreviewWidget* self, double zoom) { self->zoomIn(static_cast(zoom)); } -void QPrintPreviewWidget_zoomOut1(QPrintPreviewWidget* self, double zoom) { +void QPrintPreviewWidget_zoomOutWithZoom(QPrintPreviewWidget* self, double zoom) { self->zoomOut(static_cast(zoom)); } diff --git a/qt6/printsupport/gen_qprintpreviewwidget.go b/qt6/printsupport/gen_qprintpreviewwidget.go index 968b0047..5414226c 100644 --- a/qt6/printsupport/gen_qprintpreviewwidget.go +++ b/qt6/printsupport/gen_qprintpreviewwidget.go @@ -273,12 +273,12 @@ func QPrintPreviewWidget_Tr3(s string, c string, n int) string { return _ret } -func (this *QPrintPreviewWidget) ZoomIn1(zoom float64) { - C.QPrintPreviewWidget_zoomIn1(this.h, (C.double)(zoom)) +func (this *QPrintPreviewWidget) ZoomInWithZoom(zoom float64) { + C.QPrintPreviewWidget_zoomInWithZoom(this.h, (C.double)(zoom)) } -func (this *QPrintPreviewWidget) ZoomOut1(zoom float64) { - C.QPrintPreviewWidget_zoomOut1(this.h, (C.double)(zoom)) +func (this *QPrintPreviewWidget) ZoomOutWithZoom(zoom float64) { + C.QPrintPreviewWidget_zoomOutWithZoom(this.h, (C.double)(zoom)) } // UpdateMicroFocus can only be called from a QPrintPreviewWidget that was directly constructed. diff --git a/qt6/printsupport/gen_qprintpreviewwidget.h b/qt6/printsupport/gen_qprintpreviewwidget.h index a4116bb8..c279ee2b 100644 --- a/qt6/printsupport/gen_qprintpreviewwidget.h +++ b/qt6/printsupport/gen_qprintpreviewwidget.h @@ -125,8 +125,8 @@ 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); -void QPrintPreviewWidget_zoomIn1(QPrintPreviewWidget* self, double zoom); -void QPrintPreviewWidget_zoomOut1(QPrintPreviewWidget* self, double zoom); +void QPrintPreviewWidget_zoomInWithZoom(QPrintPreviewWidget* self, double zoom); +void QPrintPreviewWidget_zoomOutWithZoom(QPrintPreviewWidget* self, double zoom); bool QPrintPreviewWidget_override_virtual_setVisible(void* self, intptr_t slot); void QPrintPreviewWidget_virtualbase_setVisible(void* self, bool visible); bool QPrintPreviewWidget_override_virtual_devType(void* self, intptr_t slot); diff --git a/qt6/qml/gen_qjsengine.cpp b/qt6/qml/gen_qjsengine.cpp index 7b209bfc..863cc28a 100644 --- a/qt6/qml/gen_qjsengine.cpp +++ b/qt6/qml/gen_qjsengine.cpp @@ -374,7 +374,7 @@ QJSValue* QJSEngine_evaluate4(QJSEngine* self, struct miqt_string program, struc return new QJSValue(self->evaluate(program_QString, fileName_QString, static_cast(lineNumber), &exceptionStackTrace_QList)); } -QJSValue* QJSEngine_newArray1(QJSEngine* self, unsigned int length) { +QJSValue* QJSEngine_newArrayWithLength(QJSEngine* self, unsigned int length) { return new QJSValue(self->newArray(static_cast(length))); } diff --git a/qt6/qml/gen_qjsengine.go b/qt6/qml/gen_qjsengine.go index 95e594ed..2e3bf21a 100644 --- a/qt6/qml/gen_qjsengine.go +++ b/qt6/qml/gen_qjsengine.go @@ -327,8 +327,8 @@ func (this *QJSEngine) Evaluate4(program string, fileName string, lineNumber int return _goptr } -func (this *QJSEngine) NewArray1(length uint) *QJSValue { - _goptr := newQJSValue(C.QJSEngine_newArray1(this.h, (C.uint)(length))) +func (this *QJSEngine) NewArrayWithLength(length uint) *QJSValue { + _goptr := newQJSValue(C.QJSEngine_newArrayWithLength(this.h, (C.uint)(length))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/qml/gen_qjsengine.h b/qt6/qml/gen_qjsengine.h index 62bf7faa..82114c27 100644 --- a/qt6/qml/gen_qjsengine.h +++ b/qt6/qml/gen_qjsengine.h @@ -70,7 +70,7 @@ struct miqt_string QJSEngine_tr3(const char* s, const char* c, int n); QJSValue* QJSEngine_evaluate2(QJSEngine* self, struct miqt_string program, struct miqt_string fileName); QJSValue* QJSEngine_evaluate3(QJSEngine* self, struct miqt_string program, struct miqt_string fileName, int lineNumber); QJSValue* QJSEngine_evaluate4(QJSEngine* self, struct miqt_string program, struct miqt_string fileName, int lineNumber, struct miqt_array /* of struct miqt_string */ exceptionStackTrace); -QJSValue* QJSEngine_newArray1(QJSEngine* self, unsigned int length); +QJSValue* QJSEngine_newArrayWithLength(QJSEngine* self, unsigned int length); QJSValue* QJSEngine_newErrorObject2(QJSEngine* self, int errorType, struct miqt_string message); void QJSEngine_installExtensions2(QJSEngine* self, int extensions, QJSValue* object); void QJSEngine_throwError2(QJSEngine* self, int errorType, struct miqt_string message); diff --git a/qt6/qml/gen_qjsmanagedvalue.cpp b/qt6/qml/gen_qjsmanagedvalue.cpp index cd94f08f..0e36c263 100644 --- a/qt6/qml/gen_qjsmanagedvalue.cpp +++ b/qt6/qml/gen_qjsmanagedvalue.cpp @@ -281,7 +281,7 @@ QJSManagedValue* QJSManagedValue_jsMetaInstantiate(const QJSManagedValue* self) return new QJSManagedValue(self->jsMetaInstantiate()); } -QJSValue* QJSManagedValue_call1(const QJSManagedValue* self, struct miqt_array /* of QJSValue* */ arguments) { +QJSValue* QJSManagedValue_callWithArguments(const QJSManagedValue* self, struct miqt_array /* of QJSValue* */ arguments) { QJSValueList arguments_QList; arguments_QList.reserve(arguments.len); QJSValue** arguments_arr = static_cast(arguments.data); @@ -301,7 +301,7 @@ QJSValue* QJSManagedValue_callWithInstance2(const QJSManagedValue* self, QJSValu return new QJSValue(self->callWithInstance(*instance, arguments_QList)); } -QJSValue* QJSManagedValue_callAsConstructor1(const QJSManagedValue* self, struct miqt_array /* of QJSValue* */ arguments) { +QJSValue* QJSManagedValue_callAsConstructorWithArguments(const QJSManagedValue* self, struct miqt_array /* of QJSValue* */ arguments) { QJSValueList arguments_QList; arguments_QList.reserve(arguments.len); QJSValue** arguments_arr = static_cast(arguments.data); @@ -311,7 +311,7 @@ QJSValue* QJSManagedValue_callAsConstructor1(const QJSManagedValue* self, struct return new QJSValue(self->callAsConstructor(arguments_QList)); } -QJSManagedValue* QJSManagedValue_jsMetaInstantiate1(const QJSManagedValue* self, struct miqt_array /* of QJSValue* */ values) { +QJSManagedValue* QJSManagedValue_jsMetaInstantiateWithValues(const QJSManagedValue* self, struct miqt_array /* of QJSValue* */ values) { QJSValueList values_QList; values_QList.reserve(values.len); QJSValue** values_arr = static_cast(values.data); diff --git a/qt6/qml/gen_qjsmanagedvalue.go b/qt6/qml/gen_qjsmanagedvalue.go index 2e40f052..66384f6e 100644 --- a/qt6/qml/gen_qjsmanagedvalue.go +++ b/qt6/qml/gen_qjsmanagedvalue.go @@ -360,14 +360,14 @@ func (this *QJSManagedValue) JsMetaInstantiate() *QJSManagedValue { return _goptr } -func (this *QJSManagedValue) Call1(arguments []QJSValue) *QJSValue { +func (this *QJSManagedValue) CallWithArguments(arguments []QJSValue) *QJSValue { arguments_CArray := (*[0xffff]*C.QJSValue)(C.malloc(C.size_t(8 * len(arguments)))) defer C.free(unsafe.Pointer(arguments_CArray)) for i := range arguments { arguments_CArray[i] = arguments[i].cPointer() } arguments_ma := C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} - _goptr := newQJSValue(C.QJSManagedValue_call1(this.h, arguments_ma)) + _goptr := newQJSValue(C.QJSManagedValue_callWithArguments(this.h, arguments_ma)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -384,26 +384,26 @@ func (this *QJSManagedValue) CallWithInstance2(instance *QJSValue, arguments []Q return _goptr } -func (this *QJSManagedValue) CallAsConstructor1(arguments []QJSValue) *QJSValue { +func (this *QJSManagedValue) CallAsConstructorWithArguments(arguments []QJSValue) *QJSValue { arguments_CArray := (*[0xffff]*C.QJSValue)(C.malloc(C.size_t(8 * len(arguments)))) defer C.free(unsafe.Pointer(arguments_CArray)) for i := range arguments { arguments_CArray[i] = arguments[i].cPointer() } arguments_ma := C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} - _goptr := newQJSValue(C.QJSManagedValue_callAsConstructor1(this.h, arguments_ma)) + _goptr := newQJSValue(C.QJSManagedValue_callAsConstructorWithArguments(this.h, arguments_ma)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJSManagedValue) JsMetaInstantiate1(values []QJSValue) *QJSManagedValue { +func (this *QJSManagedValue) JsMetaInstantiateWithValues(values []QJSValue) *QJSManagedValue { values_CArray := (*[0xffff]*C.QJSValue)(C.malloc(C.size_t(8 * len(values)))) defer C.free(unsafe.Pointer(values_CArray)) for i := range values { values_CArray[i] = values[i].cPointer() } values_ma := C.struct_miqt_array{len: C.size_t(len(values)), data: unsafe.Pointer(values_CArray)} - _goptr := newQJSManagedValue(C.QJSManagedValue_jsMetaInstantiate1(this.h, values_ma)) + _goptr := newQJSManagedValue(C.QJSManagedValue_jsMetaInstantiateWithValues(this.h, values_ma)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/qml/gen_qjsmanagedvalue.h b/qt6/qml/gen_qjsmanagedvalue.h index e3cbc7d4..1d16e047 100644 --- a/qt6/qml/gen_qjsmanagedvalue.h +++ b/qt6/qml/gen_qjsmanagedvalue.h @@ -95,10 +95,10 @@ QJSValue* QJSManagedValue_callAsConstructor(const QJSManagedValue* self); QJSManagedValue* QJSManagedValue_jsMetaType(const QJSManagedValue* self); struct miqt_array /* of struct miqt_string */ QJSManagedValue_jsMetaMembers(const QJSManagedValue* self); QJSManagedValue* QJSManagedValue_jsMetaInstantiate(const QJSManagedValue* self); -QJSValue* QJSManagedValue_call1(const QJSManagedValue* self, struct miqt_array /* of QJSValue* */ arguments); +QJSValue* QJSManagedValue_callWithArguments(const QJSManagedValue* self, struct miqt_array /* of QJSValue* */ arguments); QJSValue* QJSManagedValue_callWithInstance2(const QJSManagedValue* self, QJSValue* instance, struct miqt_array /* of QJSValue* */ arguments); -QJSValue* QJSManagedValue_callAsConstructor1(const QJSManagedValue* self, struct miqt_array /* of QJSValue* */ arguments); -QJSManagedValue* QJSManagedValue_jsMetaInstantiate1(const QJSManagedValue* self, struct miqt_array /* of QJSValue* */ values); +QJSValue* QJSManagedValue_callAsConstructorWithArguments(const QJSManagedValue* self, struct miqt_array /* of QJSValue* */ arguments); +QJSManagedValue* QJSManagedValue_jsMetaInstantiateWithValues(const QJSManagedValue* self, struct miqt_array /* of QJSValue* */ values); void QJSManagedValue_delete(QJSManagedValue* self); #ifdef __cplusplus diff --git a/qt6/qml/gen_qjsvalue.cpp b/qt6/qml/gen_qjsvalue.cpp index 26cff18c..b483331b 100644 --- a/qt6/qml/gen_qjsvalue.cpp +++ b/qt6/qml/gen_qjsvalue.cpp @@ -239,7 +239,7 @@ int QJSValue_errorType(const QJSValue* self) { return static_cast(_ret); } -QJSValue* QJSValue_call1(const QJSValue* self, struct miqt_array /* of QJSValue* */ args) { +QJSValue* QJSValue_callWithArgs(const QJSValue* self, struct miqt_array /* of QJSValue* */ args) { QJSValueList args_QList; args_QList.reserve(args.len); QJSValue** args_arr = static_cast(args.data); @@ -259,7 +259,7 @@ QJSValue* QJSValue_callWithInstance2(const QJSValue* self, QJSValue* instance, s return new QJSValue(self->callWithInstance(*instance, args_QList)); } -QJSValue* QJSValue_callAsConstructor1(const QJSValue* self, struct miqt_array /* of QJSValue* */ args) { +QJSValue* QJSValue_callAsConstructorWithArgs(const QJSValue* self, struct miqt_array /* of QJSValue* */ args) { QJSValueList args_QList; args_QList.reserve(args.len); QJSValue** args_arr = static_cast(args.data); diff --git a/qt6/qml/gen_qjsvalue.go b/qt6/qml/gen_qjsvalue.go index c0be43bb..a5060359 100644 --- a/qt6/qml/gen_qjsvalue.go +++ b/qt6/qml/gen_qjsvalue.go @@ -344,14 +344,14 @@ func (this *QJSValue) ErrorType() QJSValue__ErrorType { return (QJSValue__ErrorType)(C.QJSValue_errorType(this.h)) } -func (this *QJSValue) Call1(args []QJSValue) *QJSValue { +func (this *QJSValue) CallWithArgs(args []QJSValue) *QJSValue { args_CArray := (*[0xffff]*C.QJSValue)(C.malloc(C.size_t(8 * len(args)))) defer C.free(unsafe.Pointer(args_CArray)) for i := range args { args_CArray[i] = args[i].cPointer() } args_ma := C.struct_miqt_array{len: C.size_t(len(args)), data: unsafe.Pointer(args_CArray)} - _goptr := newQJSValue(C.QJSValue_call1(this.h, args_ma)) + _goptr := newQJSValue(C.QJSValue_callWithArgs(this.h, args_ma)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -368,14 +368,14 @@ func (this *QJSValue) CallWithInstance2(instance *QJSValue, args []QJSValue) *QJ return _goptr } -func (this *QJSValue) CallAsConstructor1(args []QJSValue) *QJSValue { +func (this *QJSValue) CallAsConstructorWithArgs(args []QJSValue) *QJSValue { args_CArray := (*[0xffff]*C.QJSValue)(C.malloc(C.size_t(8 * len(args)))) defer C.free(unsafe.Pointer(args_CArray)) for i := range args { args_CArray[i] = args[i].cPointer() } args_ma := C.struct_miqt_array{len: C.size_t(len(args)), data: unsafe.Pointer(args_CArray)} - _goptr := newQJSValue(C.QJSValue_callAsConstructor1(this.h, args_ma)) + _goptr := newQJSValue(C.QJSValue_callAsConstructorWithArgs(this.h, args_ma)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/qml/gen_qjsvalue.h b/qt6/qml/gen_qjsvalue.h index 142ddf79..98947ffb 100644 --- a/qt6/qml/gen_qjsvalue.h +++ b/qt6/qml/gen_qjsvalue.h @@ -81,9 +81,9 @@ QJSValue* QJSValue_call(const QJSValue* self); QJSValue* QJSValue_callWithInstance(const QJSValue* self, QJSValue* instance); QJSValue* QJSValue_callAsConstructor(const QJSValue* self); int QJSValue_errorType(const QJSValue* self); -QJSValue* QJSValue_call1(const QJSValue* self, struct miqt_array /* of QJSValue* */ args); +QJSValue* QJSValue_callWithArgs(const QJSValue* self, struct miqt_array /* of QJSValue* */ args); QJSValue* QJSValue_callWithInstance2(const QJSValue* self, QJSValue* instance, struct miqt_array /* of QJSValue* */ args); -QJSValue* QJSValue_callAsConstructor1(const QJSValue* self, struct miqt_array /* of QJSValue* */ args); +QJSValue* QJSValue_callAsConstructorWithArgs(const QJSValue* self, struct miqt_array /* of QJSValue* */ args); void QJSValue_delete(QJSValue* self); #ifdef __cplusplus diff --git a/qt6/qml/gen_qqmlcomponent.cpp b/qt6/qml/gen_qqmlcomponent.cpp index 696f4f25..317b1ec2 100644 --- a/qt6/qml/gen_qqmlcomponent.cpp +++ b/qt6/qml/gen_qqmlcomponent.cpp @@ -250,8 +250,8 @@ public: // Wrappers to allow calling protected methods: friend QObject* QQmlComponent_protectedbase_createObject2(bool* _dynamic_cast_ok, void* self); - friend QObject* QQmlComponent_protectedbase_createObject1(bool* _dynamic_cast_ok, void* self, QObject* parent); - friend QObject* QQmlComponent_protectedbase_createObject22(bool* _dynamic_cast_ok, void* self, QObject* parent, struct miqt_map /* of struct miqt_string to QVariant* */ properties); + friend QObject* QQmlComponent_protectedbase_createObjectWithParent(bool* _dynamic_cast_ok, void* self, QObject* parent); + friend QObject* QQmlComponent_protectedbase_createObject3(bool* _dynamic_cast_ok, void* self, QObject* parent, struct miqt_map /* of struct miqt_string to QVariant* */ properties); friend QObject* QQmlComponent_protectedbase_sender(bool* _dynamic_cast_ok, const void* self); friend int QQmlComponent_protectedbase_senderSignalIndex(bool* _dynamic_cast_ok, const void* self); friend int QQmlComponent_protectedbase_receivers(bool* _dynamic_cast_ok, const void* self, const char* signal); @@ -688,7 +688,7 @@ QObject* QQmlComponent_protectedbase_createObject2(bool* _dynamic_cast_ok, void* } -QObject* QQmlComponent_protectedbase_createObject1(bool* _dynamic_cast_ok, void* self, QObject* parent) { +QObject* QQmlComponent_protectedbase_createObjectWithParent(bool* _dynamic_cast_ok, void* self, QObject* parent) { MiqtVirtualQQmlComponent* self_cast = dynamic_cast( (QQmlComponent*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -701,7 +701,7 @@ QObject* QQmlComponent_protectedbase_createObject1(bool* _dynamic_cast_ok, void* } -QObject* QQmlComponent_protectedbase_createObject22(bool* _dynamic_cast_ok, void* self, QObject* parent, struct miqt_map /* of struct miqt_string to QVariant* */ properties) { +QObject* QQmlComponent_protectedbase_createObject3(bool* _dynamic_cast_ok, void* self, QObject* parent, struct miqt_map /* of struct miqt_string to QVariant* */ properties) { MiqtVirtualQQmlComponent* self_cast = dynamic_cast( (QQmlComponent*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/qml/gen_qqmlcomponent.go b/qt6/qml/gen_qqmlcomponent.go index 5156be2a..3c157cd5 100644 --- a/qt6/qml/gen_qqmlcomponent.go +++ b/qt6/qml/gen_qqmlcomponent.go @@ -423,11 +423,11 @@ func (this *QQmlComponent) CreateObject2() *qt6.QObject { } -// CreateObject1 can only be called from a QQmlComponent that was directly constructed. -func (this *QQmlComponent) CreateObject1(parent *qt6.QObject) *qt6.QObject { +// CreateObjectWithParent can only be called from a QQmlComponent that was directly constructed. +func (this *QQmlComponent) CreateObjectWithParent(parent *qt6.QObject) *qt6.QObject { var _dynamic_cast_ok C.bool = false - _method_ret := qt6.UnsafeNewQObject(unsafe.Pointer(C.QQmlComponent_protectedbase_createObject1(&_dynamic_cast_ok, unsafe.Pointer(this.h), (*C.QObject)(parent.UnsafePointer())))) + _method_ret := qt6.UnsafeNewQObject(unsafe.Pointer(C.QQmlComponent_protectedbase_createObjectWithParent(&_dynamic_cast_ok, unsafe.Pointer(this.h), (*C.QObject)(parent.UnsafePointer())))) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -437,8 +437,8 @@ func (this *QQmlComponent) CreateObject1(parent *qt6.QObject) *qt6.QObject { } -// CreateObject22 can only be called from a QQmlComponent that was directly constructed. -func (this *QQmlComponent) CreateObject22(parent *qt6.QObject, properties map[string]qt6.QVariant) *qt6.QObject { +// CreateObject3 can only be called from a QQmlComponent that was directly constructed. +func (this *QQmlComponent) CreateObject3(parent *qt6.QObject, properties map[string]qt6.QVariant) *qt6.QObject { properties_Keys_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(int(unsafe.Sizeof(C.struct_miqt_string{})) * len(properties)))) defer C.free(unsafe.Pointer(properties_Keys_CArray)) properties_Values_CArray := (*[0xffff]*C.QVariant)(C.malloc(C.size_t(8 * len(properties)))) @@ -460,7 +460,7 @@ func (this *QQmlComponent) CreateObject22(parent *qt6.QObject, properties map[st } var _dynamic_cast_ok C.bool = false - _method_ret := qt6.UnsafeNewQObject(unsafe.Pointer(C.QQmlComponent_protectedbase_createObject22(&_dynamic_cast_ok, unsafe.Pointer(this.h), (*C.QObject)(parent.UnsafePointer()), properties_mm))) + _method_ret := qt6.UnsafeNewQObject(unsafe.Pointer(C.QQmlComponent_protectedbase_createObject3(&_dynamic_cast_ok, unsafe.Pointer(this.h), (*C.QObject)(parent.UnsafePointer()), properties_mm))) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") diff --git a/qt6/qml/gen_qqmlcomponent.h b/qt6/qml/gen_qqmlcomponent.h index 1a3e8a4a..666c68fa 100644 --- a/qt6/qml/gen_qqmlcomponent.h +++ b/qt6/qml/gen_qqmlcomponent.h @@ -111,8 +111,8 @@ void QQmlComponent_virtualbase_connectNotify(void* self, QMetaMethod* signal); bool QQmlComponent_override_virtual_disconnectNotify(void* self, intptr_t slot); void QQmlComponent_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); QObject* QQmlComponent_protectedbase_createObject2(bool* _dynamic_cast_ok, void* self); -QObject* QQmlComponent_protectedbase_createObject1(bool* _dynamic_cast_ok, void* self, QObject* parent); -QObject* QQmlComponent_protectedbase_createObject22(bool* _dynamic_cast_ok, void* self, QObject* parent, struct miqt_map /* of struct miqt_string to QVariant* */ properties); +QObject* QQmlComponent_protectedbase_createObjectWithParent(bool* _dynamic_cast_ok, void* self, QObject* parent); +QObject* QQmlComponent_protectedbase_createObject3(bool* _dynamic_cast_ok, void* self, QObject* parent, struct miqt_map /* of struct miqt_string to QVariant* */ properties); QObject* QQmlComponent_protectedbase_sender(bool* _dynamic_cast_ok, const void* self); int QQmlComponent_protectedbase_senderSignalIndex(bool* _dynamic_cast_ok, const void* self); int QQmlComponent_protectedbase_receivers(bool* _dynamic_cast_ok, const void* self, const char* signal); diff --git a/qt6/qml/gen_qqmldebug.cpp b/qt6/qml/gen_qqmldebug.cpp index 5fb2ce26..f714ada2 100644 --- a/qt6/qml/gen_qqmldebug.cpp +++ b/qt6/qml/gen_qqmldebug.cpp @@ -1,5 +1,5 @@ +#include #include -#include #include #include #include diff --git a/qt6/qml/gen_qqmlexpression.cpp b/qt6/qml/gen_qqmlexpression.cpp index 857275d4..bb907396 100644 --- a/qt6/qml/gen_qqmlexpression.cpp +++ b/qt6/qml/gen_qqmlexpression.cpp @@ -349,12 +349,12 @@ struct miqt_string QQmlExpression_tr3(const char* s, const char* c, int n) { return _ms; } -void QQmlExpression_setSourceLocation3(QQmlExpression* self, struct miqt_string fileName, int line, int column) { +void QQmlExpression_setSourceLocation2(QQmlExpression* self, struct miqt_string fileName, int line, int column) { QString fileName_QString = QString::fromUtf8(fileName.data, fileName.len); self->setSourceLocation(fileName_QString, static_cast(line), static_cast(column)); } -QVariant* QQmlExpression_evaluate1(QQmlExpression* self, bool* valueIsUndefined) { +QVariant* QQmlExpression_evaluateWithValueIsUndefined(QQmlExpression* self, bool* valueIsUndefined) { return new QVariant(self->evaluate(valueIsUndefined)); } diff --git a/qt6/qml/gen_qqmlexpression.go b/qt6/qml/gen_qqmlexpression.go index 5142ba3b..c8a6e8a3 100644 --- a/qt6/qml/gen_qqmlexpression.go +++ b/qt6/qml/gen_qqmlexpression.go @@ -237,16 +237,16 @@ func QQmlExpression_Tr3(s string, c string, n int) string { return _ret } -func (this *QQmlExpression) SetSourceLocation3(fileName string, line int, column int) { +func (this *QQmlExpression) SetSourceLocation2(fileName string, line int, column int) { 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.QQmlExpression_setSourceLocation3(this.h, fileName_ms, (C.int)(line), (C.int)(column)) + C.QQmlExpression_setSourceLocation2(this.h, fileName_ms, (C.int)(line), (C.int)(column)) } -func (this *QQmlExpression) Evaluate1(valueIsUndefined *bool) *qt6.QVariant { - _goptr := qt6.UnsafeNewQVariant(unsafe.Pointer(C.QQmlExpression_evaluate1(this.h, (*C.bool)(unsafe.Pointer(valueIsUndefined))))) +func (this *QQmlExpression) EvaluateWithValueIsUndefined(valueIsUndefined *bool) *qt6.QVariant { + _goptr := qt6.UnsafeNewQVariant(unsafe.Pointer(C.QQmlExpression_evaluateWithValueIsUndefined(this.h, (*C.bool)(unsafe.Pointer(valueIsUndefined))))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/qml/gen_qqmlexpression.h b/qt6/qml/gen_qqmlexpression.h index 1fc0676d..922123c4 100644 --- a/qt6/qml/gen_qqmlexpression.h +++ b/qt6/qml/gen_qqmlexpression.h @@ -72,8 +72,8 @@ void QQmlExpression_valueChanged(QQmlExpression* self); void QQmlExpression_connect_valueChanged(QQmlExpression* self, intptr_t slot); struct miqt_string QQmlExpression_tr2(const char* s, const char* c); struct miqt_string QQmlExpression_tr3(const char* s, const char* c, int n); -void QQmlExpression_setSourceLocation3(QQmlExpression* self, struct miqt_string fileName, int line, int column); -QVariant* QQmlExpression_evaluate1(QQmlExpression* self, bool* valueIsUndefined); +void QQmlExpression_setSourceLocation2(QQmlExpression* self, struct miqt_string fileName, int line, int column); +QVariant* QQmlExpression_evaluateWithValueIsUndefined(QQmlExpression* self, bool* valueIsUndefined); bool QQmlExpression_override_virtual_event(void* self, intptr_t slot); bool QQmlExpression_virtualbase_event(void* self, QEvent* event); bool QQmlExpression_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt6/qml/gen_qqmlinfo.cpp b/qt6/qml/gen_qqmlinfo.cpp index a85d37e8..7f1fbf92 100644 --- a/qt6/qml/gen_qqmlinfo.cpp +++ b/qt6/qml/gen_qqmlinfo.cpp @@ -44,13 +44,13 @@ QQmlInfo* QQmlInfo_operatorShiftLeftWithChar(QQmlInfo* self, char t) { return &_ret; } -QQmlInfo* QQmlInfo_operatorShiftLeftWithShort(QQmlInfo* self, int16_t t) { +QQmlInfo* QQmlInfo_operatorShiftLeftWithShort(QQmlInfo* self, short t) { QQmlInfo& _ret = self->operator<<(static_cast(t)); // Cast returned reference into pointer return &_ret; } -QQmlInfo* QQmlInfo_operatorShiftLeftWithUnsignedshort(QQmlInfo* self, uint16_t t) { +QQmlInfo* QQmlInfo_operatorShiftLeftWithUnsignedshort(QQmlInfo* self, unsigned short t) { QQmlInfo& _ret = self->operator<<(static_cast(t)); // Cast returned reference into pointer return &_ret; diff --git a/qt6/qml/gen_qqmlinfo.go b/qt6/qml/gen_qqmlinfo.go index 31e1f0a8..252b53a0 100644 --- a/qt6/qml/gen_qqmlinfo.go +++ b/qt6/qml/gen_qqmlinfo.go @@ -69,11 +69,11 @@ func (this *QQmlInfo) OperatorShiftLeftWithChar(t int8) *QQmlInfo { } func (this *QQmlInfo) OperatorShiftLeftWithShort(t int16) *QQmlInfo { - return newQQmlInfo(C.QQmlInfo_operatorShiftLeftWithShort(this.h, (C.int16_t)(t))) + return newQQmlInfo(C.QQmlInfo_operatorShiftLeftWithShort(this.h, (C.short)(t))) } func (this *QQmlInfo) OperatorShiftLeftWithUnsignedshort(t uint16) *QQmlInfo { - return newQQmlInfo(C.QQmlInfo_operatorShiftLeftWithUnsignedshort(this.h, (C.uint16_t)(t))) + return newQQmlInfo(C.QQmlInfo_operatorShiftLeftWithUnsignedshort(this.h, (C.ushort)(t))) } func (this *QQmlInfo) OperatorShiftLeftWithInt(t int) *QQmlInfo { diff --git a/qt6/qml/gen_qqmlinfo.h b/qt6/qml/gen_qqmlinfo.h index ae9772b2..2fd66d88 100644 --- a/qt6/qml/gen_qqmlinfo.h +++ b/qt6/qml/gen_qqmlinfo.h @@ -33,8 +33,8 @@ void QQmlInfo_virtbase(QQmlInfo* src, QDebug** outptr_QDebug); QQmlInfo* QQmlInfo_operatorShiftLeft(QQmlInfo* self, QChar* t); QQmlInfo* QQmlInfo_operatorShiftLeftWithBool(QQmlInfo* self, bool t); QQmlInfo* QQmlInfo_operatorShiftLeftWithChar(QQmlInfo* self, char t); -QQmlInfo* QQmlInfo_operatorShiftLeftWithShort(QQmlInfo* self, int16_t t); -QQmlInfo* QQmlInfo_operatorShiftLeftWithUnsignedshort(QQmlInfo* self, uint16_t t); +QQmlInfo* QQmlInfo_operatorShiftLeftWithShort(QQmlInfo* self, short t); +QQmlInfo* QQmlInfo_operatorShiftLeftWithUnsignedshort(QQmlInfo* self, unsigned short t); QQmlInfo* QQmlInfo_operatorShiftLeftWithInt(QQmlInfo* self, int t); QQmlInfo* QQmlInfo_operatorShiftLeftWithUnsignedint(QQmlInfo* self, unsigned int t); QQmlInfo* QQmlInfo_operatorShiftLeftWithLong(QQmlInfo* self, long t); diff --git a/qt6/qml/gen_qqmlpropertymap.cpp b/qt6/qml/gen_qqmlpropertymap.cpp index a65515af..030c7609 100644 --- a/qt6/qml/gen_qqmlpropertymap.cpp +++ b/qt6/qml/gen_qqmlpropertymap.cpp @@ -1,7 +1,7 @@ #include #include +#include #include -#include #include #include #include diff --git a/qt6/svg/gen_qsvgrenderer.cpp b/qt6/svg/gen_qsvgrenderer.cpp index 25ba35a6..0a3dacc4 100644 --- a/qt6/svg/gen_qsvgrenderer.cpp +++ b/qt6/svg/gen_qsvgrenderer.cpp @@ -381,7 +381,7 @@ struct miqt_string QSvgRenderer_tr3(const char* s, const char* c, int n) { return _ms; } -void QSvgRenderer_render32(QSvgRenderer* self, QPainter* p, struct miqt_string elementId, QRectF* bounds) { +void QSvgRenderer_render4(QSvgRenderer* self, QPainter* p, struct miqt_string elementId, QRectF* bounds) { QString elementId_QString = QString::fromUtf8(elementId.data, elementId.len); self->render(p, elementId_QString, *bounds); } diff --git a/qt6/svg/gen_qsvgrenderer.go b/qt6/svg/gen_qsvgrenderer.go index 3c4a51e1..5fdae6c0 100644 --- a/qt6/svg/gen_qsvgrenderer.go +++ b/qt6/svg/gen_qsvgrenderer.go @@ -308,12 +308,12 @@ func QSvgRenderer_Tr3(s string, c string, n int) string { return _ret } -func (this *QSvgRenderer) Render32(p *qt6.QPainter, elementId string, bounds *qt6.QRectF) { +func (this *QSvgRenderer) Render4(p *qt6.QPainter, elementId string, bounds *qt6.QRectF) { elementId_ms := C.struct_miqt_string{} elementId_ms.data = C.CString(elementId) elementId_ms.len = C.size_t(len(elementId)) defer C.free(unsafe.Pointer(elementId_ms.data)) - C.QSvgRenderer_render32(this.h, (*C.QPainter)(p.UnsafePointer()), elementId_ms, (*C.QRectF)(bounds.UnsafePointer())) + C.QSvgRenderer_render4(this.h, (*C.QPainter)(p.UnsafePointer()), elementId_ms, (*C.QRectF)(bounds.UnsafePointer())) } // Sender can only be called from a QSvgRenderer that was directly constructed. diff --git a/qt6/svg/gen_qsvgrenderer.h b/qt6/svg/gen_qsvgrenderer.h index 27fe872f..7e81e91b 100644 --- a/qt6/svg/gen_qsvgrenderer.h +++ b/qt6/svg/gen_qsvgrenderer.h @@ -83,7 +83,7 @@ void QSvgRenderer_repaintNeeded(QSvgRenderer* self); void QSvgRenderer_connect_repaintNeeded(QSvgRenderer* self, intptr_t slot); struct miqt_string QSvgRenderer_tr2(const char* s, const char* c); struct miqt_string QSvgRenderer_tr3(const char* s, const char* c, int n); -void QSvgRenderer_render32(QSvgRenderer* self, QPainter* p, struct miqt_string elementId, QRectF* bounds); +void QSvgRenderer_render4(QSvgRenderer* self, QPainter* p, struct miqt_string elementId, QRectF* bounds); bool QSvgRenderer_override_virtual_event(void* self, intptr_t slot); bool QSvgRenderer_virtualbase_event(void* self, QEvent* event); bool QSvgRenderer_override_virtual_eventFilter(void* self, intptr_t slot); diff --git a/qt6/webchannel/gen_qwebchannel.cpp b/qt6/webchannel/gen_qwebchannel.cpp index e71e0878..62586cbe 100644 --- a/qt6/webchannel/gen_qwebchannel.cpp +++ b/qt6/webchannel/gen_qwebchannel.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include diff --git a/qt6/webengine/gen_qwebenginehistory.cpp b/qt6/webengine/gen_qwebenginehistory.cpp index c613b086..8b202f4b 100644 --- a/qt6/webengine/gen_qwebenginehistory.cpp +++ b/qt6/webengine/gen_qwebenginehistory.cpp @@ -3,8 +3,8 @@ #include #include #include +#include #include -#include #include #include #include