various qtbox related fixes

therecipe · Aug 27, 2020 · 311f713 · 311f713
1 parent 6367b92
commit 311f713
Show file tree

Hide file tree

Showing 58 changed files with 350 additions and 436 deletions.
diff --git a/bluetooth/bluetooth.go b/bluetooth/bluetooth.go
@@ -6,17 +6,9 @@ import (
 	"github.com/therecipe/qt/core"
 	"github.com/therecipe/qt/internal"
 	"github.com/therecipe/qt/network"
-	"strings"
 	"unsafe"
 )
 
-func unpackStringList(s string) []string {
-	if len(s) == 0 {
-		return make([]string, 0)
-	}
-	return strings.Split(s, "¡¦!")
-}
-
 type QBluetooth struct {
 	internal.Internal
 }

diff --git a/charts/charts.go b/charts/charts.go
@@ -7,17 +7,9 @@ import (
 	"github.com/therecipe/qt/gui"
 	"github.com/therecipe/qt/internal"
 	"github.com/therecipe/qt/widgets"
-	"strings"
 	"unsafe"
 )
 
-func unpackStringList(s string) []string {
-	if len(s) == 0 {
-		return make([]string, 0)
-	}
-	return strings.Split(s, "¡¦!")
-}
-
 type QAbstractAxis struct {
 	core.QObject
 }

diff --git a/core/core.go b/core/core.go
@@ -13,13 +13,6 @@ import (
 	"unsafe"
 )
 
-func unpackStringList(s string) []string {
-	if len(s) == 0 {
-		return make([]string, 0)
-	}
-	return strings.Split(s, "¡¦!")
-}
-
 type QAbstractAnimation struct {
 	QObject
 }

diff --git a/datavisualization/datavisualization.go b/datavisualization/datavisualization.go
@@ -6,17 +6,9 @@ import (
 	"github.com/therecipe/qt/core"
 	"github.com/therecipe/qt/gui"
 	"github.com/therecipe/qt/internal"
-	"strings"
 	"unsafe"
 )
 
-func unpackStringList(s string) []string {
-	if len(s) == 0 {
-		return make([]string, 0)
-	}
-	return strings.Split(s, "¡¦!")
-}
-
 type Q3DBars struct {
 	internal.Internal
 }

diff --git a/dbus/dbus.go b/dbus/dbus.go
@@ -5,17 +5,9 @@ package dbus
 import (
 	"github.com/therecipe/qt/core"
 	"github.com/therecipe/qt/internal"
-	"strings"
 	"unsafe"
 )
 
-func unpackStringList(s string) []string {
-	if len(s) == 0 {
-		return make([]string, 0)
-	}
-	return strings.Split(s, "¡¦!")
-}
-
 type QDBus struct {
 	internal.Internal
 }

diff --git a/designer/designer.go b/designer/designer.go
@@ -7,17 +7,9 @@ import (
 	"github.com/therecipe/qt/gui"
 	"github.com/therecipe/qt/internal"
 	"github.com/therecipe/qt/widgets"
-	"strings"
 	"unsafe"
 )
 
-func unpackStringList(s string) []string {
-	if len(s) == 0 {
-		return make([]string, 0)
-	}
-	return strings.Split(s, "¡¦!")
-}
-
 type AppFontDialog struct {
 	widgets.QDialog
 }

diff --git a/gamepad/gamepad.go b/gamepad/gamepad.go
@@ -5,17 +5,9 @@ package gamepad
 import (
 	"github.com/therecipe/qt/core"
 	"github.com/therecipe/qt/internal"
-	"strings"
 	"unsafe"
 )
 
-func unpackStringList(s string) []string {
-	if len(s) == 0 {
-		return make([]string, 0)
-	}
-	return strings.Split(s, "¡¦!")
-}
-
 type QGamepad struct {
 	core.QObject
 }

diff --git a/gui/gui.go b/gui/gui.go
@@ -6,17 +6,9 @@ import (
 	"github.com/therecipe/qt/core"
 	"github.com/therecipe/qt/internal"
 	"github.com/therecipe/qt/interop/gow"
-	"strings"
 	"unsafe"
 )
 
-func unpackStringList(s string) []string {
-	if len(s) == 0 {
-		return make([]string, 0)
-	}
-	return strings.Split(s, "¡¦!")
-}
-
 type QAbstractOpenGLFunctions struct {
 	internal.Internal
 }

diff --git a/help/help.go b/help/help.go
@@ -7,17 +7,9 @@ import (
 	"github.com/therecipe/qt/gui"
 	"github.com/therecipe/qt/internal"
 	"github.com/therecipe/qt/widgets"
-	"strings"
 	"unsafe"
 )
 
-func unpackStringList(s string) []string {
-	if len(s) == 0 {
-		return make([]string, 0)
-	}
-	return strings.Split(s, "¡¦!")
-}
-
 type QCompressedHelpInfo struct {
 	internal.Internal
 }

diff --git a/internal/binding/converter/output.go b/internal/binding/converter/output.go
@@ -846,7 +846,8 @@ func _cppOutput(name, value string, f *parser.Function) string {
 				f.Fullname == "QGuiApplication::highDpiScaleFactorRoundingPolicy" ||
 				f.Fullname == "QCanBusDevice::busStatus" ||
 				f.Fullname == "QTextBlockFormat::marker" ||
-				f.Fullname == "QActionGroup::exclusionPolicy" {
+				f.Fullname == "QActionGroup::exclusionPolicy" ||
+				f.ClassName() == "QWebEnginePage" {
 				return fmt.Sprintf("static_cast<qint64>(%v)", name)
 			}
 			return name

diff --git a/internal/binding/files/utils-qml.go b/internal/binding/files/utils-qml.go
@@ -305,6 +305,8 @@ func (ptr *QJSEngine) fromJsToRef(tofi reflect.Type, jsval *QJSValue) reflect.Va
 				return nil
 			}
 
+			//TODO: some functions can't return on a chan such as core.QAbstractListModel::RowCount (when called i.e. by the core.QAbstractListModel::Index method); warn about these methods here if the remote lanuage is not supporting "SupportsSyncCallsIntoRemote" ?
+
 			//needed only for interop  --->
 			fromJsToRefReturnsOnChan = true
 
@@ -320,7 +322,7 @@ func (ptr *QJSEngine) fromJsToRef(tofi reflect.Type, jsval *QJSValue) reflect.Va
 			}()
 
 			if tofi.NumOut() != 0 {
-				return []reflect.Value{reflect.ValueOf("___earlyReturn")}
+				return []reflect.Value{reflect.Zero(tofi.Out(0))} //TODO: (SupportsSyncCallsIntoRemote related); possible to trigger panic's with something like []reflect.Value{reflect.ValueOf("___earlyReturn")}
 			}
 			return nil
 			//needed only for interop  <---

diff --git a/internal/binding/parser/class.go b/internal/binding/parser/class.go
@@ -428,6 +428,15 @@ func (c *Class) GetFunction(fname string) *Function {
 	return nil
 }
 
+func (c *Class) GetFunctionWithOverloadNumber(fname string, num string) *Function {
+	for _, f := range c.Functions {
+		if f.Name == fname && f.OverloadNumber == num {
+			return f
+		}
+	}
+	return nil
+}
+
 func (c *Class) GetTitledFunction(fname string) *Function {
 	for _, f := range c.Functions {
 		if strings.Title(f.Name) == strings.Title(fname) {