Rename a number of libraries and executables to avoid conflicts with KDE4

14 files changed, 30 insertions, 30 deletions

diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp
index 604a62376..3df928a13 100644
--- a/lib/kotext/KoBgSpellCheck.cpp
+++ b/lib/kotext/KoBgSpellCheck.cpp
@@ -31,11 +31,11 @@
 #include "KoTextDocument.h"
 
 
-#include <kspell2/backgroundchecker.h>
-#include <kspell2/broker.h>
-#include <kspell2/dictionary.h>
-#include <kspell2/settings.h>
-#include <kspell2/filter.h>
+#include <tdespell2/backgroundchecker.h>
+#include <tdespell2/broker.h>
+#include <tdespell2/dictionary.h>
+#include <tdespell2/settings.h>
+#include <tdespell2/filter.h>
 using namespace KSpell2;
 
 #include <klocale.h>
diff --git a/lib/kotext/KoBgSpellCheck.h b/lib/kotext/KoBgSpellCheck.h
index 0872dee02..3cb2f35ba 100644
--- a/lib/kotext/KoBgSpellCheck.h
+++ b/lib/kotext/KoBgSpellCheck.h
@@ -20,7 +20,7 @@
 #ifndef KOBGSPELLCHECK_H
 #define KOBGSPELLCHECK_H
 
-#include <kspell2/broker.h>
+#include <tdespell2/broker.h>
 #include <tqobject.h>
 #include <tqstringlist.h>
 #include <koffice_export.h>
diff --git a/lib/kotext/KoFontDia.h b/lib/kotext/KoFontDia.h
index 556a23211..a3e35b1d3 100644
--- a/lib/kotext/KoFontDia.h
+++ b/lib/kotext/KoFontDia.h
@@ -34,7 +34,7 @@
 
 #include "KoFontDiaPreview.h"
 
-#include <kspell2/broker.h>
+#include <tdespell2/broker.h>
 
 class TQComboBox;
 
diff --git a/lib/kotext/KoLanguageTab.h b/lib/kotext/KoLanguageTab.h
index fbcbb5dfb..ea8f08b88 100644
--- a/lib/kotext/KoLanguageTab.h
+++ b/lib/kotext/KoLanguageTab.h
@@ -22,7 +22,7 @@
 
 #include <kolanguagetabbase.h>
 
-#include <kspell2/broker.h>
+#include <tdespell2/broker.h>
 
 class KoLanguageTab : public KoLanguageTabBase
 {
diff --git a/lib/kotext/KoSpell.cpp b/lib/kotext/KoSpell.cpp
index d0361b4c4..2a9e5476c 100644
--- a/lib/kotext/KoSpell.cpp
+++ b/lib/kotext/KoSpell.cpp
@@ -26,8 +26,8 @@
 #include "KoTextParag.h"
 #include "KoTextIterator.h"
 
-#include <kspell2/broker.h>
-#include <kspell2/filter.h>
+#include <tdespell2/broker.h>
+#include <tdespell2/filter.h>
 
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/lib/kotext/KoSpell.h b/lib/kotext/KoSpell.h
index 2430bb691..685b7348e 100644
--- a/lib/kotext/KoSpell.h
+++ b/lib/kotext/KoSpell.h
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 #include <tqstring.h>
 
-#include <kspell2/backgroundchecker.h>
+#include <tdespell2/backgroundchecker.h>
 #include <koffice_export.h>
 class KoTextIterator;
 class KoTextParag;
diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp
index afd18909f..2ce575cad 100644
--- a/lib/kotext/KoTextObject.cpp
+++ b/lib/kotext/KoTextObject.cpp
@@ -44,7 +44,7 @@
 //#define DEBUG_FORMATS
 //#define DEBUG_FORMAT_MORE
 
-const char KoTextObject::s_customItemChar = '#'; // Has to be transparent to kspell but still be saved (not space)
+const char KoTextObject::s_customItemChar = '#'; // Has to be transparent to tdespell but still be saved (not space)
 
 struct KoTextObject::KoTextObjectPrivate
 {
diff --git a/lib/kotext/Makefile.am b/lib/kotext/Makefile.am
index bb55e8a18..160c689c3 100644
--- a/lib/kotext/Makefile.am
+++ b/lib/kotext/Makefile.am
@@ -23,7 +23,7 @@ libkotext_la_SOURCES = KoComplexText.cpp KoRichText.cpp \
 
 libkotext_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined
 
-libkotext_la_LIBADD = $(LIB_KOFFICEUI) kohyphen/libkohyphen.la $(LIBKSPELL2) -lkutils
+libkotext_la_LIBADD = $(LIB_KOFFICEUI) kohyphen/libkohyphen.la $(LIBKSPELL2) -ltdeutils
 
 METASOURCES = AUTO
 
diff --git a/lib/kotext/configure.in.bot b/lib/kotext/configure.in.bot
index 509b061a9..6cc24b815 100644
--- a/lib/kotext/configure.in.bot
+++ b/lib/kotext/configure.in.bot
@@ -1,6 +1,6 @@
 if test -z "$LIBKSPELL2"; then
    echo ""
-   echo "You don't use tdelibs CVS (kspell2 not found). Spell-checking disabled."
+   echo "You don't use tdelibs CVS (tdespell2 not found). Spell-checking disabled."
    echo ""
    all_tests=bad
 fi
diff --git a/lib/kotext/configure.in.in b/lib/kotext/configure.in.in
index 2132a5cb0..c8f96e0a4 100644
--- a/lib/kotext/configure.in.in
+++ b/lib/kotext/configure.in.in
@@ -1,13 +1,13 @@
    AC_LANG_SAVE
    AC_LANG_C
    dnl Check for aspell library
-   KDE_CHECK_HEADERS([kspell2/broker.h])
-   if test "x$ac_cv_header_kspell2_broker_h" = "xyes"; then
+   KDE_CHECK_HEADERS([tdespell2/broker.h])
+   if test "x$ac_cv_header_tdespell2_broker_h" = "xyes"; then
            dnl the header and the lib exist -> ok
            dnl this is for config.h
-           AC_DEFINE(HAVE_LIBKSPELL2, 1, [If we are going to use libkspell2 for spell-checking])
-           LIBKSPELL2="-lkspell2"
-           AC_MSG_RESULT([found in $ac_kspell2_includes])
+           AC_DEFINE(HAVE_LIBKSPELL2, 1, [If we are going to use libtdespell2 for spell-checking])
+           LIBKSPELL2="-ltdespell2"
+           AC_MSG_RESULT([found in $ac_tdespell2_includes])
    else
            LIBKSPELL2=""
            AC_MSG_RESULT([not found -- spell-checking will be disabled])
diff --git a/lib/kotext/kohyphen/Makefile.am b/lib/kotext/kohyphen/Makefile.am
index 724b0257e..5302f0ef8 100644
--- a/lib/kotext/kohyphen/Makefile.am
+++ b/lib/kotext/kohyphen/Makefile.am
@@ -18,4 +18,4 @@ check_PROGRAMS = kohyphentest
 
 kohyphentest_SOURCES = kohyphentest.cpp
 kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_TDECORE)
-kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
diff --git a/lib/kotext/tests/KoUserStyleTester.cpp b/lib/kotext/tests/KoUserStyleTester.cpp
index 7eac38815..72e5081ce 100644
--- a/lib/kotext/tests/KoUserStyleTester.cpp
+++ b/lib/kotext/tests/KoUserStyleTester.cpp
@@ -18,8 +18,8 @@
 
 // KoUserStyle/KoUserStyleCollection test
 
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 
 #include <KoUserStyleCollection.h>
 #include <KoUserStyle.h>
@@ -29,7 +29,7 @@
 #include "KoUserStyleTester.h"
 #include "KoUserStyleTester.moc"
 
-KUNITTEST_MODULE(kunittest_KoUserStyleTester, "KoUserStyle Tester");
+KUNITTEST_MODULE(tdeunittest_KoUserStyleTester, "KoUserStyle Tester");
 KUNITTEST_MODULE_REGISTER_TESTER(KoUserStyleTester);
 
 #undef COMPARE
diff --git a/lib/kotext/tests/KoUserStyleTester.h b/lib/kotext/tests/KoUserStyleTester.h
index c53b84153..4be17d4cb 100644
--- a/lib/kotext/tests/KoUserStyleTester.h
+++ b/lib/kotext/tests/KoUserStyleTester.h
@@ -19,7 +19,7 @@
 #ifndef KOUSERSTYLETESTER_H
 #define KOUSERSTYLETESTER_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class KoUserStyleTester : public KUnitTest::SlotTester {
     Q_OBJECT
diff --git a/lib/kotext/tests/Makefile.am b/lib/kotext/tests/Makefile.am
index d5cf50a20..fd7754b26 100644
--- a/lib/kotext/tests/Makefile.am
+++ b/lib/kotext/tests/Makefile.am
@@ -8,17 +8,17 @@ check_PROGRAMS = kotextformattertest kobordertest kovariabletest
 TESTS = kotextformattertest kovariabletest
 
 LDADD = ../libkotext.la
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 kobordertest_SOURCES = kobordertest.cpp
 kotextformattertest_SOURCES = kotextformattertest.cpp
 kovariabletest_SOURCES = kovariabletest.cpp
 
-check_LTLIBRARIES = kunittest_KoUserStyleTester.la 
+check_LTLIBRARIES = tdeunittest_KoUserStyleTester.la 
 
-kunittest_KoUserStyleTester_la_SOURCES = KoUserStyleTester.cpp
-kunittest_KoUserStyleTester_la_LIBADD = ../libkotext.la -lkunittest
-kunittest_KoUserStyleTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_KoUserStyleTester_la_SOURCES = KoUserStyleTester.cpp
+tdeunittest_KoUserStyleTester_la_LIBADD = ../libkotext.la -ltdeunittest
+tdeunittest_KoUserStyleTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
 check-local:
-	kunittestmodrunner
+	tdeunittestmodrunner