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

kaffeine/src/input/audiobrowser/googlefetcher.cpp

@@ -30,7 +30,7 @@
 #include <klocale.h>
 #include <kinputdialog.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "googlefetcher.h"
 #include "googlefetcherdialog.h"

kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp

@@ -19,7 +19,7 @@
  */
 
 #include <kapplication.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>

kaffeine/src/input/audiobrowser/googlefetcherdialog.h

@@ -22,7 +22,7 @@
 #define GOOGLEFETCHERDIALOG_H
 
 #include <kiconview.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "googlefetcher.h"
 

kaffeine/src/input/audiobrowser/playlist.cpp

@@ -24,15 +24,15 @@
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <kprogress.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kpushbutton.h>

kaffeine/src/input/audiobrowser/playlist.h

@@ -24,7 +24,7 @@
 
 #include <kdialogbase.h>
 #include <kdiroperator.h>
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 #include <kaction.h>
 #include <kstdaction.h>
 

kaffeine/src/input/audiobrowser/urllistview.cpp

@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kglobalsettings.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpopupmenu.h>
 
 #include <tqfontmetrics.h>
@@ -222,7 +222,7 @@ void UrlListView::slotClicked(TQListViewItem*, const TQPoint&, int)
 }
 
 #include <tqdom.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 void UrlListView::slotAddSubtitle()
 {

kaffeine/src/input/disc/disc.h

@@ -23,7 +23,7 @@
 
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 
 #include <tqframe.h>

kaffeine/src/input/disc/paranoia.cpp

@@ -42,7 +42,7 @@
 #include <ktrader.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/componentfactory.h>
 
 #include "paranoia.h"

kaffeine/src/input/disc/paranoia.h

@@ -25,7 +25,7 @@
 #include <tqthread.h>
 #include <tqwidget.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kaffeineaudioencoder.h"
 #include "paranoiasettings.h"

kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h

@@ -22,7 +22,7 @@
 #define KAFFEINEAUDIOENCODER_H
 
 #include <tdeparts/part.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqstring.h>
 #include <tqwidget.h>

kaffeine/src/input/disc/plugins/mp3lame/klameenc.h

@@ -23,7 +23,7 @@
 
 #include <lame/lame.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kaffeineaudioencoder.h"
 #include "lameconfig.h"

kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h

@@ -31,7 +31,7 @@ extern "C"
 #include <vorbis/vorbisenc.h>
 }
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kaffeineaudioencoder.h"
 #include "oggconfig.h"

kaffeine/src/input/dvb/dvbconfig.cpp

@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktar.h>
 #include <kstandarddirs.h>
 

kaffeine/src/input/dvb/dvbconfig.h

@@ -32,8 +32,8 @@
 
 #include <kdialogbase.h>
 #include <kpushbutton.h>
-#include <kconfig.h>
-#include <kio/job.h>
+#include <tdeconfig.h>
+#include <tdeio/job.h>
 #include <kprogress.h>
 
 #include <linux/dvb/frontend.h>

kaffeine/src/input/dvb/dvbpanel.cpp

@@ -40,7 +40,7 @@
 #include <kicondialog.h>
 #include <kaction.h>
 #include <kprocess.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktrader.h>
 #include <kxmlguifactory.h>
 #include <tdeparts/componentfactory.h>

kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h

@@ -25,7 +25,7 @@
 #include <tqstring.h>
 
 #include <tdeparts/part.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 /*
  * Base-Class for Kaffeine DVB plugins.

kaffeine/src/input/dvbclient/cdwidget.h

@@ -27,7 +27,7 @@
 #include <tqvbox.h>
 #include <tqsplitter.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "cddump.h"
 #include "cdlisten.h"

kaffeine/src/kaffeine.cpp

@@ -27,9 +27,9 @@
 
 #include <dcopref.h>
 #include <kkeydialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdirselectdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kedittoolbar.h>
 #include <kaction.h>
@@ -49,7 +49,7 @@
 #include <kdebug.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kaboutdata.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>

kaffeine/src/player-parts/dummy-part/Makefile

@@ -95,7 +95,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
 KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
-KCONFIG_COMPILER = /usr/bin/kconfig_compiler
+KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
 KDECONFIG = /usr/bin/tde-config
 KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
 KDE_EXTRA_RPATH = 

kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp

@@ -29,7 +29,7 @@
 #include <kstandarddirs.h>
 #include <kxmlguifactory.h>
 #include <ktoolbar.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmimetype.h>
 #include <kpopupmenu.h>
 

kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp

@@ -23,7 +23,7 @@
 #include <tqxml.h>
 
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "playlistimport.h"
 

kaffeine/src/player-parts/xine-part/equalizer.h

@@ -22,7 +22,7 @@
 #define EQUALIZER_H
 
 #include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 #include <tqslider.h>

kaffeine/src/player-parts/xine-part/xine_part.cpp

@@ -25,14 +25,14 @@
 #include <kiconloader.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
 #include <kxmlguifactory.h>
 #include <kpopupmenu.h>
 #include <tdeparts/genericfactory.h>
 #include <kprogress.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 #include <kprocess.h>

kaffeine/src/pref.cpp

@@ -29,7 +29,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>