From de75cac2acc7883d74bb34fd915d9c1e57f68349 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 6 Dec 2011 01:44:10 -0600 Subject: [PATCH] Fix staticTQString --- kdejava/koala/kdejava/KGlobal.cpp | 4 ++-- kdejava/koala/kdejava/KGlobal.h | 2 +- kdejava/koala/org/kde/koala/KGlobal.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kdejava/koala/kdejava/KGlobal.cpp b/kdejava/koala/kdejava/KGlobal.cpp index 73609406..0a81bf2e 100644 --- a/kdejava/koala/kdejava/KGlobal.cpp +++ b/kdejava/koala/kdejava/KGlobal.cpp @@ -136,12 +136,12 @@ Java_org_kde_koala_KGlobal_sharedConfig(JNIEnv* env, jclass cls) } JNIEXPORT jstring JNICALL -Java_org_kde_koala_KGlobal_staticTQString(JNIEnv* env, jclass cls, jstring str) +Java_org_kde_koala_KGlobal_staticQString(JNIEnv* env, jclass cls, jstring str) { TQString _qstring; (void) cls; static TQCString* _qstring_str = 0; - _qstring = KGlobalJBridge::staticTQString((const char*) QtSupport::toCharString(env, str, &_qstring_str)); + _qstring = KGlobalJBridge::staticQString((const char*) QtSupport::toCharString(env, str, &_qstring_str)); return QtSupport::fromTQString(env, &_qstring); } diff --git a/kdejava/koala/kdejava/KGlobal.h b/kdejava/koala/kdejava/KGlobal.h index 07fb6cde..bb9afda2 100644 --- a/kdejava/koala/kdejava/KGlobal.h +++ b/kdejava/koala/kdejava/KGlobal.h @@ -18,7 +18,7 @@ extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KGlobal_sharedConfig (JNIEnv extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KGlobal_iconLoader (JNIEnv *env, jclass); extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KGlobal_locale (JNIEnv *env, jclass); extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KGlobal_charsets (JNIEnv *env, jclass); -extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KGlobal_staticTQString (JNIEnv *env, jclass, jstring); +extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KGlobal_staticQString (JNIEnv *env, jclass, jstring); extern JNIEXPORT void JNICALL Java_org_kde_koala_KGlobal_registerStaticDeleter (JNIEnv *env, jclass, jobject); extern JNIEXPORT void JNICALL Java_org_kde_koala_KGlobal_unregisterStaticDeleter (JNIEnv *env, jclass, jobject); extern JNIEXPORT void JNICALL Java_org_kde_koala_KGlobal_deleteStaticDeleters (JNIEnv *env, jclass); diff --git a/kdejava/koala/org/kde/koala/KGlobal.java b/kdejava/koala/org/kde/koala/KGlobal.java index 5515caae..707e4b48 100644 --- a/kdejava/koala/org/kde/koala/KGlobal.java +++ b/kdejava/koala/org/kde/koala/KGlobal.java @@ -93,7 +93,7 @@ public class KGlobal implements QtSupport { @short Creates a static String. */ - public static native String staticTQString(String str); + public static native String staticQString(String str); /** Registers a static deleter. @param d the static deleter to register