summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconversions/qt3-tqt3/convert_existing_qt3_app_to_tqt39
-rwxr-xr-xmisc/patch-update-for-r14-1-x8
2 files changed, 17 insertions, 0 deletions
diff --git a/conversions/qt3-tqt3/convert_existing_qt3_app_to_tqt3 b/conversions/qt3-tqt3/convert_existing_qt3_app_to_tqt3
index 1b8976c..7b51767 100755
--- a/conversions/qt3-tqt3/convert_existing_qt3_app_to_tqt3
+++ b/conversions/qt3-tqt3/convert_existing_qt3_app_to_tqt3
@@ -371,6 +371,15 @@ xargs -r0 sed -i \
-e 's/ubitquitous/ubiquitous/g' \
-e 's/unitquifying/uniquifying/g'
+# Additional changes for TDE R14.2.0+
+find ./ -type f -iname "*" -not -iwholename '*.git*' -print0 |\
+xargs -r0 sed -i \
+ -e "s|\bguiThread\b|coreThread|g" \
+ -e "s|\bguiThreadAwake\b|coreThreadAwake|g" \
+ -e "s|\bfinishGuiThread\b|finishCoreThread|g" \
+ -e "s|\bisGuiThread\b|isCoreThread|g" \
+ -e "s|\bwakeUpGuiThread\b|wakeUpCoreThread|g"
+
# Headers
find ./ -type f -iname "*" -not -iwholename '*.git*' -print0 |\
xargs -r0 sed -i \
diff --git a/misc/patch-update-for-r14-1-x b/misc/patch-update-for-r14-1-x
index 9658d34..f92f9fb 100755
--- a/misc/patch-update-for-r14-1-x
+++ b/misc/patch-update-for-r14-1-x
@@ -84,3 +84,11 @@ sed -i "$@" \
-e "s|tdedesktopfile|kdesktopfile|g" "$1" \
-e "s|TDEDesktopFile|KDesktopFile|g" "$1" \
+# coreThread --> guiThread
+sed -i "$@" \
+ -e "s|\bcoreThread\b|guiThread|g" "$1" \
+ -e "s|\bcoreThreadAwake\b|guiThreadAwake|g" "$1" \
+ -e "s|\bfinishCoreThread\b|finishGuiThread|g" "$1" \
+ -e "s|\bisCoreThread\b|isGuiThread|g" "$1" \
+ -e "s|\bwakeUpCoreThread\b|wakeUpGuiThread|g" "$1" \
+