code.ivysaur.me/miqt
1
0
Fork 0
mirror of https://github.com/mappu/miqt.git synced 2025-05-18 09:10:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #196 from mappu/miqt-next

Browse Source 
Assorted minor breaking changes
This commit is contained in:
mappu 2025-04-13 11:22:10 +12:00 committed by GitHub
commit 862bd100f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1194 changed files with 7909 additions and 7427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/miqt.yml vendored
View File

@ -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

2
cmd/genbindings/clang2il.go
View File

@ -491,8 +491,6 @@ nextMethod:
return CppClass{}, err
}
ApplyQuirks(ret.ClassName, &mm)
ret.Methods = append(ret.Methods, mm)
default:

31
cmd/genbindings/config-allowlist.go
View File

@ -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<QVariant>", // 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)

2
cmd/genbindings/config-libraries.go
View File

@ -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,

55
cmd/genbindings/emitcabi.go
View File

@ -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<K,V>
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" +

16
cmd/genbindings/emitgo.go
View File

@ -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<T>
// 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<T>
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 = "

16
cmd/genbindings/intermediate.go
View File

@ -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<k,v>::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) {

4
cmd/genbindings/main.go
View File

@ -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)

40
cmd/genbindings/transformctors.go
View File

@ -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
})

7
cmd/genbindings/transformoptional.go
View File

@ -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:]

52
cmd/genbindings/transformoverload.go
View File

@ -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

21
cmd/genbindings/transformquirks.go Normal file
View File

@ -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])
}
}
}

27
cmd/genbindings/transformtypedefs.go
View File

@ -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.

2
examples/goroutine6/main.go
View File

@ -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) {

4
qt-extras/scintillaedit/gen_ScintillaEdit.cpp
View File

@ -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);
}

8
qt-extras/scintillaedit/gen_ScintillaEdit.go
View File

@ -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.

4
qt-extras/scintillaedit/gen_ScintillaEdit.h
View File

@ -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);

20
qt-restricted-extras/charts6/gen_qabstractaxis.cpp
View File

@ -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);
}

40
qt-restricted-extras/charts6/gen_qabstractaxis.go
View File

@ -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.

20
qt-restricted-extras/charts6/gen_qabstractaxis.h
View File

@ -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

2
qt-restricted-extras/charts6/gen_qabstractbarseries.cpp
View File

@ -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);
}

4
qt-restricted-extras/charts6/gen_qabstractbarseries.go
View File

@ -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.

2
qt-restricted-extras/charts6/gen_qabstractbarseries.h
View File

@ -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

4
qt-restricted-extras/charts6/gen_qabstractseries.cpp
View File

@ -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);
}

8
qt-restricted-extras/charts6/gen_qabstractseries.go
View File

@ -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.

4
qt-restricted-extras/charts6/gen_qabstractseries.h
View File

@ -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

6
qt-restricted-extras/charts6/gen_qareaseries.cpp
View File

@ -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);
}

12
qt-restricted-extras/charts6/gen_qareaseries.go
View File

@ -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.

6
qt-restricted-extras/charts6/gen_qareaseries.h
View File

@ -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);

2
qt-restricted-extras/charts6/gen_qcategoryaxis.cpp
View File

@ -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<double>(_ret);

4
qt-restricted-extras/charts6/gen_qcategoryaxis.go
View File

@ -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.

2
qt-restricted-extras/charts6/gen_qcategoryaxis.h
View File

@ -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);

12
qt-restricted-extras/charts6/gen_qchart.cpp
View File

@ -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<QAbstractAxis *> _ret = self->axes(static_cast<Qt::Orientations>(orientation));
// Convert QList<> from C++ memory to manually-managed C memory
QAbstractAxis** _arr = static_cast<QAbstractAxis**>(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);
}

24
qt-restricted-extras/charts6/gen_qchart.go
View File

@ -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 {

12
qt-restricted-extras/charts6/gen_qchart.h
View File

@ -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);

6
qt-restricted-extras/charts6/gen_qlegend.cpp
View File

@ -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<QLegendMarker *> _ret = self->markers(series);
// Convert QList<> from C++ memory to manually-managed C memory
QLegendMarker** _arr = static_cast<QLegendMarker**>(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);
}

12
qt-restricted-extras/charts6/gen_qlegend.go
View File

@ -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.

6
qt-restricted-extras/charts6/gen_qlegend.h
View File

@ -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

2
qt-restricted-extras/charts6/gen_qpieseries.cpp
View File

@ -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);
}

4
qt-restricted-extras/charts6/gen_qpieseries.go
View File

@ -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.

2
qt-restricted-extras/charts6/gen_qpieseries.h
View File

@ -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);

4
qt-restricted-extras/charts6/gen_qpieslice.cpp
View File

@ -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);
}

8
qt-restricted-extras/charts6/gen_qpieslice.go
View File

@ -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.

4
qt-restricted-extras/charts6/gen_qpieslice.h
View File

@ -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);

2
qt-restricted-extras/charts6/gen_qpolarchart.cpp
View File

@ -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<QAbstractAxis *> _ret = self->axes(static_cast<QPolarChart::PolarOrientations>(polarOrientation));
// Convert QList<> from C++ memory to manually-managed C memory
QAbstractAxis** _arr = static_cast<QAbstractAxis**>(malloc(sizeof(QAbstractAxis*) * _ret.length()));

4
qt-restricted-extras/charts6/gen_qpolarchart.go
View File

@ -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++ {

2
qt-restricted-extras/charts6/gen_qpolarchart.h
View File

@ -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);

10
qt-restricted-extras/charts6/gen_qxyseries.cpp
View File

@ -2,10 +2,10 @@
#include <QBrush>
#include <QColor>
#include <QFont>
#include <QHash>
#include <QImage>
#include <QLinearGradient>
#include <QList>
#include <QMap>
#include <QMetaMethod>
#include <QMetaObject>
#include <QObject>
@ -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);
}

16
qt-restricted-extras/charts6/gen_qxyseries.go
View File

@ -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) {

8
qt-restricted-extras/charts6/gen_qxyseries.h
View File

@ -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);

6
qt-restricted-extras/qscintilla/gen_qsciapis.cpp
View File

@ -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);
}

12
qt-restricted-extras/qscintilla/gen_qsciapis.go
View File

@ -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.

6
qt-restricted-extras/qscintilla/gen_qsciapis.h
View File

@ -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);

6
qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.cpp
View File

@ -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<int*>(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<int*>(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<int*>(style));
}

12
qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.go
View File

@ -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)
}

6
qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.h
View File

@ -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);

6
qt-restricted-extras/qscintilla/gen_qscilexercpp.cpp
View File

@ -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<int*>(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<int*>(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<int*>(style));
}

12
qt-restricted-extras/qscintilla/gen_qscilexercpp.go
View File

@ -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)
}

6
qt-restricted-extras/qscintilla/gen_qscilexercpp.h
View File

@ -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);

4
qt-restricted-extras/qscintilla/gen_qscilexercss.cpp
View File

@ -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<int*>(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<int*>(style));
}

8
qt-restricted-extras/qscintilla/gen_qscilexercss.go
View File

@ -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)
}

4
qt-restricted-extras/qscintilla/gen_qscilexercss.h
View File

@ -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);

6
qt-restricted-extras/qscintilla/gen_qscilexerd.cpp
View File

@ -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<int*>(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<int*>(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<int*>(style));
}

12
qt-restricted-extras/qscintilla/gen_qscilexerd.go
View File

@ -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)
}

6
qt-restricted-extras/qscintilla/gen_qscilexerd.h
View File

@ -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);

2
qt-restricted-extras/qscintilla/gen_qscilexerlua.cpp
View File

@ -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<int*>(style));
}

4
qt-restricted-extras/qscintilla/gen_qscilexerlua.go
View File

@ -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)
}

2
qt-restricted-extras/qscintilla/gen_qscilexerlua.h
View File

@ -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);

6
qt-restricted-extras/qscintilla/gen_qscilexerpascal.cpp
View File

@ -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<int*>(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<int*>(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<int*>(style));
}

12
qt-restricted-extras/qscintilla/gen_qscilexerpascal.go
View File

@ -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)
}

6
qt-restricted-extras/qscintilla/gen_qscilexerpascal.h
View File

@ -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);

4
qt-restricted-extras/qscintilla/gen_qscilexerperl.cpp
View File

@ -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<int*>(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<int*>(style));
}

8
qt-restricted-extras/qscintilla/gen_qscilexerperl.go
View File

@ -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)
}

4
qt-restricted-extras/qscintilla/gen_qscilexerperl.h
View File

@ -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);

2
qt-restricted-extras/qscintilla/gen_qscilexerpython.cpp
View File

@ -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<int*>(style));
}

4
qt-restricted-extras/qscintilla/gen_qscilexerpython.go
View File

@ -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)
}

2
qt-restricted-extras/qscintilla/gen_qscilexerpython.h
View File

@ -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);

6
qt-restricted-extras/qscintilla/gen_qscilexerruby.cpp
View File

@ -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<int*>(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<int*>(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<int*>(style));
}

12
qt-restricted-extras/qscintilla/gen_qscilexerruby.go
View File

@ -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)
}

6
qt-restricted-extras/qscintilla/gen_qscilexerruby.h
View File

@ -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);

12
qt-restricted-extras/qscintilla/gen_qsciscintilla.cpp
View File

@ -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<int>(line));
}
@ -4352,15 +4352,15 @@ int QsciScintilla_markerDefine2(QsciScintilla* self, int sym, int markerNumber)
return self->markerDefine(static_cast<QsciScintilla::MarkerSymbol>(sym), static_cast<int>(markerNumber));
}
int QsciScintilla_markerDefine22(QsciScintilla* self, char ch, int markerNumber) {
int QsciScintilla_markerDefine3(QsciScintilla* self, char ch, int markerNumber) {
return self->markerDefine(static_cast<char>(ch), static_cast<int>(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<int>(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<int>(markerNumber));
}
@ -4368,7 +4368,7 @@ void QsciScintilla_markerDelete2(QsciScintilla* self, int linenr, int markerNumb
self->markerDelete(static_cast<int>(linenr), static_cast<int>(markerNumber));
}
void QsciScintilla_markerDeleteAll1(QsciScintilla* self, int markerNumber) {
void QsciScintilla_markerDeleteAllWithMarkerNumber(QsciScintilla* self, int markerNumber) {
self->markerDeleteAll(static_cast<int>(markerNumber));
}
@ -4392,7 +4392,7 @@ void QsciScintilla_setIndicatorOutlineColor2(QsciScintilla* self, QColor* col, i
self->setIndicatorOutlineColor(*col, static_cast<int>(indicatorNumber));
}
void QsciScintilla_clearMarginText1(QsciScintilla* self, int line) {
void QsciScintilla_clearMarginTextWithLine(QsciScintilla* self, int line) {
self->clearMarginText(static_cast<int>(line));
}

24
qt-restricted-extras/qscintilla/gen_qsciscintilla.go
View File

@ -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) {

12
qt-restricted-extras/qscintilla/gen_qsciscintilla.h
View File

@ -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);

4
qt-restricted-extras/qscintilla/gen_qsciscintillabase.cpp
View File

@ -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<unsigned int>(msg), static_cast<unsigned long>(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<unsigned int>(msg), static_cast<unsigned long>(wParam), static_cast<long>(lParam));
}

8
qt-restricted-extras/qscintilla/gen_qsciscintillabase.go
View File

@ -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.

4
qt-restricted-extras/qscintilla/gen_qsciscintillabase.h
View File

@ -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);

6
qt-restricted-extras/qscintilla6/gen_qsciapis.cpp
View File

@ -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);
}

12
qt-restricted-extras/qscintilla6/gen_qsciapis.go
View File

@ -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.

6
qt-restricted-extras/qscintilla6/gen_qsciapis.h
View File

@ -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);

6
qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.cpp
View File

@ -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<int*>(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<int*>(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<int*>(style));
}

12
qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.go
View File

@ -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)
}

6
qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.h
View File

@ -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);

6
qt-restricted-extras/qscintilla6/gen_qscilexercpp.cpp
View File

@ -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<int*>(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<int*>(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<int*>(style));
}

12
qt-restricted-extras/qscintilla6/gen_qscilexercpp.go
View File

@ -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)
}

6
qt-restricted-extras/qscintilla6/gen_qscilexercpp.h
View File

@ -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);

4
qt-restricted-extras/qscintilla6/gen_qscilexercss.cpp
View File

@ -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<int*>(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<int*>(style));
}

8
qt-restricted-extras/qscintilla6/gen_qscilexercss.go
View File

@ -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)
}

4
qt-restricted-extras/qscintilla6/gen_qscilexercss.h
View File

@ -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);

6
qt-restricted-extras/qscintilla6/gen_qscilexerd.cpp
View File

@ -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<int*>(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<int*>(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<int*>(style));
}

12
qt-restricted-extras/qscintilla6/gen_qscilexerd.go
View File

@ -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)
}

Some files were not shown because too many files have changed in this diff Show More