Additional k => tde renaming and fixes

12 files changed, 24 insertions, 24 deletions

diff --git a/tdefile-plugins/au/Makefile.am b/tdefile-plugins/au/Makefile.am
index 054c6181..da2be248 100644
--- a/tdefile-plugins/au/Makefile.am
+++ b/tdefile-plugins/au/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = tdefile_au.h
 kde_module_LTLIBRARIES = tdefile_au.la
 
 tdefile_au_la_SOURCES = tdefile_au.cpp 
-tdefile_au_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN)
-tdefile_au_la_LIBADD = $(LIB_KIO)
+tdefile_au_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_au_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/avi/Makefile.am b/tdefile-plugins/avi/Makefile.am
index 2ecbf411..b001c37c 100644
--- a/tdefile-plugins/avi/Makefile.am
+++ b/tdefile-plugins/avi/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = tdefile_avi.h
 kde_module_LTLIBRARIES = tdefile_avi.la
 
 tdefile_avi_la_SOURCES = tdefile_avi.cpp 
-tdefile_avi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN)
-tdefile_avi_la_LIBADD = $(LIB_KIO)
+tdefile_avi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_avi_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/flac/Makefile.am b/tdefile-plugins/flac/Makefile.am
index ddae9580..5438d8d4 100644
--- a/tdefile-plugins/flac/Makefile.am
+++ b/tdefile-plugins/flac/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = tdefile_flac.h
 kde_module_LTLIBRARIES = tdefile_flac.la
 
 tdefile_flac_la_SOURCES = tdefile_flac.cpp
-tdefile_flac_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN)
-tdefile_flac_la_LIBADD = $(LIB_KIO)
+tdefile_flac_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN)
+tdefile_flac_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/m3u/Makefile.am b/tdefile-plugins/m3u/Makefile.am
index 11259cad..8564a522 100644
--- a/tdefile-plugins/m3u/Makefile.am
+++ b/tdefile-plugins/m3u/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = tdefile_m3u.h
 kde_module_LTLIBRARIES = tdefile_m3u.la
 
 tdefile_m3u_la_SOURCES = tdefile_m3u.cpp
-tdefile_m3u_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN)
-tdefile_m3u_la_LIBADD = $(LIB_KSYCOCA)
+tdefile_m3u_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_m3u_la_LIBADD = $(LIB_TDESYCOCA)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/m3u/tdefile_m3u.h b/tdefile-plugins/m3u/tdefile_m3u.h
index afc46847..08a6c506 100644
--- a/tdefile-plugins/m3u/tdefile_m3u.h
+++ b/tdefile-plugins/m3u/tdefile_m3u.h
@@ -18,8 +18,8 @@
  *  $Id$
  */
 
-#ifndef __KMIME_M3U_H__
-#define __KMIME_M3U_H__
+#ifndef __TDEFILE_M3U_H__
+#define __TDEFILE_M3U_H__
 
 #include <tdefilemetainfo.h>
 #include <kurl.h>
diff --git a/tdefile-plugins/mp3/Makefile.am b/tdefile-plugins/mp3/Makefile.am
index 97fbe73d..44caf980 100644
--- a/tdefile-plugins/mp3/Makefile.am
+++ b/tdefile-plugins/mp3/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = tdefile_mp3.h
 kde_module_LTLIBRARIES = tdefile_mp3.la
 
 tdefile_mp3_la_SOURCES = tdefile_mp3.cpp
-tdefile_mp3_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN)
-tdefile_mp3_la_LIBADD = $(LIB_KIO)
+tdefile_mp3_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN)
+tdefile_mp3_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/mpc/Makefile.am b/tdefile-plugins/mpc/Makefile.am
index 6c1cc840..92bc72be 100644
--- a/tdefile-plugins/mpc/Makefile.am
+++ b/tdefile-plugins/mpc/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = tdefile_mpc.h
 kde_module_LTLIBRARIES = tdefile_mpc.la
 
 tdefile_mpc_la_SOURCES = tdefile_mpc.cpp
-tdefile_mpc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN)
-tdefile_mpc_la_LIBADD = $(LIB_KIO)
+tdefile_mpc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN)
+tdefile_mpc_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/mpeg/Makefile.am b/tdefile-plugins/mpeg/Makefile.am
index 63fd9460..86809749 100644
--- a/tdefile-plugins/mpeg/Makefile.am
+++ b/tdefile-plugins/mpeg/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = tdefile_mpeg.h
 kde_module_LTLIBRARIES = tdefile_mpeg.la
 
 tdefile_mpeg_la_SOURCES = tdefile_mpeg.cpp
-tdefile_mpeg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN)
-tdefile_mpeg_la_LIBADD = $(LIB_KIO)
+tdefile_mpeg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_mpeg_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/ogg/Makefile.am b/tdefile-plugins/ogg/Makefile.am
index a6590beb..d70431a7 100644
--- a/tdefile-plugins/ogg/Makefile.am
+++ b/tdefile-plugins/ogg/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = tdefile_ogg.h
 kde_module_LTLIBRARIES = tdefile_ogg.la
 
 tdefile_ogg_la_SOURCES = tdefile_ogg.cpp vcedit.c
-tdefile_ogg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN)
-tdefile_ogg_la_LIBADD = $(LIB_KIO) -logg -lvorbis -lvorbisfile
+tdefile_ogg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_ogg_la_LIBADD = $(LIB_TDEIO) -logg -lvorbis -lvorbisfile
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/sid/Makefile.am b/tdefile-plugins/sid/Makefile.am
index 56bfa54f..df104819 100644
--- a/tdefile-plugins/sid/Makefile.am
+++ b/tdefile-plugins/sid/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = tdefile_sid.h
 kde_module_LTLIBRARIES = tdefile_sid.la
 
 tdefile_sid_la_SOURCES = tdefile_sid.cpp
-tdefile_sid_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN)
-tdefile_sid_la_LIBADD = $(LIB_KIO)
+tdefile_sid_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_sid_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/theora/Makefile.am b/tdefile-plugins/theora/Makefile.am
index c44a102d..aa33481a 100644
--- a/tdefile-plugins/theora/Makefile.am
+++ b/tdefile-plugins/theora/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = tdefile_theora.h
 kde_module_LTLIBRARIES = tdefile_theora.la
 
 tdefile_theora_la_SOURCES = tdefile_theora.cpp
-tdefile_theora_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN)
-tdefile_theora_la_LIBADD = $(LIB_KIO) -logg -lvorbis -ltheora
+tdefile_theora_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_theora_la_LIBADD = $(LIB_TDEIO) -logg -lvorbis -ltheora
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/wav/Makefile.am b/tdefile-plugins/wav/Makefile.am
index f755f395..b194ba6b 100644
--- a/tdefile-plugins/wav/Makefile.am
+++ b/tdefile-plugins/wav/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = tdefile_wav.h
 kde_module_LTLIBRARIES = tdefile_wav.la
 
 tdefile_wav_la_SOURCES = tdefile_wav.cpp 
-tdefile_wav_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN)
-tdefile_wav_la_LIBADD = $(LIB_KIO)
+tdefile_wav_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_wav_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO