diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQApplication.java b/qtjava/javalib/org/trinitydesktop/qt/TQApplication.java index 3859c7e7..090273da 100644 --- a/qtjava/javalib/org/trinitydesktop/qt/TQApplication.java +++ b/qtjava/javalib/org/trinitydesktop/qt/TQApplication.java @@ -69,7 +69,7 @@ public class TQApplication extends TQObject { public native String sessionKey(); public native void commitData(TQSessionManager sm); public native void saveState(TQSessionManager sm); - public native void wakeUpGuiThread(); + public native void wakeUpThread(); public native void quit(); public native void closeAllWindows(); public native void aboutTQt(); diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQApplicationSignals.java b/qtjava/javalib/org/trinitydesktop/qt/TQApplicationSignals.java index 438cac6f..eb162158 100644 --- a/qtjava/javalib/org/trinitydesktop/qt/TQApplicationSignals.java +++ b/qtjava/javalib/org/trinitydesktop/qt/TQApplicationSignals.java @@ -6,5 +6,5 @@ import java.util.ArrayList; public interface TQApplicationSignals { void lastWindowClosed(); void aboutToQuit(); - void guiThreadAwake(); + void coreThreadAwake(); } diff --git a/qtjava/javalib/qtjava/TQApplication.cpp b/qtjava/javalib/qtjava/TQApplication.cpp index f913e086..01725b20 100644 --- a/qtjava/javalib/qtjava/TQApplication.cpp +++ b/qtjava/javalib/qtjava/TQApplication.cpp @@ -987,9 +987,9 @@ Java_org_trinitydesktop_qt_QApplication_type(JNIEnv* env, jobject obj) } JNIEXPORT void JNICALL -Java_org_trinitydesktop_qt_QApplication_wakeUpGuiThread(JNIEnv* env, jobject obj) +Java_org_trinitydesktop_qt_QApplication_wakeUpThread(JNIEnv* env, jobject obj) { - ((TQApplication*) QtSupport::getQt(env, obj))->wakeUpGuiThread(); + ((TQApplication*) QtSupport::getQt(env, obj))->wakeUpThread(); return; } diff --git a/qtjava/javalib/qtjava/TQApplication.h b/qtjava/javalib/qtjava/TQApplication.h index 3732190d..20cdddb6 100644 --- a/qtjava/javalib/qtjava/TQApplication.h +++ b/qtjava/javalib/qtjava/TQApplication.h @@ -44,7 +44,7 @@ extern JNIEXPORT jstring JNICALL Java_org_trinitydesktop_qt_QApplication_session extern JNIEXPORT jstring JNICALL Java_org_trinitydesktop_qt_QApplication_sessionKey (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QApplication_commitData (JNIEnv *env, jobject, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QApplication_saveState (JNIEnv *env, jobject, jobject); -extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QApplication_wakeUpGuiThread (JNIEnv *env, jobject); +extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QApplication_wakeUpThread (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QApplication_quit (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QApplication_closeAllWindows (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_qt_QApplication_aboutTQt (JNIEnv *env, jobject); diff --git a/qtsharp/src/api/qt.xml b/qtsharp/src/api/qt.xml index 27601146..d8383fb4 100644 --- a/qtsharp/src/api/qt.xml +++ b/qtsharp/src/api/qt.xml @@ -574,7 +574,7 @@ - + diff --git a/qtsharp/src/bindings/static/TQApplication.cs b/qtsharp/src/bindings/static/TQApplication.cs index cc5ea8f3..1f32c9d9 100644 --- a/qtsharp/src/bindings/static/TQApplication.cs +++ b/qtsharp/src/bindings/static/TQApplication.cs @@ -412,10 +412,10 @@ namespace Qt { } [DllImport("libtqtc", CharSet=CharSet.Ansi)] - private static extern void qt_QApplication_wakeUpGuiThread (IntPtr raw); - public void WakeUpGuiThread () + private static extern void qt_QApplication_wakeUpThread (IntPtr raw); + public void WakeUpThread () { - qt_QApplication_wakeUpGuiThread (rawObject); + qt_QApplication_wakeUpThread (rawObject); } [DllImport("libtqtc", CharSet=CharSet.Ansi)]