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

12 files changed, 22 insertions, 22 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
index d891a8362..91a9b7081 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS = converter thumbnail thesaurus kthesaurus kfile-plugins quickprint
-# Not ported to kspell2: spell. But do we really want a separate tool for this?
+# Not ported to tdespell2: spell. But do we really want a separate tool for this?
diff --git a/tools/converter/Makefile.am b/tools/converter/Makefile.am
index fe65dec11..4bebc4b31 100644
--- a/tools/converter/Makefile.am
+++ b/tools/converter/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes)
 
 bin_PROGRAMS = koconverter
 koconverter_SOURCES = koconverter.cpp
-koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 koconverter_LDADD = $(top_builddir)/lib/kofficecore/libkofficecore.la
 
 METASOURCES = AUTO
diff --git a/tools/kfile-plugins/abiword/Makefile.am b/tools/kfile-plugins/abiword/Makefile.am
index 81e8a65ca..1242f21bc 100644
--- a/tools/kfile-plugins/abiword/Makefile.am
+++ b/tools/kfile-plugins/abiword/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS   = kfile_abiword.h
 kde_module_LTLIBRARIES = kfile_abiword.la
 
 kfile_abiword_la_SOURCES = kfile_abiword.cpp
-kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
 kfile_abiword_la_LIBADD = $(KOFFICE_LIBS)
 
 # let automoc handle all of the meta source files (moc)
diff --git a/tools/kfile-plugins/gnumeric/Makefile.am b/tools/kfile-plugins/gnumeric/Makefile.am
index c5d970424..85ca467be 100644
--- a/tools/kfile-plugins/gnumeric/Makefile.am
+++ b/tools/kfile-plugins/gnumeric/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS   = kfile_gnumeric.h
 kde_module_LTLIBRARIES = kfile_gnumeric.la
 
 kfile_gnumeric_la_SOURCES = kfile_gnumeric.cpp
-kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
 kfile_gnumeric_la_LIBADD = $(KOFFICE_LIBS)
 
 # let automoc handle all of the meta source files (moc)
diff --git a/tools/kfile-plugins/koffice/Makefile.am b/tools/kfile-plugins/koffice/Makefile.am
index 6d81afa92..dfbd4080d 100644
--- a/tools/kfile-plugins/koffice/Makefile.am
+++ b/tools/kfile-plugins/koffice/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS   = kfile_koffice.h
 kde_module_LTLIBRARIES = kfile_koffice.la
 
 kfile_koffice_la_SOURCES = kfile_koffice.cpp
-kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
 kfile_koffice_la_LIBADD = $(KOFFICE_LIBS)
 
 # let automoc handle all of the meta source files (moc)
diff --git a/tools/kfile-plugins/ooo/Makefile.am b/tools/kfile-plugins/ooo/Makefile.am
index 1e47978f2..d72dd7051 100644
--- a/tools/kfile-plugins/ooo/Makefile.am
+++ b/tools/kfile-plugins/ooo/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS   = kfile_ooo.h
 kde_module_LTLIBRARIES = kfile_ooo.la
 
 kfile_ooo_la_SOURCES = kfile_ooo.cpp
-kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
 kfile_ooo_la_LIBADD = $(KOFFICE_LIBS)
 
 # let automoc handle all of the meta source files (moc)
diff --git a/tools/spell/Makefile.am b/tools/spell/Makefile.am
index 80f2f78ac..7c90d34b9 100644
--- a/tools/spell/Makefile.am
+++ b/tools/spell/Makefile.am
@@ -1,24 +1,24 @@
-# This tool is disabled. Not useful and not ported to kspell2.
+# This tool is disabled. Not useful and not ported to tdespell2.
 
 #INCLUDES = -I$(srcdir)/../../lib/kofficecore  $(all_includes)
-#libkspelltool_la_LIBADD = ../../lib/kofficecore/libkofficecore.la 
+#libtdespelltool_la_LIBADD = ../../lib/kofficecore/libkofficecore.la 
 
 ####### Files
 
-#kde_module_LTLIBRARIES = libkspelltool.la
+#kde_module_LTLIBRARIES = libtdespelltool.la
 
-#libkspelltool_la_SOURCES = main.cc
+#libtdespelltool_la_SOURCES = main.cc
 
-#libkspelltool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+#libtdespelltool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
 #noinst_HEADERS = main.h
 
-#libkspelltool_la_METASOURCES = main.moc
+#libtdespelltool_la_METASOURCES = main.moc
 
-#service_DATA = kspelltool.desktop
+#service_DATA = tdespelltool.desktop
 #servicedir = $(kde_servicesdir)
 
 install-data-local: uninstall.desktop
 	$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
-	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/kspelltool.desktop
+	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tdespelltool.desktop
 
diff --git a/tools/spell/main.cc b/tools/spell/main.cc
index 290d63020..6f152f032 100644
--- a/tools/spell/main.cc
+++ b/tools/spell/main.cc
@@ -37,7 +37,7 @@
  *
  ***************************************************/
 
-K_EXPORT_COMPONENT_FACTORY( libkspelltool, KGenericFactory<SpellChecker> )
+K_EXPORT_COMPONENT_FACTORY( libtdespelltool, KGenericFactory<SpellChecker> )
 
 /***************************************************
  *
@@ -107,7 +107,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat
 #endif
         }
     }
-#if 0 //PORT to kspell2
+#if 0 //PORT to tdespell2
     // Call the spell checker
     KOSpell::modalCheck( buffer, &kosconfig );
     *((TQString*)data) = buffer;
diff --git a/tools/spell/kspelltool.desktop b/tools/spell/tdespelltool.desktop
index 676dc298b..8770c87af 100644
--- a/tools/spell/kspelltool.desktop
+++ b/tools/spell/tdespelltool.desktop
@@ -66,7 +66,7 @@ Name[xh]=Isixhobo Sokukhangela Upelo
 Name[zh_CN]=拼写检查工具
 Name[zh_TW]=拼字檢查工具
 Name[zu]=Ithuluzi Lokubhekisisa Kokubhalwa Kwamagama
-X-TDE-Library=libkspelltool
+X-TDE-Library=libtdespelltool
 Type=Service
 Commands=spellcheck
 Comment=Check this Word's Spelling
diff --git a/tools/thumbnail/Makefile.am b/tools/thumbnail/Makefile.am
index cf41afd13..a98b6fe44 100644
--- a/tools/thumbnail/Makefile.am
+++ b/tools/thumbnail/Makefile.am
@@ -5,11 +5,11 @@ kde_module_LTLIBRARIES = clipartthumbnail.la kofficethumbnail.la
 
 clipartthumbnail_la_SOURCES = clipartcreator.cpp
 clipartthumbnail_la_LIBADD = $(KOFFICE_LIBS) # for KoClipartCollection
-clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
 
 kofficethumbnail_la_SOURCES = kofficecreator.cpp
 kofficethumbnail_la_LIBADD = $(KOFFICE_LIBS)
-kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
 
 # otherofficethumbnail.desktop is currently not installed, as it gives too many problems
 kde_services_DATA = clipartthumbnail.desktop kofficethumbnail.desktop
diff --git a/tools/thumbnail/kofficecreator.cpp b/tools/thumbnail/kofficecreator.cpp
index 4e820eb1e..60eef551d 100644
--- a/tools/thumbnail/kofficecreator.cpp
+++ b/tools/thumbnail/kofficecreator.cpp
@@ -29,8 +29,8 @@
 #include <kfileitem.h>
 #include <ktrader.h>
 #include <klibloader.h>
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
 
 #include "kofficecreator.h"
 #include <KoStore.h>
diff --git a/tools/thumbnail/kofficecreator.h b/tools/thumbnail/kofficecreator.h
index c6a274267..3188cff9e 100644
--- a/tools/thumbnail/kofficecreator.h
+++ b/tools/thumbnail/kofficecreator.h
@@ -21,7 +21,7 @@
 #define _KWORDCREATOR_H_ "$Id: kofficecreator.h 508787 2006-02-12 18:28:12Z ingwa $"
 
 #include <kio/thumbcreator.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include "../../lib/kofficecore/KoDocument.h"
 
 class KoDocument;