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

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
 ])

aclocal.m4

@@ -614,7 +614,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
@@ -1800,7 +1800,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
@@ -2106,7 +2106,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")
@@ -2116,7 +2116,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
 ])

libkipi/libkipi/batchprogressdialog.cpp

@@ -45,7 +45,7 @@
 #include <klocale.h>
 #include <kprogress.h>
 #include <kinstance.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>

libkipi/libkipi/imagecollectionselector.cpp

@@ -36,7 +36,7 @@
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 // KIPI includes.
 

libkipi/libkipi/imagedialog.cpp

@@ -36,7 +36,7 @@
 #include <klistview.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <khelpmenu.h>

libkipi/libkipi/pluginloader.cpp

@@ -31,7 +31,7 @@
 #include "plugin.h"
 #include "pluginloader.h"
 #include "interface.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 

libkipi/libkipi/uploadwidget.cpp

@@ -31,7 +31,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <kmessagebox.h>
 
 #include <tdeversion.h>

libkipi/libkipi/uploadwidget.h

@@ -30,7 +30,7 @@
 
 // KDE includes.
 
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 #include <kurl.h>
 
 // LibKIPI includes.

po/lt/libkipi.po

@@ -48,7 +48,7 @@ msgstr ""
 "Būsena\n"
 "#-#-#-#-#  kopete.po (kopete)  #-#-#-#-#\n"
 "Būsena\n"
-"#-#-#-#-#  kfileshare.po (kfileshare)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefileshare.po (tdefileshare)  #-#-#-#-#\n"
 "Būsena\n"
 "#-#-#-#-#  kpf.po (kpf)  #-#-#-#-#\n"
 "Būsena\n"