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

12 files changed, 20 insertions, 20 deletions

diff --git a/kpresenter/CHANGES b/kpresenter/CHANGES
index 651081cf..53c0ab75 100644
--- a/kpresenter/CHANGES
+++ b/kpresenter/CHANGES
@@ -39,7 +39,7 @@ Changes:
   was and no longer on top.
 - If a page is shown more than once during a presentation add the time for 
   the duration instead of showing only the last duration.
-- Use kspell2
+- Use tdespell2
 - Now PresSpeed is into each page
 - Now PageUp/PageDown during presentation go to beginning of the next/previous slide
 - Each object effect can have it's own speed now
diff --git a/kpresenter/KPrBgSpellCheck.cpp b/kpresenter/KPrBgSpellCheck.cpp
index add16a4b..b48d5b43 100644
--- a/kpresenter/KPrBgSpellCheck.cpp
+++ b/kpresenter/KPrBgSpellCheck.cpp
@@ -27,7 +27,7 @@
 #include "KoTextIterator.h"
 #include "KoTextObject.h"
 
-#include <kspell2/broker.h>
+#include <tdespell2/broker.h>
 using namespace KSpell2;
 
 #include <kdebug.h>
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index f14cad8d..dff09c73 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -49,7 +49,7 @@
 #include <kdebug.h>
 #include <kcursor.h>
 #include <kmessagebox.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #include <kconfig.h>
 #include <kurl.h>
 #include <kurldrag.h>
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index 731759d9..5ef69958 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -74,9 +74,9 @@
 #include <kfiledialog.h>
 #include <KoEditPath.h>
 
-#include <kspell2/configwidget.h>
-#include <kspell2/settings.h>
-#include <kspell2/broker.h>
+#include <tdespell2/configwidget.h>
+#include <tdespell2/settings.h>
+#include <tdespell2/broker.h>
 using namespace KSpell2;
 
 KPrConfig::KPrConfig( KPrView* parent )
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index c08ab692..4a8083a9 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -90,7 +90,7 @@
 #include <kcommand.h>
 #include "KPrDocumentIface.h"
 
-#include <kspell2/settings.h>
+#include <tdespell2/settings.h>
 
 #include <KoVariable.h>
 #include <KoAutoFormat.h>
diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h
index ed66b54a..f84bc3d8 100644
--- a/kpresenter/KPrDocument.h
+++ b/kpresenter/KPrDocument.h
@@ -313,7 +313,7 @@ class KPrDocument : public KoDocument
     }
 
     /**
-     * get custom kspell config
+     * get custom tdespell config
      */
 
     bool showStatusBar() const { return m_bShowStatusBar;}
diff --git a/kpresenter/KPrPartObject.cpp b/kpresenter/KPrPartObject.cpp
index 42054ded..4f1b1afc 100644
--- a/kpresenter/KPrPartObject.cpp
+++ b/kpresenter/KPrPartObject.cpp
@@ -26,7 +26,7 @@
 #include <KoDom.h>
 #include <KoXmlNS.h>
 #include "KoOasisContext.h"
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
 
 #include <tqpainter.h>
 #include <kdebug.h>
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 9a3d3a01..6ae9bec0 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -46,7 +46,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 
 #include <tqfont.h>
 #include <tqfile.h>
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 907aaf43..a59b7a1a 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -82,7 +82,7 @@
 #include <kfontdialog.h>
 #include <kglobal.h>
 #include <kimageio.h>
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 #include <kdebug.h>
 #include <ktempfile.h>
 #include <kcolorbutton.h>
@@ -126,7 +126,7 @@
 #include <KoGuideLineDia.h>
 #include <KoCompletionDia.h>
 
-#include <kspell.h>
+#include <tdespell.h>
 #include <kstatusbar.h>
 #include "KPrTextDocument.h"
 
@@ -153,9 +153,9 @@
 #include <KoStore.h>
 #include <KoStoreDrag.h>
 
-#include <kspell2/broker.h>
-#include <kspell2/defaultdictionary.h>
-#include <kspell2/dialog.h>
+#include <tdespell2/broker.h>
+#include <tdespell2/defaultdictionary.h>
+#include <tdespell2/dialog.h>
 #include "KoSpell.h"
 #include "KPrPrinterDlg.h"
 using namespace KSpell2;
diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h
index f1e26d1f..8c199bad 100644
--- a/kpresenter/KPrView.h
+++ b/kpresenter/KPrView.h
@@ -97,7 +97,7 @@ class KoTextIterator;
 class KStatusBarLabel;
 
 class KoSpell;
-#include <kspell2/broker.h>
+#include <tdespell2/broker.h>
 namespace KSpell2 {
     class Dialog;
 }
diff --git a/kpresenter/Makefile.am b/kpresenter/Makefile.am
index e24036b2..b46c7198 100644
--- a/kpresenter/Makefile.am
+++ b/kpresenter/Makefile.am
@@ -68,7 +68,7 @@ libkpresenterprivate_la_SOURCES = KoPointArray.cpp KPrCanvas.cpp \
 	slidetransitionwidget.ui KPrSlideTransitionDia.cpp \
 	KPrPrinterDlg.cpp
 
-libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts $(LIBKSPELL2)
+libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts $(LIBKSPELL2)
 if include_ARTS
 ARTSKDE = -lartskde
 endif
@@ -77,14 +77,14 @@ libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KO
 ## The part
 kde_module_LTLIBRARIES = libkpresenterpart.la
 libkpresenterpart_la_SOURCES = KPrFactoryInit.cpp
-libkpresenterpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+libkpresenterpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
 libkpresenterpart_la_LIBADD = libkpresenterprivate.la
 
 ## The tdeinit loadable module and the executable
 tdeinit_LTLIBRARIES = kpresenter.la
 bin_PROGRAMS =
 kpresenter_la_SOURCES = main.cpp
-kpresenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kpresenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
 kpresenter_la_LIBADD = $(LIB_KOFFICECORE)
 
 METASOURCES = AUTO
diff --git a/kpresenter/scripts/mkstandalone.sh b/kpresenter/scripts/mkstandalone.sh
index fa99fe69..be7314ca 100755
--- a/kpresenter/scripts/mkstandalone.sh
+++ b/kpresenter/scripts/mkstandalone.sh
@@ -71,7 +71,7 @@ else
   mkdir -p $out/bin
   cp $TDEDIR/bin/kpresenter $out/bin/
   cp $TDEDIR/bin/dcopserver $out/bin/
-  # Take kded as well - we could copy the ksycoca file but we would have
+  # Take kded as well - we could copy the tdesycoca file but we would have
   # to install it in ~/.trinity ...
   cp $TDEDIR/bin/kded $out/bin/