diff --git a/contrib/mobile/androidUtils.cpp b/contrib/mobile/androidUtils.cpp index a4f1482ab394e9f29cda56807ce65bb3037021f5..4e395c81e1d4998df455bda7eb2ba6ec9dc6c8f4 100644 --- a/contrib/mobile/androidUtils.cpp +++ b/contrib/mobile/androidUtils.cpp @@ -163,7 +163,7 @@ extern "C" { { ((drawContext *)jptr)->eventHandler(jevent, jx, jy); } - JNIEXPORT jint JNICALL Java_org_geuz_onelab_Gmsh_setStringOption + JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_setStringOption (JNIEnv *env, jobject obj, jstring c, jstring n, jstring v, jint idx) { const char* tmp; @@ -178,7 +178,7 @@ extern "C" { env->ReleaseStringUTFChars(c, tmp); GmshSetStringOption(category, name, value, (int)idx); } - JNIEXPORT jint JNICALL Java_org_geuz_onelab_Gmsh_setDoubleOption + JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_setDoubleOption (JNIEnv *env, jobject obj, jstring c, jstring n, jdouble v, jint idx) { const char* tmp; @@ -190,7 +190,7 @@ extern "C" { env->ReleaseStringUTFChars(c, tmp); GmshSetNumberOption(category, name, (double)v, (int)idx); } - JNIEXPORT jint JNICALL Java_org_geuz_onelab_Gmsh_setIntegerOption + JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_setIntegerOption (JNIEnv *env, jobject obj, jstring c, jstring n, jint v, jint idx) { const char* tmp; @@ -256,13 +256,12 @@ extern "C" { } return params; } - JNIEXPORT jint JNICALL Java_org_geuz_onelab_Gmsh_setParam + JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_setParam (JNIEnv *env, jobject obj, jstring jtype, jstring jname, jstring jvalue) { const char *type = env->GetStringUTFChars(jtype, NULL); const char *name = env->GetStringUTFChars(jname, NULL); const char *value = env->GetStringUTFChars(jvalue, NULL); - // Get the original param and then change the value if(strcmp(type, "ParameterNumber") == 0){ std::vector<onelab::number> s; if(onelab::server::instance()->get(s, name)){ diff --git a/contrib/mobile/androidUtils.h b/contrib/mobile/androidUtils.h index ffdd1c37b65713e7a5313efe94fae3218ce5df4b..8e33b612918b53cddb6d41ee7903d907ad3d3474 100644 --- a/contrib/mobile/androidUtils.h +++ b/contrib/mobile/androidUtils.h @@ -21,11 +21,11 @@ JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_drawView (JNIEnv *, jobject, jlong); JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_eventHandler (JNIEnv *, jobject, jlong, jint, jfloat, jfloat); -JNIEXPORT jint JNICALL Java_org_geuz_onelab_Gmsh_setStringOption +JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_setStringOption (JNIEnv *, jobject, jstring, jstring, jstring, jint); -JNIEXPORT jint JNICALL Java_org_geuz_onelab_Gmsh_setDoubleOption +JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_setDoubleOption (JNIEnv *, jobject, jstring, jstring, jdouble, jint); -JNIEXPORT jint JNICALL Java_org_geuz_onelab_Gmsh_setIntegerOption +JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_setIntegerOption (JNIEnv *, jobject, jstring, jstring, jint, jint); JNIEXPORT jstring JNICALL Java_org_geuz_onelab_Gmsh_getStringOption (JNIEnv *, jobject, jstring, jstring, jint); @@ -35,7 +35,7 @@ JNIEXPORT jint JNICALL Java_org_geuz_onelab_Gmsh_getIntegerOption (JNIEnv *, jobject, jstring, jstring, jint); JNIEXPORT jobjectArray JNICALL Java_org_geuz_onelab_Gmsh_getParams (JNIEnv *, jobject); -JNIEXPORT jint JNICALL Java_org_geuz_onelab_Gmsh_setParam +JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_setParam (JNIEnv *, jobject, jstring, jstring, jstring); JNIEXPORT jint JNICALL Java_org_geuz_onelab_Gmsh_onelabCB (JNIEnv *, jobject, jstring);