summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2025-06-13 17:48:16 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2025-07-27 12:41:44 +0900
commitf689e16f35770e8ad9a7658150a0b36f13cf16cf (patch)
tree39d0ac496e91eee2651fb1b6b2bac27457f92ff0
parentac5eab457a81daa9da64aec775105a7703047023 (diff)
downloadtdebindings-master.tar.gz
tdebindings-master.zip
Rename 'guiThread' and related functions to 'coreThread'.HEADmaster
This relates to TDE/tqt#230. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--qtjava/javalib/org/trinitydesktop/qt/TQApplication.java2
-rw-r--r--qtjava/javalib/org/trinitydesktop/qt/TQApplicationSignals.java2
-rw-r--r--qtjava/javalib/qtjava/TQApplication.cpp4
-rw-r--r--qtjava/javalib/qtjava/TQApplication.h2
-rw-r--r--qtsharp/src/api/qt.xml4
-rw-r--r--qtsharp/src/bindings/static/TQApplication.cs12
6 files changed, 13 insertions, 13 deletions
diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQApplication.java b/qtjava/javalib/org/trinitydesktop/qt/TQApplication.java
index 3859c7e7..ed978c2d 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 wakeUpCoreThread();
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 6b2deee1..c45bd7a9 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_wakeUpCoreThread(JNIEnv* env, jobject obj)
{
- ((TQApplication*) QtSupport::getQt(env, obj))->wakeUpGuiThread();
+ ((TQApplication*) QtSupport::getQt(env, obj))->wakeUpCoreThread();
return;
}
diff --git a/qtjava/javalib/qtjava/TQApplication.h b/qtjava/javalib/qtjava/TQApplication.h
index 3732190d..385eb05b 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_wakeUpCoreThread (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 cde56cef..11ccdcd0 100644
--- a/qtsharp/src/api/qt.xml
+++ b/qtsharp/src/api/qt.xml
@@ -574,10 +574,10 @@
<qmethod name="saveState" access="public" return="void" id="0">
<qparam type="TQSessionManageramp" name="sm"/>
</qmethod>
- <qmethod name="wakeUpGuiThread" access="public" return="void" id="0"/>
+ <qmethod name="wakeUpCoreThread" access="public" return="void" id="0"/>
<qmethod name="lock" access="public" return="void" id="0"/>
<qmethod name="unlock" access="public" return="void" id="0">
- <qparam type="bool" name="wakeUpGui" default="true"/>
+ <qparam type="bool" name="wakeUpCore" default="true"/>
</qmethod>
<qmethod name="locked" access="public" return="bool" id="0"/>
<qmethod name="tryLock" access="public" return="bool" id="0"/>
diff --git a/qtsharp/src/bindings/static/TQApplication.cs b/qtsharp/src/bindings/static/TQApplication.cs
index cc5ea8f3..ed331e54 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_wakeUpCoreThread (IntPtr raw);
+ public void WakeUpCoreThread ()
{
- qt_QApplication_wakeUpGuiThread (rawObject);
+ qt_QApplication_wakeUpCoreThread (rawObject);
}
[DllImport("libtqtc", CharSet=CharSet.Ansi)]
@@ -426,10 +426,10 @@ namespace Qt {
}
[DllImport("libtqtc", CharSet=CharSet.Ansi)]
- private static extern void qt_QApplication_unlock (IntPtr raw, bool wakeUpGui);
- public void Unlock (bool wakeUpGui)
+ private static extern void qt_QApplication_unlock (IntPtr raw, bool wakeUpCore);
+ public void Unlock (bool wakeUpCore)
{
- qt_QApplication_unlock (rawObject, wakeUpGui);
+ qt_QApplication_unlock (rawObject, wakeUpCore);
}
[DllImport("libtqtc", CharSet=CharSet.Ansi)]