diff options
| -rwxr-xr-x | conversions/kde-tde/convert_existing_kde3_app_to_tde | 2 | ||||
| -rwxr-xr-x | conversions/qt3-tqt3/convert_existing_qt3_app_to_tqt3 | 9 | ||||
| -rwxr-xr-x | misc/patch-update-for-r14-1-x | 8 |
3 files changed, 19 insertions, 0 deletions
diff --git a/conversions/kde-tde/convert_existing_kde3_app_to_tde b/conversions/kde-tde/convert_existing_kde3_app_to_tde index 03cad1e..df8a54c 100755 --- a/conversions/kde-tde/convert_existing_kde3_app_to_tde +++ b/conversions/kde-tde/convert_existing_kde3_app_to_tde @@ -266,6 +266,7 @@ tdewebdev\.org|\ \<tdelistr|\ kde toolbar widget\ kstandarddirs\.|\ +kinstance\.h|\ )" | tr "\n" "\0" | xargs -r0 sed -ri \ @@ -528,6 +529,7 @@ xargs -r0 sed -ri \ -e "s|([^a-zA-Z0-9]\|^)Categories=Qt;KDE|\1Categories=Qt;TDE|g" \ -e "s|([^a-zA-Z0-9]\|^)X-KDE-|\1X-TDE-|g" \ -e "s|([^a-zA-Z0-9]\|^)kstandarddirs\.|\1tdestandarddirs.|g" \ + -e "s|([^a-zA-Z0-9]\|^)kinstance\.h|\1tdeinstance.h|g" \ \ \ -e "s|kde\.org/tdehotnewstuff|kde.org/khotnewstuff|g" \ 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" \ + |