10 files changed, 14 insertions, 14 deletions
diff --git a/tdeioslave/media/Makefile.am b/tdeioslave/media/Makefile.am
index c827568a4..a5551fb2e 100644
--- a/tdeioslave/media/Makefile.am
+++ b/tdeioslave/media/Makefile.am
@@ -11,7 +11,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = tdeio_media.la
 
 tdeio_media_la_SOURCES = dummy.cpp
-tdeio_media_la_LIBADD  = libtdeiomedia.la libmediacommon/libmediacommon.la $(LIB_KIO)
+tdeio_media_la_LIBADD  = libtdeiomedia.la libmediacommon/libmediacommon.la $(LIB_TDEIO)
 tdeio_media_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
 dummy.cpp:
@@ -24,7 +24,7 @@ libtdeiomedia_la_SOURCES = tdeio_media.cpp mediaimpl.cpp mediaimpl.skel
 
 check_PROGRAMS = testmedia
 testmedia_SOURCES = testmedia.cpp
-testmedia_LDADD = libtdeiomedia.la $(LIB_KIO)
+testmedia_LDADD = libtdeiomedia.la $(LIB_TDEIO)
 testmedia_LDFLAGS = $(all_libraries)
 
 ## TODO in unsermake: TESTS = testmedia
diff --git a/tdeioslave/media/mediamanager/Makefile.am b/tdeioslave/media/mediamanager/Makefile.am
index 45289a9eb..0641dd57e 100644
--- a/tdeioslave/media/mediamanager/Makefile.am
+++ b/tdeioslave/media/mediamanager/Makefile.am
@@ -24,7 +24,7 @@ noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB)
 
 kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
 kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_mediamanager_la_LIBADD = $(LIB_KSYCOCA) ../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) $(LINUXCDPOLLING_LIB)
+kded_mediamanager_la_LIBADD = $(LIB_TDESYCOCA) ../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) $(LINUXCDPOLLING_LIB)
 
 
 servicesdir = $(kde_servicesdir)/kded
diff --git a/tdeioslave/media/medianotifier/Makefile.am b/tdeioslave/media/medianotifier/Makefile.am
index b31354810..a19727958 100644
--- a/tdeioslave/media/medianotifier/Makefile.am
+++ b/tdeioslave/media/medianotifier/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(all_includes)
 kde_module_LTLIBRARIES = kded_medianotifier.la
 kded_medianotifier_la_LDFLAGS = -module -avoid-version $(all_libraries)
 kded_medianotifier_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_TDECORE) \
-                               $(LIB_TDEUI) $(LIB_KIO)
+                               $(LIB_TDEUI) $(LIB_TDEIO)
 kded_medianotifier_la_SOURCES = medianotifier.cpp medianotifier.skel \
                                 notificationdialog.cpp notificationdialogview.ui
 
diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index 9b4c0e17e..bb8948db8 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -137,7 +137,7 @@ bool MediaNotifier::autostart( const KFileItem &medium )
 	}
 	
 	// From now we're sure the medium is already mounted.
-	// We can use the local path for stating, no need to use KIO here.
+	// We can use the local path for stating, no need to use TDEIO here.
 	bool local;
 	TQString path = medium.mostLocalURL( local ).path(); // local is always true here...
 
diff --git a/tdeioslave/media/mounthelper/Makefile.am b/tdeioslave/media/mounthelper/Makefile.am
index c1e056c18..b541ecb69 100644
--- a/tdeioslave/media/mounthelper/Makefile.am
+++ b/tdeioslave/media/mounthelper/Makefile.am
@@ -5,8 +5,8 @@ AM_LDFLAGS = $(all_libraries)
 
 tdeio_media_mounthelper_SOURCES = tdeio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
 
-tdeio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-tdeio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_TDEUI)
+tdeio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_TDEIO) $(LIB_TDEUI)
 
 METASOURCES = AUTO
 
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
index 0fc6aa697..97df6b7e8 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
@@ -19,8 +19,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KIO_MEDIA_MOUNTHELPER_H_
-#define _KIO_MEDIA_MOUNTHELPER_H_
+#ifndef _TDEIO_MEDIA_MOUNTHELPER_H_
+#define _TDEIO_MEDIA_MOUNTHELPER_H_
 
 #include <tdeapplication.h>
 #include <tqstring.h>
diff --git a/tdeioslave/media/propsdlgplugin/Makefile.am b/tdeioslave/media/propsdlgplugin/Makefile.am
index 5e3d8af83..7202681a8 100644
--- a/tdeioslave/media/propsdlgplugin/Makefile.am
+++ b/tdeioslave/media/propsdlgplugin/Makefile.am
@@ -2,7 +2,7 @@ METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = media_propsdlgplugin.la
 
-media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO)
+media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_TDEIO)
 media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 AM_CPPFLAGS = $(all_includes)
diff --git a/tdeioslave/media/tdecmodule/Makefile.am b/tdeioslave/media/tdecmodule/Makefile.am
index 72f9f385c..5bb7948a6 100644
--- a/tdeioslave/media/tdecmodule/Makefile.am
+++ b/tdeioslave/media/tdecmodule/Makefile.am
@@ -9,7 +9,7 @@ kcm_media_la_SOURCES = notifiermodule.cpp notifiermoduleview.ui \
                        main.cpp
 
 kcm_media_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-kcm_media_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO)
+kcm_media_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_TDEIO)
 
 noinst_HEADERS = notifiermodule.h managermodule.h \
                  serviceconfigdialog.h mimetypelistboxitem.h \
diff --git a/tdeioslave/media/tdefile-plugin/Makefile.am b/tdeioslave/media/tdefile-plugin/Makefile.am
index 15807ea19..c15adce99 100644
--- a/tdeioslave/media/tdefile-plugin/Makefile.am
+++ b/tdeioslave/media/tdefile-plugin/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdefile_media.la
 
 tdefile_media_la_SOURCES = tdefilemediaplugin.cpp
 tdefile_media_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
-tdefile_media_la_LIBADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la
+tdefile_media_la_LIBADD = $(LIB_TDEIO) ../libmediacommon/libmediacommon.la
 
 kdelnkdir = $(kde_servicesdir)
 kde_services_DATA = tdefile_media.desktop
diff --git a/tdeioslave/media/tdeio_media.h b/tdeioslave/media/tdeio_media.h
index bf1325475..7acc44df0 100644
--- a/tdeioslave/media/tdeio_media.h
+++ b/tdeioslave/media/tdeio_media.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KIO_MEDIA_H_
-#define _KIO_MEDIA_H_
+#ifndef _TDEIO_MEDIA_H_
+#define _TDEIO_MEDIA_H_
 
 #include <tdeio/forwardingslavebase.h>