fix heavy depends

Author: drswinghead

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)
 	}
@@ -148,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.bak/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)
 	}
@@ -506,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) }

miscutil/util.go

@@ -0,0 +1,93 @@
+package miscutil
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"reflect"
+	"syscall"
+)
+
+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
+}
+
+func NilPrint(v interface{}, args ...interface{}) interface{} {
+	if v == nil {
+		log.Output(2, printq(v, args...))
+	}
+	return v
+}
+
+func FileExist(fname string) bool {
+	if _, err := os.Stat(fname); err != nil {
+		if err.(*os.PathError).Err == syscall.ENOENT {
+			return false
+		}
+	}
+	return true
+}
+
+// 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)
+}
+
+func Assert(v interface{}, info string, args ...interface{}) {
+	fmtv := fmt.Sprintf("%+v, %+v", v, info)
+	for _, arg := range args {
+		fmtv += fmt.Sprintf(", %+v", arg)
+	}
+	if v == nil {
+		panic(fmtv)
+	}
+
+	tv := reflect.TypeOf(v)
+	if tv.Kind() == reflect.Bool && v.(bool) == false {
+		panic(fmtv)
+	}
+
+	vv := reflect.ValueOf(v)
+	switch tv.Kind() {
+	case reflect.Int, reflect.Int16, reflect.Int32, reflect.Int64,
+		reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64,
+		reflect.Uint8, reflect.Int8:
+		if vv.Int() == 0 {
+			panic(fmtv)
+		}
+	case reflect.String:
+		if v.(string) == "" {
+			panic(fmtv)
+		}
+	}
+}
+
+var Uint8Ty = reflect.TypeOf(uint8(0))
+var IntTy = reflect.TypeOf(int(0))
+var Uint64Ty = reflect.TypeOf(uint64(0))
+var Float64Ty = reflect.TypeOf(float64(0))
+var Float32Ty = reflect.TypeOf(float32(0))

qtrt/util.go

@@ -1,90 +1,19 @@
 package qtrt
 
 import (
-	"fmt"
-	"log"
-	"os"
 	"reflect"
-	"syscall"
-)
-
-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
-}
-
-func NilPrint(v interface{}, args ...interface{}) interface{} {
-	if v == nil {
-		log.Output(2, printq(v, args...))
-	}
-	return v
-}
-
-func FileExist(fname string) bool {
-	if _, err := os.Stat(fname); err != nil {
-		if err.(*os.PathError).Err == syscall.ENOENT {
-			return false
-		}
-	}
-	return true
-}
 
-// 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)
-}
-
-func Assert(v interface{}, info string, args ...interface{}) {
-	fmtv := fmt.Sprintf("%+v, %+v", v, info)
-	for _, arg := range args {
-		fmtv += fmt.Sprintf(", %+v", arg)
-	}
-	if v == nil {
-		panic(fmtv)
-	}
+	"github.com/kitech/qt.go/miscutil"
+)
 
-	tv := reflect.TypeOf(v)
-	if tv.Kind() == reflect.Bool && v.(bool) == false {
-		panic(fmtv)
-	}
+var ErrPrint = miscutil.ErrPrint
+var NilPrint = miscutil.NilPrint
+var FileExist = miscutil.FileExist
 
-	vv := reflect.ValueOf(v)
-	switch tv.Kind() {
-	case reflect.Int, reflect.Int16, reflect.Int32, reflect.Int64,
-		reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64,
-		reflect.Uint8, reflect.Int8:
-		if vv.Int() == 0 {
-			panic(fmtv)
-		}
-	case reflect.String:
-		if v.(string) == "" {
-			panic(fmtv)
-		}
-	}
-}
+var IfElse = miscutil.IfElse
+var IfElseInt = miscutil.IfElseInt
+var IfElseStr = miscutil.IfElseStr
+var Assert = miscutil.Assert
 
 var Uint8Ty = reflect.TypeOf(uint8(0))
 var IntTy = reflect.TypeOf(int(0))

toolutil/util.go

@@ -3,14 +3,14 @@ package toolutil
 import (
 	"os/exec"
 
-	"github.com/kitech/qt.go/qtrt"
+	"github.com/kitech/qt.go/miscutil"
 )
 
 // RunCmdOut runs a comand and returns the commands output, or an error
 func RunCmdOut(name string, arg ...string) (string, error) {
 	cmd := exec.Command(name, arg...)
 	occ, err := cmd.Output() // Output runs the command and returns its standard output.
-	qtrt.ErrPrint(err, name, arg, occ)
+	miscutil.ErrPrint(err, name, arg, occ)
 	if err != nil {
 		return "", err
 	}