Additional k => tde renaming and fixes

20 files changed, 31 insertions, 31 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index f560556..6fbdef1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2061,35 +2061,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_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_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_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/katapult/katapult/Makefile.am b/katapult/katapult/Makefile.am
index 881d19d..7f8ae50 100644
--- a/katapult/katapult/Makefile.am
+++ b/katapult/katapult/Makefile.am
@@ -16,8 +16,8 @@ bin_PROGRAMS = katapult
 # the application source, library search path, and link libraries
 katapult_SOURCES = confgeneral.ui confcatalogs.ui confdisplay.ui main.cpp \
 	katapult.cpp katapultsettings.cpp katapultconfigdlg.cpp katapultiface.skel
-katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-katapult_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+katapult_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
 
 # this is where the desktop file will go 
 xdg_apps_DATA = katapult.desktop
diff --git a/katapult/plugins/catalogs/amarokcatalog/Makefile.am b/katapult/plugins/catalogs/amarokcatalog/Makefile.am
index 034f218..73fc545 100644
--- a/katapult/plugins/catalogs/amarokcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/amarokcatalog/Makefile.am
@@ -11,5 +11,5 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = katapult_amarokcatalog.la
 katapult_amarokcatalog_la_SOURCES = settings.ui amarokcatalog.cpp coverimage.cpp song.cpp actionplaysong.cpp
 katapult_amarokcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_amarokcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_amarokcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
 kde_services_DATA = katapult_amarokcatalog.desktop
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am b/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am
index e1f8e57..4b555bb 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am
@@ -13,5 +13,5 @@ kde_module_LTLIBRARIES =  katapult_bookmarkcatalog.la
 katapult_bookmarkcatalog_la_SOURCES = settings.ui bookmarkcatalog.cpp \
 	bookmark.cpp actionopenbookmark.cpp mozillabookmark.cpp
 katapult_bookmarkcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_bookmarkcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_bookmarkcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
 kde_services_DATA = katapult_bookmarkcatalog.desktop
diff --git a/katapult/plugins/catalogs/calculatorcatalog/Makefile.am b/katapult/plugins/catalogs/calculatorcatalog/Makefile.am
index 508b93f..e8c46b8 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/calculatorcatalog/Makefile.am
@@ -16,5 +16,5 @@ KDE_ICON = xcalc checkmark no
 kde_module_LTLIBRARIES =  katapult_calculatorcatalog.la
 katapult_calculatorcatalog_la_SOURCES = settings.ui calculatorcatalog.cpp expression.cpp actionevalexpr.cpp parser.cpp
 katapult_calculatorcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_calculatorcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_calculatorcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
 kde_services_DATA = katapult_calculatorcatalog.desktop
diff --git a/katapult/plugins/catalogs/documentcatalog/Makefile.am b/katapult/plugins/catalogs/documentcatalog/Makefile.am
index fd66e7c..e242742 100644
--- a/katapult/plugins/catalogs/documentcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/documentcatalog/Makefile.am
@@ -12,5 +12,5 @@ kde_module_LTLIBRARIES =  katapult_documentcatalog.la
 katapult_documentcatalog_la_SOURCES = settings.ui documentcatalog.cpp \
 		directory.cpp document.cpp actionopendocument.cpp
 katapult_documentcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_documentcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_documentcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
 kde_services_DATA = katapult_documentcatalog.desktop
diff --git a/katapult/plugins/catalogs/execcatalog/Makefile.am b/katapult/plugins/catalogs/execcatalog/Makefile.am
index 9262c2f..1c792ba 100644
--- a/katapult/plugins/catalogs/execcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/execcatalog/Makefile.am
@@ -16,5 +16,5 @@ KDE_ICON = AUTO
 kde_module_LTLIBRARIES =  katapult_execcatalog.la
 katapult_execcatalog_la_SOURCES = settings.ui execcatalog.cpp command.cpp actionrun.cpp
 katapult_execcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_execcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_execcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
 kde_services_DATA = katapult_execcatalog.desktop
diff --git a/katapult/plugins/catalogs/googlecatalog/Makefile.am b/katapult/plugins/catalogs/googlecatalog/Makefile.am
index 2c1e6be..4a8e3d9 100644
--- a/katapult/plugins/catalogs/googlecatalog/Makefile.am
+++ b/katapult/plugins/catalogs/googlecatalog/Makefile.am
@@ -16,5 +16,5 @@ KDE_ICON = AUTO
 kde_module_LTLIBRARIES =  katapult_googlecatalog.la
 katapult_googlecatalog_la_SOURCES = settings.ui googlecatalog.cpp query.cpp actionsearch.cpp
 katapult_googlecatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_googlecatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_googlecatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
 kde_services_DATA = katapult_googlecatalog.desktop
diff --git a/katapult/plugins/catalogs/programcatalog/Makefile.am b/katapult/plugins/catalogs/programcatalog/Makefile.am
index 8305787..19b5b0e 100644
--- a/katapult/plugins/catalogs/programcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/programcatalog/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = programcatalog.h program.h actionrunprogram.h
 kde_module_LTLIBRARIES =  katapult_programcatalog.la
 katapult_programcatalog_la_SOURCES = settings.ui programcatalog.cpp program.cpp actionrunprogram.cpp
 katapult_programcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_programcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_programcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
 kde_services_DATA = katapult_programcatalog.desktop
 
 # use automoc
diff --git a/katapult/plugins/catalogs/spellcatalog/Makefile.am b/katapult/plugins/catalogs/spellcatalog/Makefile.am
index ad837c3..98cd5cd 100644
--- a/katapult/plugins/catalogs/spellcatalog/Makefile.am
+++ b/katapult/plugins/catalogs/spellcatalog/Makefile.am
@@ -15,5 +15,5 @@ KDE_ICON = AUTO
 kde_module_LTLIBRARIES =  katapult_spellcatalog.la
 katapult_spellcatalog_la_SOURCES = settings.ui spellcatalog.cpp spelling.cpp actioncopyspelling.cpp
 katapult_spellcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_spellcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_spellcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
 kde_services_DATA = katapult_spellcatalog.desktop
diff --git a/po/br/katapult.po b/po/br/katapult.po
index 97954f6..4b0089b 100644
--- a/po/br/katapult.po
+++ b/po/br/katapult.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2006-06-08 11:22+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <[email protected]>\n"
-"Language-Team: br <[email protected]>\n"
+"Language-Team: br <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ca/katapult.po b/po/ca/katapult.po
index 40da311..164f3dc 100644
--- a/po/ca/katapult.po
+++ b/po/ca/katapult.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2006-06-08 11:22+0200\n"
 "PO-Revision-Date: 2006-05-28 23:18+0200\n"
 "Last-Translator: Albert Astals Cid <[email protected]>\n"
-"Language-Team: Catalan <[email protected]>\n"
+"Language-Team: Catalan <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/de/katapult.po b/po/de/katapult.po
index 8196bc9..ef6ff6b 100644
--- a/po/de/katapult.po
+++ b/po/de/katapult.po
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2006-06-08 11:22+0200\n"
 "PO-Revision-Date: 2006-07-09 10:25+0200\n"
 "Last-Translator: Thomas Reitelbach <[email protected]>\n"
-"Language-Team: German <[email protected]>\n"
+"Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/hu/katapult.po b/po/hu/katapult.po
index 9118725..9930732 100644
--- a/po/hu/katapult.po
+++ b/po/hu/katapult.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2006-06-08 11:22+0200\n"
 "PO-Revision-Date: 2006-07-14 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto(at)interware(dot)hu>\n"
-"Language-Team: Hungarian <[email protected]>\n"
+"Language-Team: Hungarian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/it/katapult.po b/po/it/katapult.po
index 0ec07df..c87d634 100644
--- a/po/it/katapult.po
+++ b/po/it/katapult.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2006-06-08 11:22+0200\n"
 "PO-Revision-Date: 2006-09-23 13:25+0200\n"
 "Last-Translator: Andrea Di Menna <[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/po/nl/katapult.po b/po/nl/katapult.po
index 25fdd34..c815e2a 100644
--- a/po/nl/katapult.po
+++ b/po/nl/katapult.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2006-06-08 11:22+0200\n"
 "PO-Revision-Date: 2006-06-09 23:57+0200\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/po/pt/katapult.po b/po/pt/katapult.po
index 15b5182..46429e9 100644
--- a/po/pt/katapult.po
+++ b/po/pt/katapult.po
@@ -4,7 +4,7 @@ msgstr ""
 "POT-Creation-Date: 2006-06-08 11:22+0200\n"
 "PO-Revision-Date: 2006-06-08 15:55+0100\n"
 "Last-Translator: Jos Nuno Coelho Sanarra 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"
diff --git a/po/pt_BR/katapult.po b/po/pt_BR/katapult.po
index ba4505f..1333ab9 100644
--- a/po/pt_BR/katapult.po
+++ b/po/pt_BR/katapult.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2006-06-08 11:22+0200\n"
 "PO-Revision-Date: 2006-07-09 00:25-0300\n"
 "Last-Translator: Diniz Fernando Bortolotto Ferreira <[email protected]>\n"
-"Language-Team: Brazilian Portuguese <[email protected]>\n"
+"Language-Team: Brazilian Portuguese <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/sk/katapult.po b/po/sk/katapult.po
index 6b13094..4ec18c2 100644
--- a/po/sk/katapult.po
+++ b/po/sk/katapult.po
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2006-06-08 11:22+0200\n"
 "PO-Revision-Date: 2007-09-10 19:43+0100\n"
 "Last-Translator: Ivan Masár <[email protected]>\n"
-"Language-Team: Slovak <[email protected]>\n"
+"Language-Team: Slovak <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"