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

6 files changed, 23 insertions, 23 deletions

diff --git a/kate/plugins/isearch/CMakeLists.txt b/kate/plugins/isearch/CMakeLists.txt
index 693c3a409..38a042973 100644
--- a/kate/plugins/isearch/CMakeLists.txt
+++ b/kate/plugins/isearch/CMakeLists.txt
@@ -27,13 +27,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES ktexteditor_isearch.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES ktexteditor_isearchui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_isearch )
+install( FILES tdetexteditor_isearch.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdetexteditor_isearchui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_isearch )
 
 
-##### ktexteditor_isearch #######################
+##### tdetexteditor_isearch #######################
 
-set( target ktexteditor_isearch )
+set( target tdetexteditor_isearch )
 
 set( ${target}_SRCS
   ISearchPlugin.cpp
@@ -41,6 +41,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/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index 27d0b138d..26c49576d 100644
--- a/kate/plugins/isearch/ISearchPlugin.cpp
+++ b/kate/plugins/isearch/ISearchPlugin.cpp
@@ -30,7 +30,7 @@
 #include "ISearchPlugin.h"
 #include "ISearchPlugin.moc"
 
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_isearch, KGenericFactory<ISearchPlugin>( "ktexteditor_isearch" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_isearch, KGenericFactory<ISearchPlugin>( "tdetexteditor_isearch" ) )
 
 ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 	: TQObject ( view ), KXMLGUIClient (view)
@@ -139,7 +139,7 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 // 	action->setChecked( m_autoWrap );
 // 	optionMenu->insert( action );
 
-	setXMLFile( "ktexteditor_isearchui.rc" );
+	setXMLFile( "tdetexteditor_isearchui.rc" );
 }
 
 ISearchPluginView::~ISearchPluginView()
diff --git a/kate/plugins/isearch/ISearchPlugin.h b/kate/plugins/isearch/ISearchPlugin.h
index 836ecbc7e..980630795 100644
--- a/kate/plugins/isearch/ISearchPlugin.h
+++ b/kate/plugins/isearch/ISearchPlugin.h
@@ -19,12 +19,12 @@
 #ifndef _ISearchPlugin_H_
 #define _ISearchPlugin_H_
 
-#include <ktexteditor/plugin.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/searchinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/selectioninterface.h>        
+#include <tdetexteditor/plugin.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/searchinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/selectioninterface.h>        
 
 #include <kxmlguiclient.h>
 #include <tqobject.h>
diff --git a/kate/plugins/isearch/Makefile.am b/kate/plugins/isearch/Makefile.am
index f71da53e7..cc9356954 100644
--- a/kate/plugins/isearch/Makefile.am
+++ b/kate/plugins/isearch/Makefile.am
@@ -2,17 +2,17 @@ INCLUDES    = -I$(top_srcdir)/interfaces $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_isearch.la
+kde_module_LTLIBRARIES = tdetexteditor_isearch.la
 
-ktexteditor_isearch_la_SOURCES = ISearchPlugin.cpp
-ktexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
-ktexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_isearch_la_SOURCES = ISearchPlugin.cpp
+tdetexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+tdetexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
           
-isearchdatadir = $(kde_datadir)/ktexteditor_isearch
-isearchdata_DATA = ktexteditor_isearchui.rc
+isearchdatadir = $(kde_datadir)/tdetexteditor_isearch
+isearchdata_DATA = tdetexteditor_isearchui.rc
 
-kde_services_DATA = ktexteditor_isearch.desktop
+kde_services_DATA = tdetexteditor_isearch.desktop
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_isearch.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_isearch.pot
 
diff --git a/kate/plugins/isearch/ktexteditor_isearch.desktop b/kate/plugins/isearch/tdetexteditor_isearch.desktop
index 2e49615d8..6fb7894c5 100644
--- a/kate/plugins/isearch/ktexteditor_isearch.desktop
+++ b/kate/plugins/isearch/tdetexteditor_isearch.desktop
@@ -146,7 +146,7 @@ Comment[uk]=Також відомий як "Пошук за вводом"
 Comment[vi]=Cũng được biết như là « Tìm kiếm trong khi gõ ».
 Comment[zh_CN]=也称为“即输即搜”
 Comment[zh_TW]=也稱做「即時搜尋」
-X-TDE-Library=ktexteditor_isearch
+X-TDE-Library=tdetexteditor_isearch
 ServiceTypes=KTextEditor/Plugin
 Type=Service
 InitialPreference=8
diff --git a/kate/plugins/isearch/ktexteditor_isearchui.rc b/kate/plugins/isearch/tdetexteditor_isearchui.rc
index d8fc6b5dd..a12fb64a2 100644
--- a/kate/plugins/isearch/ktexteditor_isearchui.rc
+++ b/kate/plugins/isearch/tdetexteditor_isearchui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="ktexteditor_isearch" library="ktexteditor_isearch" version="4">
+<kpartplugin name="tdetexteditor_isearch" library="tdetexteditor_isearch" version="4">
 <MenuBar>
 	<Menu name="edit"><text>&amp;Edit</text>
 		<Action name="edit_isearch" group="edit_find_merge"/>