summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-12-10 11:44:52 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-12-10 11:44:52 +0900
commit2cd34c10043a0b6b1cc896dc325049f4c4d80882 (patch)
tree3ea955e5bfade460cf2e3242ee707995dd0e3477
parent50f6e35dd57b4f656dd8d7291f8046742dc0aae5 (diff)
downloadscripts-2cd34c10043a0b6b1cc896dc325049f4c4d80882.tar.gz
scripts-2cd34c10043a0b6b1cc896dc325049f4c4d80882.zip
Add kprocctrl --> tdeprocctrl to conversion scripts and to r14.1.x backporting script
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rwxr-xr-xconversions/kde-tde/convert_existing_kde3_app_to_tde2
-rwxr-xr-xmisc/patch-update-for-r14-1-x2
2 files changed, 4 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 27a6b93..2279f8c 100755
--- a/conversions/kde-tde/convert_existing_kde3_app_to_tde
+++ b/conversions/kde-tde/convert_existing_kde3_app_to_tde
@@ -215,6 +215,7 @@ KComp|\
KGlobal|\
(|the)KProcess|\
kprocess|\
+kprocctrl|\
KClipboard|\
Kwallet|\
KWallet|\
@@ -464,6 +465,7 @@ xargs -r0 sed -ri \
-e "s|([^a-zA-Z0-9]\|^)KGlobal|\1TDEGlobal|g" \
-e "s|([^a-zA-Z0-9]\|the\|^)KProcess|\1TDEProcess|g" \
-e "s|([^a-zA-Z0-9]\|^)kprocess|\1tdeprocess|g" \
+ -e "s|([^a-zA-Z0-9]\|^)kprocctrl|\1tdeprocctrl|g" \
-e "s|([^a-zA-Z0-9]\|^)KClipboard|\1TDEClipboard|g" \
-e "s|([^a-zA-Z0-9]\|^)Kwallet|\1TDEwallet|g" \
-e "s|([^a-zA-Z0-9]\|^)KWallet|\1TDEWallet|g" \
diff --git a/misc/patch-update-for-r14-1-x b/misc/patch-update-for-r14-1-x
index 855f565..f523577 100755
--- a/misc/patch-update-for-r14-1-x
+++ b/misc/patch-update-for-r14-1-x
@@ -44,6 +44,8 @@ sed -i "$@" \
-e "s|m_TDEAppDCOPInterface|m_KAppDCOPInterface|g" \
-e "s|TDEAPPDCOP_INTERFACE_H|KAPPDCOP_INTERFACE_H|g"
+# tdeprocctrl --> kprocctrl
# tdeprocess --> kprocess
sed -i "$@" \
+ -e "s|tdeprocctrl|kprocctrl|g" \
-e "s|tdeprocess|kprocess|g"