Rename a number of libraries and executables to avoid conflicts with KDE4

6 files changed, 17 insertions, 17 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 0e48fb3..05fd784 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$trinity2ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$trinity3ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
diff --git a/configure.in b/configure.in
index 140f4f8..704cc5d 100644
--- a/configure.in
+++ b/configure.in
@@ -107,7 +107,7 @@ KDE_CREATE_SUBDIRSLIST
 AC_CONFIG_FILES([ Makefile ])
 AC_CONFIG_FILES([ lib/Makefile ])
 AC_CONFIG_FILES([ lib/chmlib/Makefile ])
-AC_CONFIG_FILES([ lib/kio-msits/Makefile ])
+AC_CONFIG_FILES([ lib/tdeio-msits/Makefile ])
 AC_CONFIG_FILES([ lib/libchmfile/Makefile ])
 AC_CONFIG_FILES([ po/Makefile ])
 AC_CONFIG_FILES([ src/Makefile ])
diff --git a/kchmviewer.kdevses b/kchmviewer.kdevses
index fc5b1d2..47a0b2f 100644
--- a/kchmviewer.kdevses
+++ b/kchmviewer.kdevses
@@ -35,7 +35,7 @@
   <Doc10 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/src/kchmviewwindowmgr.h" >
    <View0 Encoding="ISO 8859-1" Type="Source" />
   </Doc10>
-  <Doc11 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/lib/kio-msits/msits.h" >
+  <Doc11 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/lib/tdeio-msits/msits.h" >
    <View0 Encoding="ISO 8859-1" Type="Source" />
   </Doc11>
   <Doc12 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/lib/libchmfile/lchmurlhandler.h" >
diff --git a/lib/kio-msits/msits.h b/lib/kio-msits/msits.h
index 882e394..4248908 100755
--- a/lib/kio-msits/msits.h
+++ b/lib/kio-msits/msits.h
@@ -23,7 +23,7 @@
 #define MSITS_H
 
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include <kurl.h>
 
 #include <tqstring.h>
diff --git a/lib/kio-msits/msits.protocol b/lib/kio-msits/msits.protocol
index b087903..2f3b46e 100755
--- a/lib/kio-msits/msits.protocol
+++ b/lib/kio-msits/msits.protocol
@@ -6,19 +6,19 @@ output=filesystem
 reading=true
 listing=Name,Type,Size
 defaultMimetype=text/html
-Description=A kioslave for displaying WinHelp files
-Description[da]=En kioslave til visning af Windows hjælpefiler
+Description=A tdeioslave for displaying WinHelp files
+Description[da]=En tdeioslave til visning af Windows hjælpefiler
 Description[de]=Ein Ein-/Ausgabemodul zur Anzeige von WinHelp-Dateien
-Description[es]=Un kioslave para mostrar archivos WinHelp
+Description[es]=Un tdeioslave para mostrar archivos WinHelp
 Description[et]=WinHelp-failide kuvamise IO-moodul
 Description[fr]=Un module d'entrée / sortie pour l'affichage des fichiers WinHelp
 Description[hu]=KDE-protokoll WinHelp-fájlok megjelenítéséhez
-Description[it]=Un kioslave per mostrare i file 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[it]=Un tdeioslave per mostrare i file 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[sv]=En I/O-slav för att visa WinHelp-filer
-Description[xx]=xxA kioslave for displaying WinHelp filesxx
+Description[xx]=xxA tdeioslave for displaying WinHelp filesxx
 Icon=help
diff --git a/src/kde-qt.h b/src/kde-qt.h
index 0d65253..cc59837 100644
--- a/src/kde-qt.h
+++ b/src/kde-qt.h
@@ -36,7 +36,7 @@
 	#include <kcmdlineargs.h>
 	#include <klocale.h>
 	#include <klistview.h>
-	#include <kfiledialog.h>
+	#include <tdefiledialog.h>
 	#include <tdehtml_part.h>
 	#include <ktabwidget.h>
 	#include <kpopupmenu.h>