Additional k => tde renaming and fixes

7 files changed, 17 insertions, 17 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index f4c3a5e..fff5743 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2066,34 +2066,34 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
 if test $kde_qtver = 3; then
    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_TDEABC, "-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_TDEDNSSD, "-ltdednssd")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
    AC_SUBST(LIB_TDEFILE, "-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_TDEFILE, "-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/bibletime/Makefile.am b/bibletime/Makefile.am
index ee9c3dd..d6d0748 100644
--- a/bibletime/Makefile.am
+++ b/bibletime/Makefile.am
@@ -22,7 +22,7 @@ $(LIB_X11) \
 $(LIB_SWORD) \
 $(LIB_CLUCENE) \
 $(LIBSOCKET) \
-$(LIB_KPARTS)
+$(LIB_TDEPARTS)
 
 SUBDIRS = display-templates backend frontend xml pics util
 
@@ -54,7 +54,7 @@ bin_PROGRAMS = bibletime
 bibletime_METASOURCES = AUTO
 
 # the library search path. 
-bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
+bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
 
 # them while "make clean", use CLEANFILES
 DISTCLEANFILES = $(bibletime_METASOURCES)
diff --git a/bibletime/frontend/btinstallmgr.cpp b/bibletime/frontend/btinstallmgr.cpp
index d0ccb6d..9dbe04e 100644
--- a/bibletime/frontend/btinstallmgr.cpp
+++ b/bibletime/frontend/btinstallmgr.cpp
@@ -335,7 +335,7 @@ namespace BookshelfManager {
 	}
 
 //	FTPTransport *BTInstallMgr::createFTPTransport(const char *host, StatusReporter *statusReporter) {
-//		return new KIO_FTPTransport(host, statusReporter);
+//		return new TDEIO_FTPTransport(host, statusReporter);
 //	}
 
 
diff --git a/bibletime/frontend/cswordsetupdialog.cpp b/bibletime/frontend/cswordsetupdialog.cpp
index f642d37..ef2dbce 100644
--- a/bibletime/frontend/cswordsetupdialog.cpp
+++ b/bibletime/frontend/cswordsetupdialog.cpp
@@ -507,7 +507,7 @@ the module remote installation feature!</b>")
 					m_refreshedRemoteSources = true;
 					success = true;
 				}
-				else { //an error occurres, the KIO library should display an error message
+				else { //an error occurres, the TDEIO library should display an error message
 					tqWarning("InstallMgr: refreshRemoteSources returned an error.");
 					m_refreshedRemoteSources = false;
 					success = false;
diff --git a/pot/handbook.pot b/pot/handbook.pot
index 828faf5..a9fece6 100644
--- a/pot/handbook.pot
+++ b/pot/handbook.pot
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2007-04-17 19:46+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: application/x-xml2pot; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pot/howto.pot b/pot/howto.pot
index 8b05997..3e8d8a7 100644
--- a/pot/howto.pot
+++ b/pot/howto.pot
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2007-04-17 19:46+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: application/x-xml2pot; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"