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

6 files changed, 24 insertions, 24 deletions

diff --git a/kate/plugins/wordcompletion/CMakeLists.txt b/kate/plugins/wordcompletion/CMakeLists.txt
index 007b93f20..c09dbda6d 100644
--- a/kate/plugins/wordcompletion/CMakeLists.txt
+++ b/kate/plugins/wordcompletion/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES ktexteditor_docwordcompletion.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES docwordcompletionui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_docwordcompletion )
+install( FILES tdetexteditor_docwordcompletion.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES docwordcompletionui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_docwordcompletion )
 
 
-##### ktexteditor_docwordcompletion #############
+##### tdetexteditor_docwordcompletion #############
 
-set( target ktexteditor_docwordcompletion )
+set( target tdetexteditor_docwordcompletion )
 
 set( ${target}_SRCS
   docwordcompletion.cpp
@@ -39,6 +39,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kate/plugins/wordcompletion/Makefile.am b/kate/plugins/wordcompletion/Makefile.am
index e79d02fb5..1fd67eaf7 100644
--- a/kate/plugins/wordcompletion/Makefile.am
+++ b/kate/plugins/wordcompletion/Makefile.am
@@ -2,16 +2,16 @@ INCLUDES    = -I$(top_srcdir)/interfaces $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_docwordcompletion.la
+kde_module_LTLIBRARIES = tdetexteditor_docwordcompletion.la
 
-ktexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp
-ktexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
-ktexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp
+tdetexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+tdetexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-docwordcompletiondatadir = $(kde_datadir)/ktexteditor_docwordcompletion
+docwordcompletiondatadir = $(kde_datadir)/tdetexteditor_docwordcompletion
 docwordcompletiondata_DATA = docwordcompletionui.rc
 
-kde_services_DATA = ktexteditor_docwordcompletion.desktop
+kde_services_DATA = tdetexteditor_docwordcompletion.desktop
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_docwordcompletion.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_docwordcompletion.pot
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 2c2bbcb23..a468edd13 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -28,10 +28,10 @@
 //BEGIN includes
 #include "docwordcompletion.h"
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/variableinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/variableinterface.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <kaction.h>
 #include <knotifyclient.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kiconloader.h>
 
 #include <tqregexp.h>
@@ -57,7 +57,7 @@
 //END
 
 //BEGIN DocWordCompletionPlugin
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_docwordcompletion, KGenericFactory<DocWordCompletionPlugin>( "ktexteditor_docwordcompletion" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_docwordcompletion, KGenericFactory<DocWordCompletionPlugin>( "tdetexteditor_docwordcompletion" ) )
 DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent,
                             const char* name,
                             const TQStringList& /*args*/ )
diff --git a/kate/plugins/wordcompletion/docwordcompletion.h b/kate/plugins/wordcompletion/docwordcompletion.h
index ed632631a..22b469695 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.h
+++ b/kate/plugins/wordcompletion/docwordcompletion.h
@@ -29,10 +29,10 @@
 #ifndef _DocWordCompletionPlugin_h_
 #define _DocWordCompletionPlugin_h_
 
-#include <ktexteditor/plugin.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/codecompletioninterface.h>
-#include <ktexteditor/configinterfaceextension.h>
+#include <tdetexteditor/plugin.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/codecompletioninterface.h>
+#include <tdetexteditor/configinterfaceextension.h>
 #include <kxmlguiclient.h>
 
 #include <tqevent.h>
diff --git a/kate/plugins/wordcompletion/docwordcompletionui.rc b/kate/plugins/wordcompletion/docwordcompletionui.rc
index f8095e128..fb1c3f7a5 100644
--- a/kate/plugins/wordcompletion/docwordcompletionui.rc
+++ b/kate/plugins/wordcompletion/docwordcompletionui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="ktexteditor_docwordcompletion" library="ktexteditor_docwordcompletion" version="4">
+<kpartplugin name="tdetexteditor_docwordcompletion" library="tdetexteditor_docwordcompletion" version="4">
 <MenuBar>
  <Menu name="tools"><Text>&amp;Tools</Text>
     <separator group="tools_operations" />
diff --git a/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop
index d0528d90f..b18e1bf84 100644
--- a/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
+++ b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop
@@ -132,7 +132,7 @@ Comment[uk]=Завершення слів у документі. Пряме аб
 Comment[vi]=Khả năng nhập xong từ trong tài liệu, đựa vào chiều hoặc vào bộ bật lên.
 Comment[zh_CN]=在文档中基于方向或弹出补全单词
 Comment[zh_TW]=在編輯文件時的單字補完功能
-X-TDE-Library=ktexteditor_docwordcompletion
+X-TDE-Library=tdetexteditor_docwordcompletion
 ServiceTypes=KTextEditor/Plugin
 Type=Service
 InitialPreference=8