androidextras fix

mixedCase · Nov 19, 2015 · 254a798 · 254a798
1 parent 1f2e33b
commit 254a798
Show file tree

Hide file tree

Showing 7 changed files with 203 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -86,7 +86,7 @@
 
 # Quick Start
 
-1. Create a folder: [GoPath]/src/qtExample
+1. Create a folder: [GOPATH]/src/qtExample
 
 2. Create a file named main.go in this folder
 ```go
@@ -116,8 +116,8 @@ func main() {
 }
 ```
 
-3.Open the command line in [GoPath]/src, and run:
+3. Open the command line in [GOPATH]/src and run:
 `qtdeploy build desktop qtExample`
 
-4.Wait a minute,and then you will find the executable file here.
-`[GoPath]/src/qtExample/deploy/{windows|darwin|linux}/qtExample(.exe)`
+4. Wait a minute, then you will find the executable file here:
+`[GOPATH]/src/qtExample/deploy/{windows|darwin|linux}/qtExample.exe`
diff --git a/androidextras/androidextras_android.cpp b/androidextras/androidextras_android.cpp
@@ -1,9 +1,9 @@
 #include "qandroidactivityresultreceiver_android.h"
+#include <QUrl>
+#include <QModelIndex>
 #include <QAndroidJniObject>
 #include <QString>
 #include <QVariant>
-#include <QUrl>
-#include <QModelIndex>
 #include <QAndroidActivityResultReceiver>
 #include "_cgo_export.h"
 
@@ -16,10 +16,10 @@ void QAndroidActivityResultReceiver_HandleActivityResult(void* ptr, int receiver
 }
 
 #include "qandroidjniobject_android.h"
-#include <QString>
-#include <QVariant>
 #include <QUrl>
 #include <QModelIndex>
+#include <QString>
+#include <QVariant>
 #include <QAndroidJniObject>
 #include "_cgo_export.h"
 
@@ -35,10 +35,18 @@ void* QAndroidJniObject_NewQAndroidJniObject2(char* className){
 	return new QAndroidJniObject(const_cast<const char*>(className));
 }
 
+void* QAndroidJniObject_NewQAndroidJniObject3(char* className, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	return new QAndroidJniObject(const_cast<const char*>(className), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
+}
+
 void* QAndroidJniObject_NewQAndroidJniObject4(void* clazz){
 	return new QAndroidJniObject(static_cast<jclass>(clazz));
 }
 
+void* QAndroidJniObject_NewQAndroidJniObject5(void* clazz, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	return new QAndroidJniObject(static_cast<jclass>(clazz), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
+}
+
 void* QAndroidJniObject_NewQAndroidJniObject6(void* object){
 	return new QAndroidJniObject(static_cast<jobject>(object));
 }
@@ -54,10 +62,25 @@ void QAndroidJniObject_CallMethodVoid(void* ptr, char* methodName){
 }
 
 
+int QAndroidJniObject_CallMethodInt2(void* ptr, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	return static_cast<QAndroidJniObject*>(ptr)->callMethod<jint>(const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
+}
+int QAndroidJniObject_CallMethodBoolean2(void* ptr, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	return static_cast<QAndroidJniObject*>(ptr)->callMethod<jboolean>(const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
+}
+void QAndroidJniObject_CallMethodVoid2(void* ptr, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	static_cast<QAndroidJniObject*>(ptr)->callMethod<void>(const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
+}
+
+
 void* QAndroidJniObject_CallObjectMethod(void* ptr, char* methodName){
 	return new QAndroidJniObject(static_cast<QAndroidJniObject*>(ptr)->callObjectMethod<jobject>(const_cast<const char*>(methodName)).object());
 }
 
+void* QAndroidJniObject_CallObjectMethod2(void* ptr, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	return new QAndroidJniObject(static_cast<QAndroidJniObject*>(ptr)->callObjectMethod(const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v)).object());
+}
+
 int QAndroidJniObject_QAndroidJniObject_CallStaticMethodInt(char* className, char* methodName){
 	return QAndroidJniObject::callStaticMethod<jint>(const_cast<const char*>(className), const_cast<const char*>(methodName));
 }
@@ -69,6 +92,17 @@ void QAndroidJniObject_QAndroidJniObject_CallStaticMethodVoid(char* className, c
 }
 
 
+int QAndroidJniObject_QAndroidJniObject_CallStaticMethodInt2(char* className, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	return QAndroidJniObject::callStaticMethod<jint>(const_cast<const char*>(className), const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
+}
+int QAndroidJniObject_QAndroidJniObject_CallStaticMethodBoolean2(char* className, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	return QAndroidJniObject::callStaticMethod<jboolean>(const_cast<const char*>(className), const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
+}
+void QAndroidJniObject_QAndroidJniObject_CallStaticMethodVoid2(char* className, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	QAndroidJniObject::callStaticMethod<void>(const_cast<const char*>(className), const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
+}
+
+
 int QAndroidJniObject_QAndroidJniObject_CallStaticMethodInt3(void* clazz, char* methodName){
 	return QAndroidJniObject::callStaticMethod<jint>(static_cast<jclass>(clazz), const_cast<const char*>(methodName));
 }
@@ -80,14 +114,33 @@ void QAndroidJniObject_QAndroidJniObject_CallStaticMethodVoid3(void* clazz, char
 }
 
 
+int QAndroidJniObject_QAndroidJniObject_CallStaticMethodInt4(void* clazz, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	return QAndroidJniObject::callStaticMethod<jint>(static_cast<jclass>(clazz), const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
+}
+int QAndroidJniObject_QAndroidJniObject_CallStaticMethodBoolean4(void* clazz, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	return QAndroidJniObject::callStaticMethod<jboolean>(static_cast<jclass>(clazz), const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
+}
+void QAndroidJniObject_QAndroidJniObject_CallStaticMethodVoid4(void* clazz, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	QAndroidJniObject::callStaticMethod<void>(static_cast<jclass>(clazz), const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v));
+}
+
+
 void* QAndroidJniObject_QAndroidJniObject_CallStaticObjectMethod(char* className, char* methodName){
 	return new QAndroidJniObject(QAndroidJniObject::callStaticObjectMethod<jobject>(const_cast<const char*>(className), const_cast<const char*>(methodName)).object());
 }
 
+void* QAndroidJniObject_QAndroidJniObject_CallStaticObjectMethod2(char* className, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	return new QAndroidJniObject(QAndroidJniObject::callStaticObjectMethod(const_cast<const char*>(className), const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v)).object());
+}
+
 void* QAndroidJniObject_QAndroidJniObject_CallStaticObjectMethod3(void* clazz, char* methodName){
 	return new QAndroidJniObject(QAndroidJniObject::callStaticObjectMethod<jobject>(static_cast<jclass>(clazz), const_cast<const char*>(methodName)).object());
 }
 
+void* QAndroidJniObject_QAndroidJniObject_CallStaticObjectMethod4(void* clazz, char* methodName, char* signature, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v){
+	return new QAndroidJniObject(QAndroidJniObject::callStaticObjectMethod(static_cast<jclass>(clazz), const_cast<const char*>(methodName), const_cast<const char*>(signature), static_cast<jobject>(v0), static_cast<jobject>(v1), static_cast<jobject>(v2), static_cast<jobject>(v3), static_cast<jobject>(v4), static_cast<jobject>(v5), static_cast<jobject>(v6), static_cast<jobject>(v7), static_cast<jobject>(v8), static_cast<jobject>(v)).object());
+}
+
 void* QAndroidJniObject_QAndroidJniObject_FromString(char* stri){
 	return new QAndroidJniObject(QAndroidJniObject::fromString(QString(stri)).object());
 }
@@ -161,10 +214,10 @@ void QAndroidJniObject_DestroyQAndroidJniObject(void* ptr){
 }
 
 #include "qandroidjnienvironment_android.h"
-#include <QModelIndex>
 #include <QString>
 #include <QVariant>
 #include <QUrl>
+#include <QModelIndex>
 #include <QAndroidJniEnvironment>
 #include "_cgo_export.h"
 

diff --git a/androidextras/qandroidjniobject.go b/androidextras/qandroidjniobject.go
@@ -50,11 +50,21 @@ func NewQAndroidJniObject2(className string) *QAndroidJniObject {
 	return nil
 }
 
+func NewQAndroidJniObject3(className string, signature string, v ...interface{}) *QAndroidJniObject {
+
+	return nil
+}
+
 func NewQAndroidJniObject4(clazz unsafe.Pointer) *QAndroidJniObject {
 
 	return nil
 }
 
+func NewQAndroidJniObject5(clazz unsafe.Pointer, signature string, v ...interface{}) *QAndroidJniObject {
+
+	return nil
+}
+
 func NewQAndroidJniObject6(object unsafe.Pointer) *QAndroidJniObject {
 
 	return nil
@@ -73,11 +83,29 @@ func (ptr *QAndroidJniObject) CallMethodVoid(methodName string) {
 	return
 }
 
+func (ptr *QAndroidJniObject) CallMethodInt2(methodName string, signature string, v ...interface{}) int {
+
+	return 0
+}
+func (ptr *QAndroidJniObject) CallMethodBoolean2(methodName string, signature string, v ...interface{}) bool {
+
+	return false
+}
+func (ptr *QAndroidJniObject) CallMethodVoid2(methodName string, signature string, v ...interface{}) {
+
+	return
+}
+
 func (ptr *QAndroidJniObject) CallObjectMethod(methodName string) *QAndroidJniObject {
 
 	return nil
 }
 
+func (ptr *QAndroidJniObject) CallObjectMethod2(methodName string, signature string, v ...interface{}) *QAndroidJniObject {
+
+	return nil
+}
+
 func QAndroidJniObject_CallStaticMethodInt(className string, methodName string) int {
 
 	return 0
@@ -91,6 +119,19 @@ func QAndroidJniObject_CallStaticMethodVoid(className string, methodName string)
 	return
 }
 
+func QAndroidJniObject_CallStaticMethodInt2(className string, methodName string, signature string, v ...interface{}) int {
+
+	return 0
+}
+func QAndroidJniObject_CallStaticMethodBoolean2(className string, methodName string, signature string, v ...interface{}) bool {
+
+	return false
+}
+func QAndroidJniObject_CallStaticMethodVoid2(className string, methodName string, signature string, v ...interface{}) {
+
+	return
+}
+
 func QAndroidJniObject_CallStaticMethodInt3(clazz unsafe.Pointer, methodName string) int {
 
 	return 0
@@ -104,16 +145,39 @@ func QAndroidJniObject_CallStaticMethodVoid3(clazz unsafe.Pointer, methodName st
 	return
 }
 
+func QAndroidJniObject_CallStaticMethodInt4(clazz unsafe.Pointer, methodName string, signature string, v ...interface{}) int {
+
+	return 0
+}
+func QAndroidJniObject_CallStaticMethodBoolean4(clazz unsafe.Pointer, methodName string, signature string, v ...interface{}) bool {
+
+	return false
+}
+func QAndroidJniObject_CallStaticMethodVoid4(clazz unsafe.Pointer, methodName string, signature string, v ...interface{}) {
+
+	return
+}
+
 func QAndroidJniObject_CallStaticObjectMethod(className string, methodName string) *QAndroidJniObject {
 
 	return nil
 }
 
+func QAndroidJniObject_CallStaticObjectMethod2(className string, methodName string, signature string, v ...interface{}) *QAndroidJniObject {
+
+	return nil
+}
+
 func QAndroidJniObject_CallStaticObjectMethod3(clazz unsafe.Pointer, methodName string) *QAndroidJniObject {
 
 	return nil
 }
 
+func QAndroidJniObject_CallStaticObjectMethod4(clazz unsafe.Pointer, methodName string, signature string, v ...interface{}) *QAndroidJniObject {
+
+	return nil
+}
+
 func QAndroidJniObject_FromString(stri string) *QAndroidJniObject {
 
 	return nil