Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 0bc7357

Browse files
author
drswinghead
committedDec 10, 2018
Fix rename and build depend
1 parent 8c5edc9 commit 0bc7357

File tree

6 files changed

+28
-22
lines changed

6 files changed

+28
-22
lines changed
 

‎qtcore/mod.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ func (this *QObjectListx) Count(that *QObject) int {
5656
qtrt.ErrPrint(err, rv)
5757
return qtrt.Cretval2go("int", rv).(int)
5858
}
59-
func (this *QObjectListx) Count_1() int {
59+
func (this *QObjectListx) Count1() int {
6060
rv, err := qtrt.InvokeQtFunc6("C_QObjectList_count_1", qtrt.FFI_TYPE_POINTER, this.GetCthis())
6161
qtrt.ErrPrint(err, rv)
6262
return qtrt.Cretval2go("int", rv).(int)
6363
}
6464

6565
func (this *QObjectListx) ConvertToSlice() (lst []*QObject) {
66-
for i := 0; i < this.Count_1(); i++ {
66+
for i := 0; i < this.Count1(); i++ {
6767
lst = append(lst, this.At(i))
6868
}
6969
return
@@ -113,14 +113,14 @@ func (this *QFileInfoListx) Count(that *QFileInfo) int {
113113
qtrt.ErrPrint(err, rv)
114114
return qtrt.Cretval2go("int", rv).(int)
115115
}
116-
func (this *QFileInfoListx) Count_1() int {
116+
func (this *QFileInfoListx) Count1() int {
117117
rv, err := qtrt.InvokeQtFunc6("C_QFileInfoList_count_1", qtrt.FFI_TYPE_POINTER, this.GetCthis())
118118
qtrt.ErrPrint(err, rv)
119119
return qtrt.Cretval2go("int", rv).(int)
120120
}
121121

122122
func (this *QFileInfoListx) ConvertToSlice() (lst []*QFileInfo) {
123-
for i := 0; i < this.Count_1(); i++ {
123+
for i := 0; i < this.Count1(); i++ {
124124
lst = append(lst, this.At(i))
125125
}
126126
return
@@ -170,14 +170,14 @@ func (this *QModelIndexListx) Count(that *QModelIndex) int {
170170
qtrt.ErrPrint(err, rv)
171171
return qtrt.Cretval2go("int", rv).(int)
172172
}
173-
func (this *QModelIndexListx) Count_1() int {
173+
func (this *QModelIndexListx) Count1() int {
174174
rv, err := qtrt.InvokeQtFunc6("C_QModelIndexList_count_1", qtrt.FFI_TYPE_POINTER, this.GetCthis())
175175
qtrt.ErrPrint(err, rv)
176176
return qtrt.Cretval2go("int", rv).(int)
177177
}
178178

179179
func (this *QModelIndexListx) ConvertToSlice() (lst []*QModelIndex) {
180-
for i := 0; i < this.Count_1(); i++ {
180+
for i := 0; i < this.Count1(); i++ {
181181
lst = append(lst, this.At(i))
182182
}
183183
return
@@ -222,7 +222,7 @@ func (this *QVariantListx) At(i int) *QVariant {
222222
return NewQVariantFromPointer(unsafe.Pointer(uintptr(rv)))
223223
}
224224

225-
func (this *QVariantListx) Count_1() int {
225+
func (this *QVariantListx) Count1() int {
226226
rv, err := qtrt.InvokeQtFunc6("C_QVariantList_count_1", qtrt.FFI_TYPE_POINTER, this.GetCthis())
227227
qtrt.ErrPrint(err, rv)
228228
return qtrt.Cretval2go("int", rv).(int)
@@ -295,7 +295,7 @@ func (this *QStringListx) Count(s string) int {
295295
return qtrt.Cretval2go("int", rv).(int)
296296
}
297297

298-
func (this *QStringListx) Count_1() int {
298+
func (this *QStringListx) Count1() int {
299299
rv, err := qtrt.InvokeQtFunc6("C_QStringList_count_1", qtrt.FFI_TYPE_POINTER, this.GetCthis())
300300
qtrt.ErrPrint(err, rv)
301301
return qtrt.Cretval2go("int", rv).(int)
@@ -366,7 +366,7 @@ func (this *QUrlListx) Count(s string) int {
366366
return qtrt.Cretval2go("int", rv).(int)
367367
}
368368

369-
func (this *QUrlListx) Count_1() int {
369+
func (this *QUrlListx) Count1() int {
370370
rv, err := qtrt.InvokeQtFunc6("C_QUrlList_count_1", qtrt.FFI_TYPE_POINTER, this.GetCthis())
371371
qtrt.ErrPrint(err, rv)
372372
return qtrt.Cretval2go("int", rv).(int)
@@ -437,7 +437,7 @@ func (this *QSizeListx) Count(s string) int {
437437
return qtrt.Cretval2go("int", rv).(int)
438438
}
439439

440-
func (this *QSizeListx) Count_1() int {
440+
func (this *QSizeListx) Count1() int {
441441
rv, err := qtrt.InvokeQtFunc6("C_QSizeList_count_1", qtrt.FFI_TYPE_POINTER, this.GetCthis())
442442
qtrt.ErrPrint(err, rv)
443443
return qtrt.Cretval2go("int", rv).(int)

‎qtgui/mod.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ func (this *QWindowListx) Count(that *QWindow) int {
6161
qtrt.ErrPrint(err, rv)
6262
return qtrt.Cretval2go("int", rv).(int)
6363
}
64-
func (this *QWindowListx) Count_1() int {
64+
func (this *QWindowListx) Count1() int {
6565
rv, err := qtrt.InvokeQtFunc6("C_QWindowList_count_1", qtrt.FFI_TYPE_POINTER, this.GetCthis())
6666
qtrt.ErrPrint(err, rv)
6767
return qtrt.Cretval2go("int", rv).(int)
6868
}
6969

7070
func (this *QWindowListx) ConvertToSlice() (lst []*QWindow) {
71-
for i := 0; i < this.Count_1(); i++ {
71+
for i := 0; i < this.Count1(); i++ {
7272
lst = append(lst, this.At(i))
7373
}
7474
return

‎qtrt/c.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package qtrt
22

33
/*
4-
#cgo CFLAGS: -I/androidsys/include -I/androidsys/lib/libffi-3.2.1/include/
5-
#cgo LDFLAGS: -lffi
4+
#cgo pkg-config: libffi
65
*/
76
import "C"

‎qtrt/c_android.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package qtrt
22

33
/*
44
#cgo CFLAGS: -D__ANDROID_API__=16
5+
#cgo CFLAGS: -I/opt/androidsys/include -I/opt/androidsys/lib/libffi-3.2.1/include/
56
#cgo LDFLAGS: -lffi
67
*/
78
import "C"

‎qtrt/ffi_invoke.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ import (
8686
"io/ioutil"
8787
"log"
8888
"os"
89+
"path/filepath"
8990
"reflect"
9091
"regexp"
9192
"runtime"
@@ -196,12 +197,17 @@ func init_ffi_invoke() {
196197
ErrPrint(err)
197198
appdir := string(bcc[:bytes.IndexByte(bcc, 0)])
198199
for i := 0; i < 9; i++ {
199-
d := fmt.Sprintf("/data/app/%s%s/lib/%s/", appdir,
200-
IfElseStr(i == 0, "", fmt.Sprintf("-%d", i)), archs[runtime.GOARCH])
200+
d := fmt.Sprintf("/data/app/%s-%s/lib/%s/", appdir,
201+
IfElseStr(i == 0, "", fmt.Sprintf("%d", i)), archs[runtime.GOARCH])
201202
if FileExist(d) {
202203
return d
203204
}
204205
}
206+
dirs, err := filepath.Glob(fmt.Sprintf("/data/app/%s-*", appdir))
207+
ErrPrint(err)
208+
if len(dirs) > 0 {
209+
return dirs[0] + fmt.Sprintf("/lib/%s/", archs[runtime.GOARCH])
210+
}
205211
}
206212
return ""
207213
}

‎qtwidgets/mod.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ func (this *QWidgetListx) Count(that *QWidget) int {
6565
qtrt.ErrPrint(err, rv)
6666
return qtrt.Cretval2go("int", rv).(int)
6767
}
68-
func (this *QWidgetListx) Count_1() int {
68+
func (this *QWidgetListx) Count1() int {
6969
rv, err := qtrt.InvokeQtFunc6("C_QWidgetList_count_1", qtrt.FFI_TYPE_POINTER, this.GetCthis())
7070
qtrt.ErrPrint(err, rv)
7171
return qtrt.Cretval2go("int", rv).(int)
7272
}
7373

7474
func (this *QWidgetListx) ConvertToSlice() (lst []*QWidget) {
75-
for i := 0; i < this.Count_1(); i++ {
75+
for i := 0; i < this.Count1(); i++ {
7676
lst = append(lst, this.At(i))
7777
}
7878
return
@@ -119,14 +119,14 @@ func (this *QWidgetSetx) Count(that *QWidget) int {
119119
qtrt.ErrPrint(err, rv)
120120
return qtrt.Cretval2go("int", rv).(int)
121121
}
122-
func (this *QWidgetSetx) Count_1() int {
122+
func (this *QWidgetSetx) Count1() int {
123123
rv, err := qtrt.InvokeQtFunc6("C_QWidgetSet_count_1", qtrt.FFI_TYPE_POINTER, this.GetCthis())
124124
qtrt.ErrPrint(err, rv)
125125
return qtrt.Cretval2go("int", rv).(int)
126126
}
127127

128128
func (this *QWidgetSetx) ConvertToSlice() (lst []*QWidget) {
129-
for i := 0; i < this.Count_1(); i++ {
129+
for i := 0; i < this.Count1(); i++ {
130130
lst = append(lst, this.At(i))
131131
}
132132
return
@@ -176,14 +176,14 @@ func (this *QGraphicsItemListx) Count(that *QGraphicsItem) int {
176176
qtrt.ErrPrint(err, rv)
177177
return qtrt.Cretval2go("int", rv).(int)
178178
}
179-
func (this *QGraphicsItemListx) Count_1() int {
179+
func (this *QGraphicsItemListx) Count1() int {
180180
rv, err := qtrt.InvokeQtFunc6("C_QGraphicsItemList_count_1", qtrt.FFI_TYPE_POINTER, this.GetCthis())
181181
qtrt.ErrPrint(err, rv)
182182
return qtrt.Cretval2go("int", rv).(int)
183183
}
184184

185185
func (this *QGraphicsItemListx) ConvertToSlice() (lst []*QGraphicsItem) {
186-
for i := 0; i < this.Count_1(); i++ {
186+
for i := 0; i < this.Count1(); i++ {
187187
lst = append(lst, this.At(i))
188188
}
189189
return

0 commit comments

Comments
 (0)
Please sign in to comment.