From 97eb9ff3aecbc86ab674cd5d1f2bfe273a9e368e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 23 Feb 2025 20:44:34 +0900 Subject: [PATCH] Add kglobalaccel.h --> tdeglobalaccel.h to conversion scripts and to r14.1.x backporting script Signed-off-by: Michele Calgaro --- conversions/kde-tde/convert_existing_kde3_app_to_tde | 2 ++ misc/patch-update-for-r14-1-x | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/conversions/kde-tde/convert_existing_kde3_app_to_tde b/conversions/kde-tde/convert_existing_kde3_app_to_tde index bcf3e00..2c72783 100755 --- a/conversions/kde-tde/convert_existing_kde3_app_to_tde +++ b/conversions/kde-tde/convert_existing_kde3_app_to_tde @@ -242,6 +242,7 @@ kmessagebox\.|\ ktempfile\.|\ kemailsettings\.|\ kglobal\.|\ +kglobalaccel\.|\ kglobalsettings\.|\ kmenubar\.|\ kprotocolmanager\.|\ @@ -504,6 +505,7 @@ xargs -r0 sed -ri \ -e "s|([^a-zA-Z0-9]\|^)ktempfile\.|\1tdetempfile.|g" \ -e "s|([^a-zA-Z0-9]\|^)kemailsettings\.|\1tdeemailsettings.|g" \ -e "s|([^a-zA-Z0-9]\|^)kglobal\.|\1tdeglobal.|g" \ + -e "s|([^a-zA-Z0-9]\|^)kglobalaccel\.h|\1tdeglobalaccel.h|g" \ -e "s|([^a-zA-Z0-9]\|^)kglobalsettings\.|\1tdeglobalsettings.|g" \ -e "s|([^a-zA-Z0-9]\|^)kmenubar\.|\1tdemenubar.|g" \ -e "s|([^a-zA-Z0-9]\|^)kprotocolmanager\.|\1tdeprotocolmanager.|g" \ diff --git a/misc/patch-update-for-r14-1-x b/misc/patch-update-for-r14-1-x index 5273daa..e324a61 100755 --- a/misc/patch-update-for-r14-1-x +++ b/misc/patch-update-for-r14-1-x @@ -64,3 +64,7 @@ sed -i "$@" \ -e "s|\bTDEApp\b|KApp|g" "$1" \ -e "s|\bnoTDEApp\b|noKApp|g" "$1" \ +# tdeglobalaccel.h --> kglobalaccel.h +sed -i "$@" \ + -e "s|\btdeglobalaccel\.h\b|kglobalaccel.h|g" "$1" \ +