From 6a2fe24d053050ad288e1a942b8d892822c8522e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:52:23 -0600
Subject: [PATCH] Rename a number of libraries and executables to avoid
 conflicts with KDE4

---
 acinclude.m4                                              | 8 ++++----
 aclocal.m4                                                | 8 ++++----
 kaffeine/src/input/audiobrowser/googlefetcher.cpp         | 2 +-
 kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp   | 2 +-
 kaffeine/src/input/audiobrowser/googlefetcherdialog.h     | 2 +-
 kaffeine/src/input/audiobrowser/playlist.cpp              | 8 ++++----
 kaffeine/src/input/audiobrowser/playlist.h                | 2 +-
 kaffeine/src/input/audiobrowser/urllistview.cpp           | 4 ++--
 kaffeine/src/input/disc/disc.h                            | 2 +-
 kaffeine/src/input/disc/paranoia.cpp                      | 2 +-
 kaffeine/src/input/disc/paranoia.h                        | 2 +-
 kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h    | 2 +-
 kaffeine/src/input/disc/plugins/mp3lame/klameenc.h        | 2 +-
 kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h       | 2 +-
 kaffeine/src/input/dvb/dvbconfig.cpp                      | 2 +-
 kaffeine/src/input/dvb/dvbconfig.h                        | 4 ++--
 kaffeine/src/input/dvb/dvbpanel.cpp                       | 2 +-
 kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h | 2 +-
 kaffeine/src/input/dvbclient/cdwidget.h                   | 2 +-
 kaffeine/src/kaffeine.cpp                                 | 6 +++---
 kaffeine/src/player-parts/dummy-part/Makefile             | 2 +-
 .../src/player-parts/gstreamer-part/gstreamer_part.cpp    | 2 +-
 .../src/player-parts/kaffeine-part/playlistimport.cpp     | 2 +-
 kaffeine/src/player-parts/xine-part/equalizer.h           | 2 +-
 kaffeine/src/player-parts/xine-part/xine_part.cpp         | 4 ++--
 kaffeine/src/pref.cpp                                     | 2 +-
 26 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index ad88e42..ae99774 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/aclocal.m4 b/aclocal.m4
index 6af1570..c85c4c8 100644
--- a/aclocal.m4
+++ b/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
 ])
diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.cpp b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
index e5d0149..d41d561 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcher.cpp
+++ b/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"
diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
index d211864..4928ded 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
+++ b/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>
diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h b/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
index 211cbca..d4eafb3 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
+++ b/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"
 
diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
index 0383782..ec672f7 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/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>
diff --git a/kaffeine/src/input/audiobrowser/playlist.h b/kaffeine/src/input/audiobrowser/playlist.h
index 24a02ca..021d60d 100644
--- a/kaffeine/src/input/audiobrowser/playlist.h
+++ b/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>
 
diff --git a/kaffeine/src/input/audiobrowser/urllistview.cpp b/kaffeine/src/input/audiobrowser/urllistview.cpp
index b9cbcd6..ca87dc6 100644
--- a/kaffeine/src/input/audiobrowser/urllistview.cpp
+++ b/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()
 {
diff --git a/kaffeine/src/input/disc/disc.h b/kaffeine/src/input/disc/disc.h
index 8c22ced..dae99e3 100644
--- a/kaffeine/src/input/disc/disc.h
+++ b/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>
diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp
index a38ef9a..14827e2 100644
--- a/kaffeine/src/input/disc/paranoia.cpp
+++ b/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"
diff --git a/kaffeine/src/input/disc/paranoia.h b/kaffeine/src/input/disc/paranoia.h
index 8cf7106..485be28 100644
--- a/kaffeine/src/input/disc/paranoia.h
+++ b/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"
diff --git a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
index 0469fba..61144a5 100644
--- a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
+++ b/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>
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
index 7132fe9..1796020 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
+++ b/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"
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
index 0000179..4096360 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
+++ b/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"
diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp
index c2dc47f..06c5ded 100644
--- a/kaffeine/src/input/dvb/dvbconfig.cpp
+++ b/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>
 
diff --git a/kaffeine/src/input/dvb/dvbconfig.h b/kaffeine/src/input/dvb/dvbconfig.h
index 87f00c1..697f73d 100644
--- a/kaffeine/src/input/dvb/dvbconfig.h
+++ b/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>
diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
index 58e7a10..c025619 100644
--- a/kaffeine/src/input/dvb/dvbpanel.cpp
+++ b/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>
diff --git a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h b/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h
index b193f12..987ec61 100644
--- a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h
+++ b/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.
diff --git a/kaffeine/src/input/dvbclient/cdwidget.h b/kaffeine/src/input/dvbclient/cdwidget.h
index 7506aad..5594e68 100644
--- a/kaffeine/src/input/dvbclient/cdwidget.h
+++ b/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"
diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
index bacf695..9b4093b 100644
--- a/kaffeine/src/kaffeine.cpp
+++ b/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>
diff --git a/kaffeine/src/player-parts/dummy-part/Makefile b/kaffeine/src/player-parts/dummy-part/Makefile
index 08cc2ff..27d08b3 100644
--- a/kaffeine/src/player-parts/dummy-part/Makefile
+++ b/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 = 
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
index 3124138..fe904fa 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
+++ b/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>
 
diff --git a/kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp b/kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp
index 9ae2b3b..f8a85b8 100644
--- a/kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp
+++ b/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"
 
diff --git a/kaffeine/src/player-parts/xine-part/equalizer.h b/kaffeine/src/player-parts/xine-part/equalizer.h
index e14a774..1b2a674 100644
--- a/kaffeine/src/player-parts/xine-part/equalizer.h
+++ b/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>
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
index 5a6914d..9712279 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
+++ b/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>
diff --git a/kaffeine/src/pref.cpp b/kaffeine/src/pref.cpp
index 7c61531..f487121 100644
--- a/kaffeine/src/pref.cpp
+++ b/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>