Additional kde to tde renaming

10 files changed, 22 insertions, 22 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 84c182b..8c46af5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
   fi
 
 AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
   AC_MSG_RESULT(yes)
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
 AC_SUBST(kde_servicesdir)
 AC_SUBST(kde_servicetypesdir)
 AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
 AC_SUBST(kde_styledir)
 AC_SUBST(kde_widgetdir)
 if test "$kde_qtver" = 1; then
@@ -2064,12 +2064,12 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
 
 if test $kde_qtver = 3; then
    case $host in 
-               *cygwin*) lib_kded="-lkdeinit_kded" ;;
+               *cygwin*) lib_kded="-ltdeinit_kded" ;;
                *) lib_kded="" ;;
        esac
    AC_SUBST(LIB_KDED, $lib_kded)
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
+   AC_SUBST(LIB_KDECORE, "-ltdecore")
+   AC_SUBST(LIB_KDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2078,9 +2078,9 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
    AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
+   AC_SUBST(LIB_KDEPIM, "-ltdepim")
    AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
    AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2089,8 +2089,8 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
+   AC_SUBST(LIB_KDECORE, "-ltdecore")
+   AC_SUBST(LIB_KDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-lksycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2099,10 +2099,10 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
+   AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
    AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
   AC_MSG_RESULT(yes)
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
 else
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
 fi
 ])
 
diff --git a/config.log b/config.log
index fefb7f2..07da825 100644
--- a/config.log
+++ b/config.log
@@ -351,7 +351,7 @@ kde_styledir=''
 kde_templatesdir=''
 kde_wallpaperdir=''
 kde_widgetdir=''
-kdeinitdir=''
+tdeinitdir=''
 ksquirrellibs_CFLAGS=''
 ksquirrellibs_LIBS=''
 libdir='${exec_prefix}/lib'
diff --git a/configure.in b/configure.in
index 7937ad6..633050d 100644
--- a/configure.in
+++ b/configure.in
@@ -152,7 +152,7 @@ fi
 
 AM_PROG_AS
 
-# MMX test duped from kdelibs/kdefx - it should be probably moved to admin/
+# MMX test duped from kdelibs/tdefx - it should be probably moved to admin/
 dnl -----------------------------------------------------
 dnl IA32 checks
 dnl -----------------------------------------------------
diff --git a/configure.in.in b/configure.in.in
index a764d39..e3dce43 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -87,7 +87,7 @@ fi
 
 AM_PROG_AS
 
-# MMX test duped from kdelibs/kdefx - it should be probably moved to admin/
+# MMX test duped from kdelibs/tdefx - it should be probably moved to admin/
 dnl -----------------------------------------------------
 dnl IA32 checks
 dnl -----------------------------------------------------
diff --git a/ksquirrel/Makefile.am b/ksquirrel/Makefile.am
index 170a61f..d412100 100644
--- a/ksquirrel/Makefile.am
+++ b/ksquirrel/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = ksquirrel
 ## INCLUDES were found outside kdevelop specific part
 
 ksquirrel_SOURCES = sq_slideshowwidget.cpp sq_slideshow.ui sq_slideshowlisting.ui fmt_filters.cpp sq_glwidget_stuff.cpp sq_tabopendialog.ui sq_dragprovider.cpp sq_utils_scale.cpp sq_utils.cpp sq_thumbnailsunused.cpp sq_dirthumbs.cpp sq_downloader.cpp sq_glselectionpainter.cpp sq_glwidget.cpp sq_glparts.cpp sq_codecsettings.cpp sq_filedialog.cpp sq_codecsettingsskeleton.ui sq_kipimanager.cpp sq_kipiinterface.cpp sq_progressbox.cpp sq_thumbnailloadjob.cpp sq_splashscreen.cpp sq_popupmenu.cpp sq_glinfo.ui sq_glwidget_helpers.cpp sq_imageloader.cpp sq_pluginsinfo.ui sq_iconloader.cpp sq_selectdeselectgroup.ui sq_thumbnailcachemaster.ui sq_errorstring.cpp sq_navigatordropmenu.cpp sq_fileiconviewbase.cpp sq_helpwidget.ui sq_glview.cpp sq_viewcache.ui sq_filethumbviewitem.cpp sq_progress.cpp sq_thumbnailsize.cpp sq_pixmapcache.cpp sq_filethumbview.cpp sq_dir.cpp sq_iconlistbox.cpp sq_iconlistitem.cpp sq_widgetstack.cpp sq_options.ui sq_libraryhandler.cpp sq_imageproperties.ui sq_hloptions.cpp sq_glu.cpp sq_filters.ui sq_fileiconview.cpp sq_filedetailview.cpp sq_externaltools.ui sq_externaltool.cpp sq_diroperator.cpp sq_config.cpp sq_bookmarkowner.cpp sq_archivehandler.cpp ksquirrel.cpp main.cpp 
-ksquirrel_LDADD   = ./sidebar/libsidebar.a ./imageedit/libimageedit.a $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_KDEPRINT) $(LIB_KUTILS) $(LIB_KIO) $(ksquirrellibs_LIBS) -lkonq -lqui $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP -lkdefx
+ksquirrel_LDADD   = ./sidebar/libsidebar.a ./imageedit/libimageedit.a $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_KDEPRINT) $(LIB_KUTILS) $(LIB_KIO) $(ksquirrellibs_LIBS) -lkonq -lqui $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP -ltdefx
 
 SUBDIRS = sidebar imageedit mime 
 
diff --git a/ksquirrel/fmt_filters.h b/ksquirrel/fmt_filters.h
index 688d4cb..6ec4855 100644
--- a/ksquirrel/fmt_filters.h
+++ b/ksquirrel/fmt_filters.h
@@ -184,7 +184,7 @@ namespace fmt_filters
 
         //
         // All the following filters are ported from KDE's
-        // KImageEffect. See kdelibs/kdefx/kimageeffect.cpp
+        // KImageEffect. See kdelibs/tdefx/kimageeffect.cpp
         // for more.
         //
 
diff --git a/ksquirrel/ksquirrel-libs-configurator/ksquirrel-libs-configurator b/ksquirrel/ksquirrel-libs-configurator/ksquirrel-libs-configurator
index f514027..cc8bf26 100755
--- a/ksquirrel/ksquirrel-libs-configurator/ksquirrel-libs-configurator
+++ b/ksquirrel/ksquirrel-libs-configurator/ksquirrel-libs-configurator
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-kdesu --nonewdcop -c ksquirrel-libs-configurator-real
\ No newline at end of file
+tdesu --nonewdcop -c ksquirrel-libs-configurator-real
\ No newline at end of file
diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp
index 57a46ec..ed9f0b3 100644
--- a/ksquirrel/ksquirrel.cpp
+++ b/ksquirrel/ksquirrel.cpp
@@ -971,7 +971,7 @@ void KSquirrel::writeDefaultEntries()
         conf.setGroup("External tools");
         conf.writeEntry("names", "Run within KDE,View in hexadecimal mode,Print file,Set as wallpaper on desktop,Set as tiled wallpaper on desktop,Open with GIMP,Open with GQview,Open with ShowImg,Open with KuickShow,Open with KView,Open with Opera,Open with Konqueror,Open with KWrite");
         conf.writeEntry("commands", "kfmclient exec %f,khexedit %f,kprinter %f,dcop kdesktop KBackgroundIface setWallpaper %f 6,dcop kdesktop KBackgroundIface setWallpaper %f 2,gimp %F,gqview %F,showimg %F,kuickshow %F,kview %F,opera %F,konqueror %F,kwrite %F");
-        conf.writeEntry("icons", "kfm,khexedit,kdeprintfax,mac,mac,gimp,gqview,showimg,kuickshow,kview,opera,konqueror,kwrite");
+        conf.writeEntry("icons", "kfm,khexedit,tdeprintfax,mac,mac,gimp,gqview,showimg,kuickshow,kview,opera,konqueror,kwrite");
     }
 
     if(!conf.hasGroup("Filters"))
diff --git a/ksquirrel/ksquirrelpart/Makefile.am b/ksquirrel/ksquirrelpart/Makefile.am
index 9efcc92..0223074 100644
--- a/ksquirrel/ksquirrelpart/Makefile.am
+++ b/ksquirrel/ksquirrelpart/Makefile.am
@@ -14,7 +14,7 @@ AM_CCASFLAGS = -I$(srcdir) $(KSQUIRREL_ASM_DEFS)
 
 libksquirrelpart_la_SOURCES = ksquirrelpart.cpp sq_glparts.cpp sq_glu.cpp sq_glwidget.cpp sq_glwidget_stuff.cpp sq_libraryhandler.cpp sq_downloader.cpp sq_iconloader.cpp fmt_filters.cpp sq_externaltool.cpp sq_config.cpp sq_filedialog.cpp sq_imagefilter.ui sq_imagebcg.ui sq_glselectionpainter.cpp sq_glwidget_helpers.cpp sq_label.cpp sq_bcglabel.cpp sq_popupmenu.cpp sq_codecsettingsskeleton.ui sq_codecsettings.cpp sq_imageproperties.ui sq_utils.cpp sq_helpwidget.ui sq_utils_asm_scale.S sq_utils_scale.cpp sq_diroperator.cpp sq_glview.cpp sq_errorstring.cpp
 libksquirrelpart_la_LIBADD = $(LIB_KPARTS)
-libksquirrelpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEFX) $(KDE_PLUGIN) $(ksquirrellibs_LIBS) $(LIB_KDEPRINT) -lqui -lkonq -lkdefx
+libksquirrelpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEFX) $(KDE_PLUGIN) $(ksquirrellibs_LIBS) $(LIB_KDEPRINT) -lqui -lkonq -ltdefx
 
 if SQ_HAVE_KEXIF
 libksquirrelpart_la_LDFLAGS += $(libkexif_LIBS)
diff --git a/ksquirrel/ksquirrelpart/fmt_filters.h b/ksquirrel/ksquirrelpart/fmt_filters.h
index 688d4cb..6ec4855 100644
--- a/ksquirrel/ksquirrelpart/fmt_filters.h
+++ b/ksquirrel/ksquirrelpart/fmt_filters.h
@@ -184,7 +184,7 @@ namespace fmt_filters
 
         //
         // All the following filters are ported from KDE's
-        // KImageEffect. See kdelibs/kdefx/kimageeffect.cpp
+        // KImageEffect. See kdelibs/tdefx/kimageeffect.cpp
         // for more.
         //