From c0b24fe164924298d7e6ae33964b3c65fadbcba3 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:06:29 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 parts/documentation/docglobalconfigwidget.cpp      |  2 +-
 parts/documentation/documentation_part.cpp         |  4 +--
 parts/documentation/documentation_widget.cpp       |  2 +-
 parts/documentation/find_documentation_options.cpp |  2 +-
 parts/documentation/interfaces/CMakeLists.txt      |  2 +-
 .../interfaces/kdevdocumentationplugin.cpp         |  2 +-
 .../interfaces/kdevdocumentationplugin.h           |  2 +-
 parts/documentation/plugins/chm/docchmplugin.cpp   |  6 ++--
 .../plugins/custom/doccustomplugin.cpp             |  2 +-
 .../plugins/devhelp/docdevhelpplugin.cpp           |  2 +-
 parts/documentation/plugins/djvu/docdjvuplugin.cpp |  2 +-
 .../plugins/doxygen/docdoxygenplugin.cpp           |  2 +-
 .../plugins/kdevtoc/dockdevtocplugin.cpp           |  2 +-
 parts/documentation/plugins/pdb/docpdbplugin.cpp   |  2 +-
 parts/documentation/plugins/pdf/docpdfplugin.cpp   |  2 +-
 parts/documentation/plugins/qt/docqtplugin.cpp     |  2 +-
 parts/documentation/protocols/chm/CMakeLists.txt   |  2 +-
 parts/documentation/protocols/chm/Makefile.am      |  2 +-
 parts/documentation/protocols/chm/chm.h            |  4 +--
 parts/documentation/protocols/chm/chm.protocol     | 36 +++++++++++-----------
 parts/documentation/protocols/chm/kchmpart.h       |  4 +--
 parts/documentation/searchview.cpp                 |  2 +-
 parts/documentation/tools/htdig/CMakeLists.txt     |  2 +-
 parts/documentation/tools/htdig/htdigindex.cpp     |  2 +-
 24 files changed, 46 insertions(+), 46 deletions(-)

(limited to 'parts/documentation')

diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index 21fc1b5b..fa6bafd0 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -29,7 +29,7 @@
 #include <tqwidgetstack.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 77b4e6b2..b436520f 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -44,7 +44,7 @@
 #include <kbookmarkmenu.h>
 #include <kinputdialog.h>
 #include <kstringhandler.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <twin.h>
 #include <tdetexteditor/document.h>
 
@@ -636,7 +636,7 @@ TQCString DocumentationPart::startAssistant()
     TQDataStream arg(data, IO_WriteOnly);
     arg << app << URLs;
 
-    if (!TDEApplication::dcopClient()->call("klauncher", "klauncher", function,  data, replyType, replyData))
+    if (!TDEApplication::dcopClient()->call("tdelauncher", "tdelauncher", function,  data, replyType, replyData))
     {
         kdDebug() << "call failed" << endl;
         lastAssistant = "";
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index 567237e2..e7bbc6c3 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kdevcore.h>
 #include <kdevdocumentationplugin.h>
diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp
index df04ca81..54aac7ac 100644
--- a/parts/documentation/find_documentation_options.cpp
+++ b/parts/documentation/find_documentation_options.cpp
@@ -25,7 +25,7 @@
 #include <klistview.h>
 #include <klocale.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 FindDocumentationOptions::FindDocumentationOptions(TQWidget* parent, const char* name, bool modal)
diff --git a/parts/documentation/interfaces/CMakeLists.txt b/parts/documentation/interfaces/CMakeLists.txt
index 2809877a..f4a2ff08 100644
--- a/parts/documentation/interfaces/CMakeLists.txt
+++ b/parts/documentation/interfaces/CMakeLists.txt
@@ -39,6 +39,6 @@ install( FILES
 tde_add_library( documentation_interfaces SHARED AUTOMOC
   SOURCES kdevdocumentationplugin.cpp
   VERSION 0.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index 5c261c4c..6c6805e1 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -26,7 +26,7 @@
 
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <klocale.h>
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h
index aa329ac5..9c61e208 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.h
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.h
@@ -26,7 +26,7 @@
 #include <klistbox.h>
 #include <klistview.h>
 #include <kurl.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 #define CACHE_VERSION "3"
 
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index 7293d985..e17ec86b 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -21,10 +21,10 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <iostream>
 #include <fstream>
 #include <tqvaluevector.h>
@@ -101,7 +101,7 @@ TQString DocCHMPlugin::getSpecialData(const TQString& name, KURL url) {
 }
 
 
-///this currently is useless, because htdig cannot use kioslaves
+///this currently is useless, because htdig cannot use tdeioslaves
 TQStringList DocCHMPlugin::fullTextSearchLocations()
 {
     //return TQStringList::split( '\n', getSpecialData("contents", m_url));
diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp
index fb1a028b..cbf966a6 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.cpp
+++ b/parts/documentation/plugins/custom/doccustomplugin.cpp
@@ -21,7 +21,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
index 33a1fc77..d794f2a3 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
@@ -28,7 +28,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
index fca1b3b8..c156a085 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
@@ -21,7 +21,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
index a0df440a..13cee5d0 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
@@ -30,7 +30,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
index 50a5fd35..681fdbba 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
@@ -28,7 +28,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 #include <kstandarddirs.h>
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp
index f252c03e..06692f6c 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.cpp
+++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp
@@ -21,7 +21,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp
index c6dcb8ee..9bc4285a 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.cpp
+++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp
@@ -21,7 +21,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index b3e43388..19017d96 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 
diff --git a/parts/documentation/protocols/chm/CMakeLists.txt b/parts/documentation/protocols/chm/CMakeLists.txt
index 49745057..3a7ae935 100644
--- a/parts/documentation/protocols/chm/CMakeLists.txt
+++ b/parts/documentation/protocols/chm/CMakeLists.txt
@@ -34,7 +34,7 @@ install( FILES
 
 tde_add_kpart( kio_chm
   SOURCES decompress.cpp chmfile.cpp chm.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/parts/documentation/protocols/chm/Makefile.am b/parts/documentation/protocols/chm/Makefile.am
index d68f20bd..933f4685 100644
--- a/parts/documentation/protocols/chm/Makefile.am
+++ b/parts/documentation/protocols/chm/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/chm
+## Makefile.am of tdebase/tdeioslave/chm
 
 INCLUDES = -I$(top_srcdir)/lib/widgets $(all_includes) 
 
diff --git a/parts/documentation/protocols/chm/chm.h b/parts/documentation/protocols/chm/chm.h
index 333b5ca3..23d9f232 100644
--- a/parts/documentation/protocols/chm/chm.h
+++ b/parts/documentation/protocols/chm/chm.h
@@ -20,8 +20,8 @@
 #include <tqstring.h>
 #include <tqcstring.h>
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 #include "chmfile.h"
 
 class TQCString;
diff --git a/parts/documentation/protocols/chm/chm.protocol b/parts/documentation/protocols/chm/chm.protocol
index 90daa4c5..492524e0 100644
--- a/parts/documentation/protocols/chm/chm.protocol
+++ b/parts/documentation/protocols/chm/chm.protocol
@@ -5,32 +5,32 @@ input=none
 output=filesystem
 reading=true
 defaultMimetype=text/html
-Description=A kioslave for displaying WinHelp files
-Description[ca]=Un kioslave per a mostrar fitxers WinHelp
-Description[da]=En kioslave til visning af Windows hjælpefiler
+Description=A tdeioslave for displaying WinHelp files
+Description[ca]=Un tdeioslave per a mostrar fitxers WinHelp
+Description[da]=En tdeioslave til visning af Windows hjælpefiler
 Description[de]=Ein Ein-/Ausgabemodul zur Anzeige von WinHelp-Dateien
 Description[el]=Ένας υπηρέτης kio για εμφάνιση αρχείων WinHelp
-Description[es]=Un kioslave para mostrar archivos WinHelp
+Description[es]=Un tdeioslave para mostrar archivos WinHelp
 Description[et]=WinHelp-failide kuvamise IO-moodul
-Description[eu]=WinHelp fitxategiak bistaratzeko kioslave bat
-Description[fa]=یک kioslave برای نمایش پرونده‌های WinHelp
-Description[fr]=Un esclave d'E/S (kioslave) pour l'affichage des fichiers WinHelp
-Description[gl]=Un kioslave para mostrar ficheiros WinHelp
+Description[eu]=WinHelp fitxategiak bistaratzeko tdeioslave bat
+Description[fa]=یک tdeioslave برای نمایش پرونده‌های WinHelp
+Description[fr]=Un esclave d'E/S (tdeioslave) pour l'affichage des fichiers WinHelp
+Description[gl]=Un tdeioslave para mostrar ficheiros WinHelp
 Description[hu]=KDE-protokoll WinHelp-fájlok megjelenítéséhez
-Description[it]=Un kioslave per mostrare i file WinHelp
-Description[ja]=WinHelp を表示するための kioslave
+Description[it]=Un tdeioslave per mostrare i file WinHelp
+Description[ja]=WinHelp を表示するための tdeioslave
 Description[nds]=En In-/Utgaavmoduul för't Wiesen vun "WinHelp"-Dateien
 Description[ne]=WinHelp फाइलहरूका लागि किवस्लेभ
-Description[nl]=Een kioslave voor het weergeven van WinHelp-bestanden
-Description[pl]=kioslave do pokazywania plików WinHelp
-Description[pt]=A 'kioslave' para mostrar ficheiros WinHelp
-Description[pt_BR]=Um kioslave para exibir arquivos WinHelp
+Description[nl]=Een tdeioslave voor het weergeven van WinHelp-bestanden
+Description[pl]=tdeioslave do pokazywania plików WinHelp
+Description[pt]=A 'tdeioslave' para mostrar ficheiros WinHelp
+Description[pt_BR]=Um tdeioslave para exibir arquivos WinHelp
 Description[ru]=Обработчик ввода-вывода для файлов WinHelp
-Description[sk]=kioslave pre zobrazenie WinHelp súborov
+Description[sk]=tdeioslave pre zobrazenie WinHelp súborov
 Description[sr]=KIOSlave за приказ WinHelp фајлова
 Description[sr@Latn]=KIOSlave za prikaz WinHelp fajlova
 Description[sv]=En I/O-slav för att visa WinHelp-filer
-Description[tr]=WinHelp dosyalarını görüntülemek için bir kioslave
-Description[zh_CN]=显示 WinHelp 文件的 kioslave
-Description[zh_TW]=顯示 WinHelp 檔案的 kioslave
+Description[tr]=WinHelp dosyalarını görüntülemek için bir tdeioslave
+Description[zh_CN]=显示 WinHelp 文件的 tdeioslave
+Description[zh_TW]=顯示 WinHelp 檔案的 tdeioslave
 Icon=help
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index f8779d75..9d1812b1 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -21,8 +21,8 @@
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
 #include <tdehtml_part.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kdevhtmlpart.h>
 
 #include <tqcstring.h>
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index 16f71171..28e3a2eb 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -39,7 +39,7 @@
 #include <kprocess.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 
diff --git a/parts/documentation/tools/htdig/CMakeLists.txt b/parts/documentation/tools/htdig/CMakeLists.txt
index b3a627ac..35080ec6 100644
--- a/parts/documentation/tools/htdig/CMakeLists.txt
+++ b/parts/documentation/tools/htdig/CMakeLists.txt
@@ -24,6 +24,6 @@ link_directories(
 
 tde_add_executable( tdevelop-htdig AUTOMOC
   SOURCES htdigindex.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index b7b56304..57dde9ee 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -27,7 +27,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
-- 
cgit v1.2.3