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

9 files changed, 16 insertions, 16 deletions

diff --git a/kooka/CMakeLists.txt b/kooka/CMakeLists.txt
index 37b3984b..24e3e091 100644
--- a/kooka/CMakeLists.txt
+++ b/kooka/CMakeLists.txt
@@ -43,6 +43,6 @@ tde_add_executable( kooka AUTOMOC
     dwmenuaction.cpp kocrbase.cpp kocrgocr.cpp kocrkadmos.cpp
     kadmosocr.cpp ocrword.cpp ocrresedit.cpp kookaprint.cpp
     imgprintdialog.cpp kocrocrad.cpp
-  LINK kscan-shared kparts-shared tdeprint-shared
+  LINK kscan-shared tdeparts-shared tdeprint-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kooka/Makefile.am b/kooka/Makefile.am
index dfb9622d..75a457e6 100644
--- a/kooka/Makefile.am
+++ b/kooka/Makefile.am
@@ -16,8 +16,8 @@ kooka_SOURCES =	main.cpp kooka.cpp kookaview.cpp kookapref.cpp 		\
 		kocrocrad.cpp
 # 		pagesetup.cpp 
 
-kooka_LDADD   = $(LIB_KFILE) -ltdeprint -lktexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL)
-kooka_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kooka_LDADD   = $(LIB_KFILE) -ltdeprint -ltdetexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL)
+kooka_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 INCLUDES         = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC)
 
diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp
index a1c183bb..30186479 100644
--- a/kooka/kooka.cpp
+++ b/kooka/kooka.cpp
@@ -53,7 +53,7 @@
 #include <kedittoolbar.h>
 #include <kmessagebox.h>
 #include <kdockwidget.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
 #include <kstdaccel.h>
 #include <kaction.h>
 #include <kstdaction.h>
diff --git a/kooka/kooka.h b/kooka/kooka.h
index 634e6c53..5d8dc476 100644
--- a/kooka/kooka.h
+++ b/kooka/kooka.h
@@ -34,7 +34,7 @@
 #include <kapplication.h>
 #include <kmainwindow.h>
 #include <kdockwidget.h>
-#include <kparts/dockmainwindow.h>
+#include <tdeparts/dockmainwindow.h>
 
 #define KOOKA_STATE_GROUP "State"
 #define PREFERENCE_DIA_TAB "PreferencesTab"
diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp
index 9be6b974..cc1c3af1 100644
--- a/kooka/kookaview.cpp
+++ b/kooka/kookaview.cpp
@@ -74,7 +74,7 @@
 #include <kdockwidget.h>
 #include <tqobject.h>
 
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <tqimage.h>
 #include <kpopupmenu.h>
 
diff --git a/kooka/kookaview.h b/kooka/kookaview.h
index 3b976fc0..aaccd74a 100644
--- a/kooka/kookaview.h
+++ b/kooka/kookaview.h
@@ -35,8 +35,8 @@
 #include <tqimage.h>
 #include <tqsplitter.h>
 
-#include <kparts/dockmainwindow.h>
-#include <kparts/part.h>
+#include <tdeparts/dockmainwindow.h>
+#include <tdeparts/part.h>
 
 // application specific includes
 #include "kscandevice.h"
diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp
index 9298aa75..f35d1057 100644
--- a/kooka/ksaneocr.cpp
+++ b/kooka/ksaneocr.cpp
@@ -33,8 +33,8 @@
 #include <ktempfile.h>
 #include <kprocess.h>
 #include <stdlib.h>
-#include <kspell.h>
-#include <kspelldlg.h>
+#include <tdespell.h>
+#include <tdespelldlg.h>
 #include <tqfile.h>
 #include <tqcolor.h>
 #include <stdio.h>
@@ -76,7 +76,7 @@ KSANEOCR::KSANEOCR( TQWidget*, TDEConfig *cfg ):
     m_imgCanvas(0L),
     m_spell(0L),
     m_wantKSpell(true),
-    m_kspellVisible(true),
+    m_tdespellVisible(true),
     m_hideDiaWhileSpellcheck(true),
     m_spellInitialConfig(0L),
     m_parent(0L),
@@ -275,7 +275,7 @@ void KSANEOCR::finishedOCRVisible( bool success )
        {
            m_ocrCurrLine = 0;
            /*
-            * create a new kspell object, based on the config of the base dialog
+            * create a new tdespell object, based on the config of the base dialog
             */
 
            connect( new KSpell( m_parent, i18n("Kooka OCR Dictionary Check"),
@@ -317,7 +317,7 @@ void KSANEOCR::startLineSpellCheck()
 
         // if( list.count() > 0 )
 
-        m_spell->checkList( &m_checkStrings, m_kspellVisible );
+        m_spell->checkList( &m_checkStrings, m_tdespellVisible );
 	kdDebug(28000)<< "Started!" << endl;
         /**
          * This call ends in three slots:
diff --git a/kooka/ksaneocr.h b/kooka/ksaneocr.h
index d01be364..bc6b610e 100644
--- a/kooka/ksaneocr.h
+++ b/kooka/ksaneocr.h
@@ -260,14 +260,14 @@ private:
 
     KSpell          *m_spell;
     bool             m_wantKSpell;
-    bool             m_kspellVisible;
+    bool             m_tdespellVisible;
     bool             m_hideDiaWhileSpellcheck;
     KSpellConfig    *m_spellInitialConfig;
 
     /* ValueVector of wordLists for every line of ocr results */
     ocrBlock         m_ocrPage; /* one block contains all lines of the page */
     TQWidget          *m_parent;
-    /* current processed line to speed kspell correction */
+    /* current processed line to speed tdespell correction */
     unsigned         m_ocrCurrLine;
     TQStringList      m_checkStrings;
 
diff --git a/kooka/ocrword.cpp b/kooka/ocrword.cpp
index e54feb6a..9ef393e9 100644
--- a/kooka/ocrword.cpp
+++ b/kooka/ocrword.cpp
@@ -121,7 +121,7 @@ TQRect ocrWordList::wordListRect()
 
 
 /*
- * since kspell removes , - | / etc. from words while they remain in the words
+ * since tdespell removes , - | / etc. from words while they remain in the words
  * in the ocr wordlist.
  * This search goes through the wordlist and tries to find the words without caring
  * for special chars. It simply removes all chars from the words that are not alphanumeric.