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

13 files changed, 19 insertions, 19 deletions

diff --git a/kompare/CMakeLists.txt b/kompare/CMakeLists.txt
index 42d5d457..2f35d2a6 100644
--- a/kompare/CMakeLists.txt
+++ b/kompare/CMakeLists.txt
@@ -50,6 +50,6 @@ tde_add_executable( kompare AUTOMOC
     main.cpp kompare_shell.cpp kompareurldialog.cpp
   LINK
     dialogpages-static kompareinterface-shared kio-shared
-    kparts-shared ktexteditor-shared
+    tdeparts-shared tdetexteditor-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kompare/Makefile.am b/kompare/Makefile.am
index 883cdf8b..6413c160 100644
--- a/kompare/Makefile.am
+++ b/kompare/Makefile.am
@@ -26,11 +26,11 @@ bin_PROGRAMS = kompare
 
 # the application source, library search path, and link libraries
 kompare_SOURCES = main.cpp kompare_shell.cpp kompareurldialog.cpp
-kompare_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kompare_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kompare_LDADD   = $(LIB_KPARTS) \
 	$(top_builddir)/kompare/interfaces/libkompareinterface.la \
 	$(top_builddir)/kompare/libdialogpages/libdialogpages.la \
-	-lktexteditor
+	-ltdetexteditor
 
 # this is where the desktop file will go
 xdg_apps_DATA = kompare.desktop
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index 94e9747d..5e6522cf 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -17,9 +17,9 @@
 **
 ***************************************************************************/
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/view.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <kencodingfiledialog.h>
@@ -28,7 +28,7 @@
 #include <klibloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <ksqueezedtextlabel.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
diff --git a/kompare/kompare_shell.h b/kompare/kompare_shell.h
index 6e51c0eb..5b7a5abe 100644
--- a/kompare/kompare_shell.h
+++ b/kompare/kompare_shell.h
@@ -21,7 +21,7 @@
 #define KOMPARESHELL_H
 
 #include <kapplication.h>
-#include <kparts/dockmainwindow.h>
+#include <tdeparts/dockmainwindow.h>
 
 #include "kompare.h"
 
diff --git a/kompare/komparenavtreepart/CMakeLists.txt b/kompare/komparenavtreepart/CMakeLists.txt
index 32af4732..732d27d5 100644
--- a/kompare/komparenavtreepart/CMakeLists.txt
+++ b/kompare/komparenavtreepart/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES komparenavtreepart.desktop
 
 tde_add_kpart( libkomparenavtreepart AUTOMOC
   SOURCES komparenavtreepart.cpp
-  LINK diff2-static kparts-shared
+  LINK diff2-static tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h
index 0f670295..f535f676 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.h
+++ b/kompare/komparenavtreepart/komparenavtreepart.h
@@ -25,8 +25,8 @@
 #include <tqsplitter.h>
 #include <tqlistview.h>
 
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
 
 #include "kompare.h"
 #include "diffmodellist.h"
diff --git a/kompare/komparepart/CMakeLists.txt b/kompare/komparepart/CMakeLists.txt
index 00fe0e04..10083566 100644
--- a/kompare/komparepart/CMakeLists.txt
+++ b/kompare/komparepart/CMakeLists.txt
@@ -41,6 +41,6 @@ tde_add_kpart( libkomparepart AUTOMOC
     komparesaveoptionswidget.cpp
   LINK
     dialogpages-static diff2-static kompareinterface-shared
-    kparts-shared
+    tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index c9e1f19b..52de1f5f 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -34,7 +34,7 @@
 #include <kstdaction.h>
 #include <kinstance.h>
 #include <ktempfile.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 //#include <ktempdir.h>
 
 #include <kio/netaccess.h>
diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h
index 721d7afc..f853fa36 100644
--- a/kompare/komparepart/kompare_part.h
+++ b/kompare/komparepart/kompare_part.h
@@ -22,8 +22,8 @@
 #ifndef KOMPAREPART_H
 #define KOMPAREPART_H
 
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
 
 #include "kompare.h"
 
diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp
index 705f32b0..a70e3f44 100644
--- a/kompare/libdialogpages/diffpage.cpp
+++ b/kompare/libdialogpages/diffpage.cpp
@@ -35,7 +35,7 @@
 #include <kurlcombobox.h>
 #include <kurlrequester.h>
 
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 
 #include "diffsettings.h"
diff --git a/kompare/tests/subversion/contextm.diff b/kompare/tests/subversion/contextm.diff
index 5d331bcc..6d63c9fe 100644
--- a/kompare/tests/subversion/contextm.diff
+++ b/kompare/tests/subversion/contextm.diff
@@ -93,7 +93,7 @@ Index: README
 ! turns out that it is not necessary to have a native Vim.
 ! 
 ! 
-! I use QXembed, a widget which can embed any X application if it knows its X Window Id, using some X feature.  The patch I provide will make vim displays its window id on stdout when the window is mapped. GVim 6.0 then provides a way to send commands to a Vim window from another process. If you look at the VimWidget source, you will see that 70% of the code is there to handle the communication process. The rest uses the communication channel to send the vim commands needed by kpart and ktexteditor.
+! I use QXembed, a widget which can embed any X application if it knows its X Window Id, using some X feature.  The patch I provide will make vim displays its window id on stdout when the window is mapped. GVim 6.0 then provides a way to send commands to a Vim window from another process. If you look at the VimWidget source, you will see that 70% of the code is there to handle the communication process. The rest uses the communication channel to send the vim commands needed by kpart and tdetexteditor.
 ! 
 ! As far as I can tell, the part is race-condition free. If you issue many sendNormalCmd and many evalExpr, they are guaranted to be executed sequentially. This has caused me enough problems when it wasn't the case!
 ! 
diff --git a/kompare/tests/subversion/normalm.diff b/kompare/tests/subversion/normalm.diff
index c3249ccc..6ea65004 100644
--- a/kompare/tests/subversion/normalm.diff
+++ b/kompare/tests/subversion/normalm.diff
@@ -87,7 +87,7 @@ Index: README
 < turns out that it is not necessary to have a native Vim.
 < 
 < 
-< I use QXembed, a widget which can embed any X application if it knows its X Window Id, using some X feature.  The patch I provide will make vim displays its window id on stdout when the window is mapped. GVim 6.0 then provides a way to send commands to a Vim window from another process. If you look at the VimWidget source, you will see that 70% of the code is there to handle the communication process. The rest uses the communication channel to send the vim commands needed by kpart and ktexteditor.
+< I use QXembed, a widget which can embed any X application if it knows its X Window Id, using some X feature.  The patch I provide will make vim displays its window id on stdout when the window is mapped. GVim 6.0 then provides a way to send commands to a Vim window from another process. If you look at the VimWidget source, you will see that 70% of the code is there to handle the communication process. The rest uses the communication channel to send the vim commands needed by kpart and tdetexteditor.
 < 
 < As far as I can tell, the part is race-condition free. If you issue many sendNormalCmd and many evalExpr, they are guaranted to be executed sequentially. This has caused me enough problems when it wasn't the case!
 < 
diff --git a/kompare/tests/subversion/unifiedm.diff b/kompare/tests/subversion/unifiedm.diff
index 4ac8f769..1c5c873c 100644
--- a/kompare/tests/subversion/unifiedm.diff
+++ b/kompare/tests/subversion/unifiedm.diff
@@ -90,7 +90,7 @@ Index: README
 -turns out that it is not necessary to have a native Vim.
 -
 -
--I use QXembed, a widget which can embed any X application if it knows its X Window Id, using some X feature.  The patch I provide will make vim displays its window id on stdout when the window is mapped. GVim 6.0 then provides a way to send commands to a Vim window from another process. If you look at the VimWidget source, you will see that 70% of the code is there to handle the communication process. The rest uses the communication channel to send the vim commands needed by kpart and ktexteditor.
+-I use QXembed, a widget which can embed any X application if it knows its X Window Id, using some X feature.  The patch I provide will make vim displays its window id on stdout when the window is mapped. GVim 6.0 then provides a way to send commands to a Vim window from another process. If you look at the VimWidget source, you will see that 70% of the code is there to handle the communication process. The rest uses the communication channel to send the vim commands needed by kpart and tdetexteditor.
 -
 -As far as I can tell, the part is race-condition free. If you issue many sendNormalCmd and many evalExpr, they are guaranted to be executed sequentially. This has caused me enough problems when it wasn't the case!
 -