Merge branch 'master' into v5.12.mrg

Author: drswinghead

.travis.yml

@@ -8,6 +8,14 @@ matrix:
   fast_finish: true
   include:
     # the actual compilin'
+    - stage: Ubuntu14-go-master-tests
+      os: linux
+      env: JOB=tests-ubuntu14
+      go: "master"
+    - stage: Ubuntu14-go1.11-tests
+      os: linux
+      env: JOB=tests-ubuntu14
+      go: "1.11.x"
     - stage: Ubuntu14-go1.10-tests
       os: linux
       env: JOB=tests-ubuntu14
@@ -51,9 +59,17 @@ matrix:
         - WINARCH=x32
       services:
         - docker
+    - stage: MacOS-Xcode10.1-build
+      os: osx
+      osx_image: xcode10.1
+      env: JOB=build-osx
+    - stage: MacOS-Xcode9.4-build
+      os: osx
+      osx_image: xcode9.4
+      env: JOB=build-osx
     - stage: MacOS-Xcode9.3-build
       os: osx
-      osx_image: xcode9.3beta
+      osx_image: xcode9.3
       env: JOB=build-osx
     - stage: MacOS-Xcode8.3-tests
       os: osx

Dockerfile.mingw

@@ -1,4 +1,4 @@
-FROM base/archlinux
+FROM archlinux/base
 
 ADD run-mingw.sh /root/
 RUN chmod +x /root/run-mingw.sh

cmd/cgo-rcc/main.go

@@ -10,7 +10,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/kitech/qt.go/qtrt"
+	"github.com/kitech/qt.go/miscutil"
 	"github.com/kitech/qt.go/toolutil"
 )
 
@@ -42,11 +42,11 @@ func main() {
 	file = flag.Arg(0)
 	log.Println(flag.Arg(0))
 	filep = path.Base(file)[0:strings.LastIndex(path.Base(file), ".")]
-	filep = qtrt.IfElseStr(path.Dir(file) == "", filep, path.Dir(file)+"/"+filep)
+	filep = miscutil.IfElseStr(path.Dir(file) == "", filep, path.Dir(file)+"/"+filep)
 	log.Println(file, filep)
 
 	scc, err := toolutil.RunCmdOut("rcc", file)
-	qtrt.ErrPrint(err, "rcc", file)
+	miscutil.ErrPrint(err, "rcc", file)
 	if err != nil {
 		os.Exit(1)
 	}
@@ -164,14 +164,14 @@ func saveCode() {
 	code += cp.ExportAll()
 	savefile := fmt.Sprintf("%s_rc.go", filep)
 	err := ioutil.WriteFile(savefile, []byte(code), mod)
-	qtrt.ErrPrint(err, savefile)
+	miscutil.ErrPrint(err, savefile)
 
 	// gofmt the code
 	gofmtPath, err := exec.LookPath("gofmt")
-	qtrt.ErrPrint(err)
+	miscutil.ErrPrint(err)
 	cmd := exec.Command(gofmtPath, "-w", savefile)
 	err = cmd.Run()
-	qtrt.ErrPrint(err, cmd)
+	miscutil.ErrPrint(err, cmd)
 }
 
 func colon2uline(s string) string { return strings.Replace(s, ":", "_", -1) }

cmd/go-rcc/main.go

@@ -9,7 +9,6 @@ import (
 	"path"
 	"strings"
 
-	"github.com/kitech/qt.go/qtrt"
 	"github.com/kitech/qt.go/toolutil"
 )
 
@@ -32,11 +31,11 @@ func main() {
 	log.SetFlags(log.Flags() | log.Lshortfile)
 	file = os.Args[1]
 	filep = path.Base(file)[0:strings.LastIndex(path.Base(file), ".")]
-	filep = qtrt.IfElseStr(path.Dir(file) == "", filep, path.Dir(file)+"/"+filep)
+	filep = IfElseStr(path.Dir(file) == "", filep, path.Dir(file)+"/"+filep)
 	log.Println(file, filep)
 
 	scc, err := toolutil.RunCmdOut("rcc", file)
-	qtrt.ErrPrint(err, "rcc", file)
+	ErrPrint(err, "rcc", file)
 	if err != nil {
 		os.Exit(1)
 	}
@@ -106,8 +105,11 @@ func main() {
 }
 
 func transformMember(line string) {
+
 	home := os.Getenv("HOME")
-	line = strings.Replace(line, home, "/home/me", -1)
+	if home != "" {
+		line = strings.Replace(line, home, "/home/me", -1)
+	}
 	cp.APf("body", line)
 }
 
@@ -145,15 +147,49 @@ func saveCode() {
 	code += cp.ExportAll()
 	savefile := fmt.Sprintf("%s_rc.go", filep)
 	err := ioutil.WriteFile(savefile, []byte(code), mod)
-	qtrt.ErrPrint(err, savefile)
+	ErrPrint(err, savefile)
 
 	// gofmt the code
 	gofmtPath, err := exec.LookPath("gofmt")
-	qtrt.ErrPrint(err)
+	ErrPrint(err)
 	cmd := exec.Command(gofmtPath, "-w", savefile)
 	err = cmd.Run()
-	qtrt.ErrPrint(err, cmd)
+	ErrPrint(err, cmd)
 }
 
 func colon2uline(s string) string { return strings.Replace(s, ":", "_", -1) }
 func untitle(s string) string     { return strings.ToLower(s[0:1]) + s[1:] }
+
+///
+func printq(v interface{}, args ...interface{}) string {
+	msg := fmt.Sprintf("%+v", v)
+	for _, arg := range args {
+		msg += fmt.Sprintf(" %+v", arg)
+	}
+	return msg
+}
+
+func ErrPrint(err error, args ...interface{}) error {
+	if err != nil {
+		log.Output(2, printq(err, args...))
+	}
+	return err
+}
+
+// TODO 要是侯选可以惰性求值就好了，否则在只能一个求值的场景则会有问题
+// 简单的三元去处模拟函数
+func IfElse(q bool, tv interface{}, fv interface{}) interface{} {
+	if q == true {
+		return tv
+	} else {
+		return fv
+	}
+}
+
+func IfElseInt(q bool, tv int, fv int) int {
+	return IfElse(q, tv, fv).(int)
+}
+
+func IfElseStr(q bool, tv string, fv string) string {
+	return IfElse(q, tv, fv).(string)
+}

cmd/go-uic/main.go

@@ -10,7 +10,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/kitech/qt.go/qtrt"
+	"github.com/kitech/qt.go/miscutil"
 	"github.com/kitech/qt.go/toolutil"
 )
 
@@ -38,11 +38,11 @@ func main() {
 	file = os.Args[1]
 
 	filep = "ui_" + path.Base(file)[0:strings.LastIndex(path.Base(file), ".")]
-	filep = qtrt.IfElseStr(path.Dir(file) == "", filep, path.Dir(file)+"/"+filep)
+	filep = miscutil.IfElseStr(path.Dir(file) == "", filep, path.Dir(file)+"/"+filep)
 	log.Println(file, filep)
 
 	scc, err := toolutil.RunCmdOut("uic", "-g", "cpp", file)
-	qtrt.ErrPrint(err)
+	miscutil.ErrPrint(err)
 	if err != nil {
 		os.Exit(1)
 	}
@@ -179,6 +179,7 @@ func onSetupUi(line string) {
 	} else {
 		reg1 := regexp.MustCompile(`(.*) = new (Q.+)\(([0-9A-Za-z_]*)?\);`)
 		reg2 := regexp.MustCompile(`(.*)->setObjectName\(QStringLiteral\((.+)\)\);`)
+		reg2_1 := regexp.MustCompile(`(.*)->setObjectName\(QString::fromUtf8\((.+)\)\)`)
 		reg3 := regexp.MustCompile(`(.*)->(set.+Size)\(QSize\((.+)\)\);`)
 		reg4 := regexp.MustCompile(`([^->]+)[->.]+set([^(]+)\((.+)\);`)
 		reg5 := regexp.MustCompile(`([^->]+)[->.]+(add[^(]+)\((.+)\);`)
@@ -237,6 +238,13 @@ func onSetupUi(line string) {
 			log.Println(mats)
 			cp.APf("setupUi", "this.%s.SetObjectName(%s) // 112",
 				strings.Title(mats[0][1]), strings.Title(mats[0][2]))
+		} else if reg2_1.MatchString(line) {
+			log.Println("reg2_1")
+			mats := reg2_1.FindAllStringSubmatch(line, -1)
+			log.Println(mats)
+			log.Println(strings.Title(mats[0][2]))
+			cp.APf("setupUi", "this.%s.SetObjectName(%s) // 112",
+				strings.Title(mats[0][1]), strings.Title(mats[0][2]))
 		} else if reg3.MatchString(line) {
 			mats := reg3.FindAllStringSubmatch(line, -1)
 			log.Println(mats)
@@ -498,14 +506,14 @@ func saveCode() {
 	code += cp.ExportAll()
 	savefile := fmt.Sprintf("%s.go", filep)
 	err := ioutil.WriteFile(savefile, []byte(code), mod)
-	qtrt.ErrPrint(err, savefile)
+	miscutil.ErrPrint(err, savefile)
 
 	// gofmt the code
 	gofmtPath, err := exec.LookPath("gofmt")
-	qtrt.ErrPrint(err)
+	miscutil.ErrPrint(err)
 	cmd := exec.Command(gofmtPath, []string{"-w", savefile}...)
 	err = cmd.Run()
-	qtrt.ErrPrint(err, cmd)
+	miscutil.ErrPrint(err, cmd)
 }
 
 func colon2uline(s string) string { return strings.Replace(s, ":", "_", -1) }

docs/name-conversion.md

@@ -0,0 +1,111 @@
+
+C++ and Go have different name specific. 
+
+Although make effort similar to origin C++ name, but still some converts:
+
+### Qt components
+
+All Qt component names are converted to go package names with lowercase:
+
+* QtCore => qtcore.
+* QtGui => qtgui.
+* QtWidgets => qtwidgets.
+
+### class name
+
+class name is the same.
+
+### method name:
+* title the first charactor: `show() => Show()`
+
+* overloaded methods
+
+  According to overload index, add a number suffix. The first `0` is omitted.
+ 
+  `arg() => Arg1()`
+
+* has default arguments methods
+  
+  First, qt.go use `pn` where `n` is a number suffix.
+  And the `n` is omitted default arguments count. The first `0` is omitted.
+  
+  For C++:
+  
+  `void setShortcutEnabled(int id, bool enable = true);` 
+  
+  For Go, there will be two methods with different `pn` suffix:
+  
+  `func (this *QWidget) SetShortcutEnabled(id int, enable bool)`
+  `func (this *QWidget) SetShortcutEnabledp(id int)`
+
+### static methods
+
+qt.go use `class_method` as the full method name.
+
+For convenient, the class instance has a `method` method. Such as:
+
+```
+func (this *QCoreApplication) Flush()
+func QCoreApplication_Flush()
+```
+
+### protected methods
+
+qt.go use `Inherit` prefix with protected method name as override method.
+
+Original method has sementic means: call parent corresponding method.
+
+```
+func (this *QWidget) InheritEvent(func(evt *qtcore.Event) {
+   this.Event(evt)
+})
+```
+
+### class constructor
+
+Add `New` prefix to class name: `NewQPushButton(...)` 
+
+### protected methods
+
+Add `Inherit` prefix to method name: `InheritMouseMoveEvent(...)`
+
+### class internal enums
+
+qt.go use `class__enumname` as the full name.
+
+For C++:
+
+`QWidget::DrawWindowBackground`
+`QWidget::DrawChildren`
+
+For Go:
+
+`const QWidget__DrawWindowBackground = 1`
+`const QWidget__DrawChildren         = 2`
+
+### qt namespace enums
+
+qt.go use `namespace__enumname` as the full name:
+
+For C++:
+
+`Qt::black`
+`Qt::white`
+
+For Go:
+
+`const Qt__black = 2`
+`const Qt__white = 3`
+
+### QString
+
+Except `QString` class wrapper itself, all other `QString` are replaced with go `string`.
+
+### QObject and subclass type arguments
+
+Since it can passby all subclass type, so qt.go use interface type to emulate this feature.
+
+For every Qt class, there is a corresponding interface: `QWidget_ITF`
+
+Such one can passby any `QWidget` subclass instance just like in C++.
+

examples/eg00.go

@@ -5,11 +5,11 @@ package main
 #include <stdint.h>
 */
 import "C"
-import "qtcore"
+import "github.com/kitech/qt.go/qtcore"
 import "fmt"
 import "reflect"
 import "time"
-import "qtrt"
+import "github.com/kitech/qt.go/qtrt"
 
 func testResolve(args ...interface{}) {
 	var vtys = make(map[int32]map[int32]reflect.Type)