qt conversion scripts: don't use ntq* headers anymore

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8bd9e8f524)

conversions/kde-tde/convert_existing_kde3_app_to_tde

@@ -103,21 +103,11 @@ KDE_IS_PRELINKED|\
 KDE_UTF8_FILENAMES|\
 KDESYCOCA|\
 KApplication|\
-KAppDCOPInterface|\
-noKApp|\
-KApp|\
-kapp|\
-TDEApplication::kApplication()|\
-KUniqueApplication|\
 KCmdLineArgs|\
 KInstance|\
 KAboutData|\
 KCModule|\
 KConfig|\
-KSimpleConfig|\
-ksimpleconfig|\
-KDesktopFile|\
-kdesktopfile|\
 KServer|\
 KSocket|\
 KIO\.|\
@@ -202,7 +192,6 @@ kshort|\
 kstdaccel|\
 kaccel|\
 kaction|\
-kcrash|\
 kmain|\
 ktool|\
 kpopup|\
@@ -223,10 +212,6 @@ KAbout|\
 KComp|\
 KGlobal|\
 (|the)KProcess|\
-kprocess|\
-kprocctrl|\
-KProcIO|\
-kprocio|\
 KClipboard|\
 Kwallet|\
 KWallet|\
@@ -238,7 +223,6 @@ kaboutdialog\.|\
 kaboutkde\.|\
 kcmdlineargs\.|\
 kapplication\.|\
-kuniqueapplication\.|\
 kstyle\.|\
 drawKStylePrimitive|\
 kdiroperator\.|\
@@ -247,7 +231,6 @@ kmessagebox\.|\
 ktempfile\.|\
 kemailsettings\.|\
 kglobal\.|\
-kglobalaccel\.|\
 kglobalsettings\.|\
 kmenubar\.|\
 kprotocolmanager\.|\
@@ -265,8 +248,6 @@ tdevelop\.org|\
 tdewebdev\.org|\
 \<tdelistr|\
 kde toolbar widget\
-kstandarddirs\.|\
-kinstance\.h|\
 )" |
 tr "\n" "\0" |
 xargs -r0 sed -ri \
@@ -362,24 +343,13 @@ xargs -r0 sed -ri \
  -e "s|([^a-zA-Z0-9]\|^)KDE_UTF8_FILENAMES|\1TDE_UTF8_FILENAMES|g" \
  -e "s|([^a-zA-Z0-9]\|^)KDESYCOCA|\1TDESYCOCA|g" \
  \
- -e "s|([^a-zA-Z0-9]\|^)TDEApplication::kApplication()|\1tdeApp|g" \
  -e "s|([^a-zA-Z0-9]\|^)KApplication|\1TDEApplication|g" \
- -e "s|([^a-zA-Z0-9]\|^)kApplication|\1tdeApplication|g" \
- -e "s|([^a-zA-Z0-9]\|^)KUniqueApplication|\1TDEUniqueApplication|g" \
- -e "s|([^a-zA-Z0-9]\|^)KAppDCOPInterface|\1TDEAppDCOPInterface|g" \
  -e "s|([^a-zA-Z0-9]\|^)KCmdLineArgs|\1TDECmdLineArgs|g" \
  -e "s|([^a-zA-Z0-9]\|^)KInstance|\1TDEInstance|g" \
  -e "s|([^a-zA-Z0-9]\|^)KAboutData|\1TDEAboutData|g" \
- -e "s|([^a-zA-Z0-9]\|^)noKApp|\1noTDEApp|g" \
- -e "s|([^a-zA-Z0-9]\|^)KApp|\1TDEApp|g" \
- -e "s|([^a-zA-Z0-9]\|^)kapp|\1tdeApp|g" \
  \
  -e "s|([^a-zA-Z0-9]\|^)KCModule|\1TDECModule|g" \
  -e "s|([^a-zA-Z0-9]\|^)KConfig|\1TDEConfig|g" \
- -e "s|([^a-zA-Z0-9]\|^)KSimpleConfig|\1TDESimpleConfig|g" \
- -e "s|([^a-zA-Z0-9]\|^)ksimpleconfig|\1tdesimpleconfig|g" \
- -e "s|([^a-zA-Z0-9]\|^)KDesktopFile|\1TDEDesktopFile|g" \
- -e "s|([^a-zA-Z0-9]\|^)kdesktopfile|\1tdedesktopfile|g" \
  -e "s|([^a-zA-Z0-9]\|^)KServer|\1TDEServer|g" \
  -e "s|([^a-zA-Z0-9]\|^)KSocket|\1TDESocket|g" \
  -e "s|([^a-zA-Z0-9]\|^)KIO\.|\1TDEIO.|g" \
@@ -467,7 +437,6 @@ xargs -r0 sed -ri \
  -e "s|([^a-zA-Z0-9]\|^)kstdaccel|\1tdestdaccel|g" \
  -e "s|([^a-zA-Z0-9]\|^)kaccel|\1tdeaccel|g" \
  -e "s|([^a-zA-Z0-9]\|^)kaction|\1tdeaction|g" \
- -e "s|([^a-zA-Z0-9]\|^)kcrash|\1tdecrash|g" \
  -e "s|([^a-zA-Z0-9]\|^)kmain|\1tdemain|g" \
  -e "s|([^a-zA-Z0-9]\|^)ktool|\1tdetool|g" \
  -e "s|([^a-zA-Z0-9]\|^)kpopup|\1tdepopup|g" \
@@ -489,10 +458,6 @@ xargs -r0 sed -ri \
  -e "s|([^a-zA-Z0-9]\|^)KComp|\1TDEComp|g" \
  -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]\|^)KProcIO|\1TDEProcIO|g" \
- -e "s|([^a-zA-Z0-9]\|^)kprocio|\1tdeprocio|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" \
@@ -507,7 +472,6 @@ xargs -r0 sed -ri \
  -e "s|([^a-zA-Z0-9]\|^)kaboutkde\.|\1tdeabouttde.|g" \
  -e "s|([^a-zA-Z0-9]\|^)kcmdlineargs\.|\1tdecmdlineargs.|g" \
  -e "s|([^a-zA-Z0-9]\|^)kapplication\.|\1tdeapplication.|g" \
- -e "s|([^a-zA-Z0-9]\|^)kuniqueapplication\.|\1tdeuniqueapplication.|g" \
  -e "s|([^a-zA-Z0-9]\|^)kstyle\.|\1tdestyle.|g" \
  -e "s|([^a-zA-Z0-9]\|^)drawKStylePrimitive|\1drawTDEStylePrimitive|g" \
  \
@@ -517,7 +481,6 @@ 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" \
@@ -528,8 +491,6 @@ xargs -r0 sed -ri \
  -e "s|([^a-zA-Z0-9]\|^)kdewidgets|\1tdewidgets|g" \
  -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" \

conversions/qt3-tqt3/convert_existing_qt3_app_to_tqt3

@@ -371,15 +371,6 @@ 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 \

misc/patch-update-for-r14-1-x

@@ -1,94 +0,0 @@
-#!/bin/bash
-
-# Due to the ongoing API renaming in master, backporting commits from master
-# to r14.1.x could potentially lead to conflicts, and the probability of that
-# happening will keep increasing over time.
-# This script is intented to reduce/eliminate those conflicts by undoing the
-# API changes done in master.
-#
-if [ -z "$1" ]; then
-  cat <<USAGE
-Preparing patches for backporting from master to r14.1.x branch.
-Usage:
-
-1. save the changes of the commit to backport to a file
-   git format-patch -1 <commit hash> -o <output_folder>
-
-2. run this script on the saved file
-   $(basename "$0") <output_folder>/<patch_filename> [...]
-
-3. apply changes to r14.1.x branch
-   git am <output_folder>/<patch_filename>
-
-4. edit commit message to add cherry pick note under signed off clause
-   git commit --amend --no-edit -S
-   and add:
-       (cherry picked from <commit hash>)
-
-USAGE
-  exit 1
-fi
-
-# TDEUniqueApplication --> KUniqueApplication
-sed -i "$@" \
-    -e "s|TDEUniqueApplication|KUniqueApplication|g" \
-    -e "s|\btdeuniqueapp|kuniqueapp|g" \
-    -e "s|\btdeunique_|kunique_|g" \
-    -e "s|TDEUNIQUEAPP|KUNIQUEAPP|g" \
-
-# TDEAppDCOPInterface --> KAppDCOPInterface
-sed -i "$@" \
-    -e "s|TDEAppDCOPInterface|KAppDCOPInterface|g" \
-    -e "s|tdeappdcopinterface|kappdcopiface|g" \
-    -e "s|tdeappdcopiface|kappdcopiface|g" \
-    -e "s|m_TDEAppDCOPInterface|m_KAppDCOPInterface|g" \
-    -e "s|TDEAPPDCOP_INTERFACE_H|KAPPDCOP_INTERFACE_H|g" \
-
-# tdeprocctrl --> kprocctrl
-# tdeprocess --> kprocess
-# TDEProcIO --> KProcIO
-sed -i "$@" \
-    -e "s|tdeprocctrl|kprocctrl|g" \
-    -e "s|tdeprocess|kprocess|g" \
-    -e "s|TDEProcIO|KProcIO|g" \
-    -e "s|tdeprocio|kprocio|g" \
-
-# tdecrash --> kcrash
-sed -i "$@" \
-    -e "s|tdecrash|kcrash|g" \
-
-# tdeapp --> kapp
-sed -i "$@" \
-    -e "s|\btdeApplication\b|kApplication|g" "$1" \
-    -e "s|\btdeApp\b|kapp|g" "$1" \
-    -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" \
-
-# tdestandarddirs.h --> kstandarddirs.h
-sed -i "$@" \
-    -e "s|\btdestandarddirs\.h\b|kstandarddirs.h|g" "$1" \
-
-# tdesimpleconfig --> ksimpleconfig
-# TDESimpleConfig --> KSimpleConfig
-sed -i "$@" \
-    -e "s|tdesimpleconfig|ksimpleconfig|g" "$1" \
-    -e "s|TDESimpleConfig|KSimpleConfig|g" "$1" \
-
-# tdedesktopfile --> kdesktopfile
-# TDEDesktopFile --> KDesktopFile
-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" \
-