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

6 files changed, 9 insertions, 9 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index e6cf850..d7874f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9Mplayer \
 noinst_HEADERS = k9copy.h k9glwidget.h k9langselect.h k9main.h \
 	k9mencodercmdgen.h k9mp4title.h k9play.h k9playbackoptions.h k9prefauthor.h k9prefdvd.h \
 	k9prefmencoder.h k9prefmpeg4.h k9prefpreview.h k9redirect.h k9settings.h k9titlefactor.h \
-	k9updatefactor.h kconfigdlg.h
+	k9updatefactor.h tdeconfigdlg.h
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
@@ -27,7 +27,7 @@ k9copy_SOURCES = configDlg.ui images.h k9copy.cpp k9copy.png k9glwidget.cpp \
 	k9langselect.cpp k9main.cpp k9mainw.ui k9mencodercmdgen.cpp k9mp4title.cpp k9play.cpp \
 	k9playbackoptions.cpp k9prefauthor.cpp k9prefdvd.cpp k9prefmencoder.cpp k9prefmpeg4.cpp \
 	k9prefpreview.cpp k9redirect.cpp k9settings.cpp k9titlefactor.cpp k9updatefactor.cpp \
-	kconfigdlg.cpp kviewmpeg2.cpp kviewmpeg2.h langselectw.ui main.cpp mencoderCmdGen.ui \
+	tdeconfigdlg.cpp kviewmpeg2.cpp kviewmpeg2.h langselectw.ui main.cpp mencoderCmdGen.ui \
 	playbackoptionsw.ui prefAuthor.ui prefDVD.ui prefMPEG4.ui prefMencoder.ui prefpreview.ui \
 	titlefactor.ui viewmpeg2.ui
 k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
diff --git a/src/k9main.cpp b/src/k9main.cpp
index 1035e34..f10d15c 100644
--- a/src/k9main.cpp
+++ b/src/k9main.cpp
@@ -53,9 +53,9 @@
 #include <tqspinbox.h>
 #include <tqpainter.h>
 #include <kdirselectdialog.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kdiskfreesp.h>
 #include <tqvaluelist.h>
 #include <tdeversion.h>
diff --git a/src/k9main.h b/src/k9main.h
index 0a75343..9c131e6 100644
--- a/src/k9main.h
+++ b/src/k9main.h
@@ -16,7 +16,7 @@
 #include "k9cddrive.h"
 #include "images.h"
 #include "k9mainw.h"
-#include "kconfigdlg.h"
+#include "tdeconfigdlg.h"
 #include "k9playbackoptions.h"
 #include <tqstring.h>
 #include <kmessagebox.h>
@@ -24,7 +24,7 @@
 #include <kmainwindow.h>
 #include <kaboutdata.h>
 #include <tqevent.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqlistbox.h>
 #include "k9copy.h"
 #include <tqmutex.h>
diff --git a/src/k9settings.h b/src/k9settings.h
index 60ffb45..52d0d55 100644
--- a/src/k9settings.h
+++ b/src/k9settings.h
@@ -13,7 +13,7 @@
 #define K9SETTINGS_H
 
 #include "k9common.h"
-#include "kconfigdlg.h"
+#include "tdeconfigdlg.h"
 #include "k9prefdvd.h"
 #include "k9prefmpeg4.h"
 #include "k9prefmencoder.h"
diff --git a/src/kconfigdlg.cpp b/src/tdeconfigdlg.cpp
index f0a39bb..3f001f5 100644
--- a/src/kconfigdlg.cpp
+++ b/src/tdeconfigdlg.cpp
@@ -18,7 +18,7 @@
 *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
 ***************************************************************************/
 
-#include "kconfigdlg.h"
+#include "tdeconfigdlg.h"
 #include "kmessagebox.h"
 
 #include <kiconloader.h>
diff --git a/src/kconfigdlg.h b/src/tdeconfigdlg.h
index 6bf098e..6bf098e 100644
--- a/src/kconfigdlg.h
+++ b/src/tdeconfigdlg.h