Additional k => tde renaming and fixes

17 files changed, 38 insertions, 38 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 8c81d33..9fcc395 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KDED, $lib_kded)
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-ltdeabc")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
-   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
-   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
    AC_SUBST(LIB_KFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
diff --git a/admin b/admin
-Subproject b4d585c643d92787bfa17b935ce00b09960ee36
+Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46
diff --git a/configure.in b/configure.in
index c833f2d..88fedf8 100644
--- a/configure.in
+++ b/configure.in
@@ -83,9 +83,9 @@ dnl =======================================================
 dnl PACKAGE set before
 
 dnl Check for the 3.4 kde version (for tdednssd)
-AC_DEFUN([CHECK_KDNSSD],
+AC_DEFUN([CHECK_TDEDNSSD],
 [
-  AC_MSG_CHECKING(for KDNSSD support)
+  AC_MSG_CHECKING(for TDEDNSSD support)
   AC_CACHE_VAL(ac_cv_tdednssd,
   [
     AC_LANG_SAVE
@@ -112,13 +112,13 @@ AC_DEFUN([CHECK_KDNSSD],
 
   if test "$ac_cv_tdednssd" = "yes"; then
     AC_MSG_RESULT(yes)
-    LIB_KDNSSD="-ltdednssd"
+    LIB_TDEDNSSD="-ltdednssd"
   else
     AC_MSG_RESULT(no)
-    LIB_KDNSSD=""
+    LIB_TDEDNSSD=""
   fi
 
-  AC_SUBST(LIB_KDNSSD)
+  AC_SUBST(LIB_TDEDNSSD)
 ])
 
 
@@ -184,7 +184,7 @@ AC_CHECK_FUNCS([endpwent gethostbyaddr gethostbyname getpass memmove memset \
 dnl Check for some stuff
 KDE_CHECK_SSL
 CHECK_KDEVERSION
-CHECK_KDNSSD
+CHECK_TDEDNSSD
 
 AC_C_BIGENDIAN
 AC_CHECK_KDEMAXPATHLEN
diff --git a/kftpgrabber/configure.in.in b/kftpgrabber/configure.in.in
index 7cac83d..5fe7ac0 100644
--- a/kftpgrabber/configure.in.in
+++ b/kftpgrabber/configure.in.in
@@ -3,9 +3,9 @@
 AM_INIT_AUTOMAKE(kftpgrabber, 0.8.0)
 
 dnl Check for the 3.4 kde version (for tdednssd)
-AC_DEFUN([CHECK_KDNSSD],
+AC_DEFUN([CHECK_TDEDNSSD],
 [
-  AC_MSG_CHECKING(for KDNSSD support)
+  AC_MSG_CHECKING(for TDEDNSSD support)
   AC_CACHE_VAL(ac_cv_tdednssd,
   [
     AC_LANG_SAVE
@@ -32,13 +32,13 @@ AC_DEFUN([CHECK_KDNSSD],
 
   if test "$ac_cv_tdednssd" = "yes"; then
     AC_MSG_RESULT(yes)
-    LIB_KDNSSD="-ltdednssd"
+    LIB_TDEDNSSD="-ltdednssd"
   else
     AC_MSG_RESULT(no)
-    LIB_KDNSSD=""
+    LIB_TDEDNSSD=""
   fi
 
-  AC_SUBST(LIB_KDNSSD)
+  AC_SUBST(LIB_TDEDNSSD)
 ])
 
 
@@ -104,7 +104,7 @@ AC_CHECK_FUNCS([endpwent gethostbyaddr gethostbyname getpass memmove memset \
 dnl Check for some stuff
 KDE_CHECK_SSL
 CHECK_KDEVERSION
-CHECK_KDNSSD
+CHECK_TDEDNSSD
 
 AC_C_BIGENDIAN
 AC_CHECK_KDEMAXPATHLEN
diff --git a/kftpgrabber/src/Makefile.am b/kftpgrabber/src/Makefile.am
index 077924e..b85bd2e 100644
--- a/kftpgrabber/src/Makefile.am
+++ b/kftpgrabber/src/Makefile.am
@@ -48,8 +48,8 @@ kftpgrabber_LDADD = \
 	ui/libui.a \
 	misc/interfaces/libkftpinterfaces.la \
 	misc/libs/ssh/libssh.a \
-	$(LIB_KDNSSD) -ltdewalletclient $(LIBSSL) $(LIB_KPARTS) \
-	$(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lz
+	$(LIB_TDEDNSSD) -ltdewalletclient $(LIBSSL) $(LIB_TDEPARTS) \
+	$(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lz
 
 # this is where the desktop file will go 
 xdg_apps_DATA = kftpgrabber.desktop
diff --git a/kftpgrabber/src/misc/interfaces/Makefile.am b/kftpgrabber/src/misc/interfaces/Makefile.am
index 1706c1e..27644dd 100644
--- a/kftpgrabber/src/misc/interfaces/Makefile.am
+++ b/kftpgrabber/src/misc/interfaces/Makefile.am
@@ -9,7 +9,7 @@ METASOURCES = AUTO
 lib_LTLIBRARIES = libkftpinterfaces.la
 libkftpinterfaces_la_SOURCES = kftpbookmarkimportplugin.cpp
 libkftpinterfaces_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
-libkftpinterfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+libkftpinterfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 
 kftpgrabberincludedir = $(includedir)/kftpgrabber
 kftpgrabberinclude_HEADERS = kftpbookmarkimportplugin.h
diff --git a/kftpgrabber/src/misc/kftpzeroconf.h b/kftpgrabber/src/misc/kftpzeroconf.h
index 36ad946..deae5c9 100644
--- a/kftpgrabber/src/misc/kftpzeroconf.h
+++ b/kftpgrabber/src/misc/kftpzeroconf.h
@@ -45,7 +45,7 @@
 #endif
 
 /**
- * This class provides an interface to KDNSSD (that is available from KDE 3.4).
+ * This class provides an interface to TDEDNSSD (that is available from KDE 3.4).
  *
  * @author Jernej Kos
  */
diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am
index 570de6f..a590868 100644
--- a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am
+++ b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kftpimportplugin_filezilla3.la
 kftpimportplugin_filezilla3_la_SOURCES = kftpimportfz3plugin.cpp
-kftpimportplugin_filezilla3_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la
+kftpimportplugin_filezilla3_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la
 kftpimportplugin_filezilla3_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 kde_services_DATA = kftpimportplugin_filezilla3.desktop
diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am
index 58836d6..9d15dee 100644
--- a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am
+++ b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kftpimportplugin_gftp.la
 kftpimportplugin_gftp_la_SOURCES = kftpimportgftpplugin.cpp
-kftpimportplugin_gftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la
+kftpimportplugin_gftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la
 kftpimportplugin_gftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 kde_services_DATA = kftpimportplugin_gftp.desktop
diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am
index 7954126..a287dc2 100644
--- a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am
+++ b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kftpimportplugin_kftp.la
 kftpimportplugin_kftp_la_SOURCES = kftpimportkftpplugin.cpp
-kftpimportplugin_kftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la
+kftpimportplugin_kftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la
 kftpimportplugin_kftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 kde_services_DATA = kftpimportplugin_kftp.desktop
diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am
index a41d13a..a02c438 100644
--- a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am
+++ b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kftpimportplugin_ncftp.la
 kftpimportplugin_ncftp_la_SOURCES = kftpimportncftpplugin.cpp
-kftpimportplugin_ncftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la
+kftpimportplugin_ncftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la
 kftpimportplugin_ncftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 kde_services_DATA = kftpimportplugin_ncftp.desktop
diff --git a/translations/de/messages/kftpgrabber.po b/translations/de/messages/kftpgrabber.po
index 07d0749..3715522 100644
--- a/translations/de/messages/kftpgrabber.po
+++ b/translations/de/messages/kftpgrabber.po
@@ -13,7 +13,7 @@ msgstr ""
 "POT-Creation-Date: 2007-04-15 07:14+0200\n"
 "PO-Revision-Date: 2007-04-18 15:59+0200\n"
 "Last-Translator: Jannick Kuhr <[email protected]>\n"
-"Language-Team: Deutsch <[email protected]>\n"
+"Language-Team: Deutsch <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/translations/el/messages/kftpgrabber.po b/translations/el/messages/kftpgrabber.po
index 824751e..fa3ee2e 100644
--- a/translations/el/messages/kftpgrabber.po
+++ b/translations/el/messages/kftpgrabber.po
@@ -8,7 +8,7 @@ msgstr ""
 "POT-Creation-Date: 2007-04-15 07:14+0200\n"
 "PO-Revision-Date: 2007-04-19 18:04+0300\n"
 "Last-Translator: Toussis Manolis <[email protected]>\n"
-"Language-Team: greek <[email protected]>\n"
+"Language-Team: greek <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/translations/it/messages/kftpgrabber.po b/translations/it/messages/kftpgrabber.po
index 559c6a2..2552b3e 100644
--- a/translations/it/messages/kftpgrabber.po
+++ b/translations/it/messages/kftpgrabber.po
@@ -8,7 +8,7 @@ msgstr ""
 "POT-Creation-Date: 2007-04-15 07:14+0200\n"
 "PO-Revision-Date: 2007-04-21 14:26+0200\n"
 "Last-Translator: Nicola Ruggero <[email protected]>\n"
-"Language-Team: Italian <[email protected]>\n"
+"Language-Team: Italian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/translations/lt/messages/kftpgrabber.po b/translations/lt/messages/kftpgrabber.po
index f234e12..1828394 100644
--- a/translations/lt/messages/kftpgrabber.po
+++ b/translations/lt/messages/kftpgrabber.po
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2007-04-15 07:14+0200\n"
 "PO-Revision-Date: 2005-09-10 19:40+0300\n"
 "Last-Translator: Donatas Glodenis <[email protected]>\n"
-"Language-Team: Lithuanian <[email protected]>\n"
+"Language-Team: Lithuanian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/translations/nl/messages/kftpgrabber.po b/translations/nl/messages/kftpgrabber.po
index ee0f0b6..efe88b4 100644
--- a/translations/nl/messages/kftpgrabber.po
+++ b/translations/nl/messages/kftpgrabber.po
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2007-04-15 07:14+0200\n"
 "PO-Revision-Date: 2006-12-11 19:57+0100\n"
 "Last-Translator: Rinse de Vries <[email protected]>\n"
-"Language-Team: Dutch <[email protected]>\n"
+"Language-Team: Dutch <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/translations/pt/messages/kftpgrabber.po b/translations/pt/messages/kftpgrabber.po
index c1f3f94..d7a0eca 100644
--- a/translations/pt/messages/kftpgrabber.po
+++ b/translations/pt/messages/kftpgrabber.po
@@ -4,7 +4,7 @@ msgstr ""
 "POT-Creation-Date: 2007-04-15 07:14+0200\n"
 "PO-Revision-Date: 2007-04-10 11:05+0100\n"
 "Last-Translator: José Nuno Coelho Pires <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"