Additional k => tde renaming and fixes

5 files changed, 11 insertions, 11 deletions

diff --git a/tdescreensaver/kdesavers/Makefile.am b/tdescreensaver/kdesavers/Makefile.am
index 1952c5df..9a2f1adb 100644
--- a/tdescreensaver/kdesavers/Makefile.am
+++ b/tdescreensaver/kdesavers/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = . data
 AM_CPPFLAGS = -UQT_NO_ASCII_CAST
 
 INCLUDES = $(all_includes) $(GLINC) $(LIBART_CFLAGS)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 AM_LDADD = $(LIB_TDEUI) -ltdescreensaver
 
 if COMPILE_X11_KSAVERS
@@ -42,7 +42,7 @@ kbanner_kss_LDADD = $(AM_LDADD)
 kpolygon_kss_SOURCES = polygon.cpp
 kpolygon_kss_LDADD = $(AM_LDADD)
 kslideshow_kss_SOURCES = slideshow.cpp slideshowcfg.ui
-kslideshow_kss_LDADD = $(LIB_TDEFILE) $(AM_LDADD) $(LIB_KSYCOCA) -lm
+kslideshow_kss_LDADD = $(LIB_TDEFILE) $(AM_LDADD) $(LIB_TDESYCOCA) -lm
 klines_kss_SOURCES = lines.cpp
 klines_kss_LDADD = $(AM_LDADD)
 klorenz_kss_SOURCES = lorenz.cpp
diff --git a/tdescreensaver/kxsconfig/Makefile.am b/tdescreensaver/kxsconfig/Makefile.am
index e0b89f67..7588e80c 100644
--- a/tdescreensaver/kxsconfig/Makefile.am
+++ b/tdescreensaver/kxsconfig/Makefile.am
@@ -1,11 +1,11 @@
 ## Makefile.am of tdebase/tdescreensaver/kxsconfig
 
 INCLUDES = $(all_includes)
-kxsconfig_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kxsconfig_LDADD    = $(LIB_KIO) -lXt
+kxsconfig_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kxsconfig_LDADD    = $(LIB_TDEIO) -lXt
 
-kxsrun_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kxsrun_LDADD    = $(LIB_KIO)
+kxsrun_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kxsrun_LDADD    = $(LIB_TDEIO)
 
 EXTRA_DIST = ScreenSavers hacks.pot
 
diff --git a/tdescreensaver/tdepartsaver/Makefile.am b/tdescreensaver/tdepartsaver/Makefile.am
index 7ee74621..0a6fc981 100644
--- a/tdescreensaver/tdepartsaver/Makefile.am
+++ b/tdescreensaver/tdepartsaver/Makefile.am
@@ -2,8 +2,8 @@ bin_PROGRAMS = tdepartsaver.kss
 INCLUDES = $(all_includes)
 
 tdepartsaver_kss_SOURCES = tdepartsaver.cpp configwidget.ui
-tdepartsaver_kss_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-tdepartsaver_kss_LDADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdescreensaver
+tdepartsaver_kss_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdepartsaver_kss_LDADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) -ltdescreensaver
 
 METASOURCES = AUTO
 
diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.h b/tdescreensaver/tdepartsaver/tdepartsaver.h
index 8ce95052..cfb456cc 100644
--- a/tdescreensaver/tdepartsaver/tdepartsaver.h
+++ b/tdescreensaver/tdepartsaver/tdepartsaver.h
@@ -16,8 +16,8 @@
  * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef KPARTSAVER_H_INCLUDED
-#define KPARTSAVER_H_INCLUDED
+#ifndef TDEPARTSAVER_H_INCLUDED
+#define TDEPARTSAVER_H_INCLUDED
 
 
 #include <tqwidget.h>
diff --git a/tdescreensaver/xsavers/Makefile.am b/tdescreensaver/xsavers/Makefile.am
index 6510fd32..94241454 100644
--- a/tdescreensaver/xsavers/Makefile.am
+++ b/tdescreensaver/xsavers/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -UQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE
 
 INCLUDES = $(all_includes) $(GLINC)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 if COMPILE_GL_XSAVERS
 GL_XSAVERS=kspace.kss