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

acinclude.m4

@@ -646,7 +646,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
@@ -1967,7 +1967,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
@@ -2313,7 +2313,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")
@@ -2323,7 +2323,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
 ])

adept/adept/installerview.cpp

@@ -3,7 +3,7 @@
 #include <tqtextbrowser.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <cmath>
 

adept/adept/packagedetails.cpp

@@ -7,8 +7,8 @@
 #include <ktoolbar.h>
 #include <ktoolbarbutton.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 #include <kapplication.h>
 
 #include <adept/lister.h>

adept/adept/packagedetailsui.ui

@@ -475,7 +475,7 @@
     </customwidget>
     <customwidget>
         <class>KFileDetailView</class>
-        <header location="global">kfiledetailview.h</header>
+        <header location="global">tdefiledetailview.h</header>
         <sizehint>
             <width>-1</width>
             <height>-1</height>
@@ -500,7 +500,7 @@
     <includehint>ktoolbar.h</includehint>
     <includehint>adept/packageinfo.h</includehint>
     <includehint>adept/lister.h</includehint>
-    <includehint>kfiledetailview.h</includehint>
+    <includehint>tdefiledetailview.h</includehint>
     <includehint>adept/tagchooser.h</includehint>
 </includehints>
 </UI>

adept/kubuntu_upgrader/upgradewizard.cpp

@@ -18,12 +18,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kprocess.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktar.h>
 #include <kdebug.h>
 

adept/libadept/packagedetails.cpp

@@ -7,8 +7,8 @@
 #include <ktoolbar.h>
 #include <ktoolbarbutton.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 #include <kapplication.h>
 
 #include <adept/lister.h>

adept/libadept/packagedetailsui.ui

@@ -433,7 +433,7 @@
     </customwidget>
     <customwidget>
         <class>KFileDetailView</class>
-        <header location="global">kfiledetailview.h</header>
+        <header location="global">tdefiledetailview.h</header>
         <sizehint>
             <width>-1</width>
             <height>-1</height>
@@ -458,7 +458,7 @@
     <includehint>ktoolbar.h</includehint>
     <includehint>adept/packageinfo.h</includehint>
     <includehint>adept/lister.h</includehint>
-    <includehint>kfiledetailview.h</includehint>
+    <includehint>tdefiledetailview.h</includehint>
     <includehint>adept/tagchooser.h</includehint>
 </includehints>
 </UI>

adept/notifier/app.cpp

@@ -15,7 +15,7 @@
 #include <kaboutapplication.h>
 #include <kaction.h>
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpassivepopup.h>
 #include <kiconloader.h>