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

6 files changed, 22 insertions, 22 deletions

diff --git a/kate/plugins/insertfile/CMakeLists.txt b/kate/plugins/insertfile/CMakeLists.txt
index 8f4390f64..0c80a1e0c 100644
--- a/kate/plugins/insertfile/CMakeLists.txt
+++ b/kate/plugins/insertfile/CMakeLists.txt
@@ -29,13 +29,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES ktexteditor_insertfile.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES ktexteditor_insertfileui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_insertfile )
+install( FILES tdetexteditor_insertfile.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdetexteditor_insertfileui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_insertfile )
 
 
-##### ktexteditor_insertfile ####################
+##### tdetexteditor_insertfile ####################
 
-set( target ktexteditor_insertfile )
+set( target tdetexteditor_insertfile )
 
 set( ${target}_SRCS
   insertfileplugin.cpp
@@ -43,6 +43,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/insertfile/Makefile.am b/kate/plugins/insertfile/Makefile.am
index fc8b1e228..1cce05391 100644
--- a/kate/plugins/insertfile/Makefile.am
+++ b/kate/plugins/insertfile/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_insertfile.la
+kde_module_LTLIBRARIES = tdetexteditor_insertfile.la
 
-ktexteditor_insertfile_la_SOURCES = insertfileplugin.cpp
-ktexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
-ktexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_insertfile_la_SOURCES = insertfileplugin.cpp
+tdetexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
+tdetexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
           
-insertfiledatadir = $(kde_datadir)/ktexteditor_insertfile
-insertfiledata_DATA = ktexteditor_insertfileui.rc
+insertfiledatadir = $(kde_datadir)/tdetexteditor_insertfile
+insertfiledata_DATA = tdetexteditor_insertfileui.rc
 
-kde_services_DATA = ktexteditor_insertfile.desktop
+kde_services_DATA = tdetexteditor_insertfile.desktop
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_insertfile.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_insertfile.pot
diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp
index 082c0ffc9..ee46a7cff 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -19,9 +19,9 @@
 #include "insertfileplugin.h"
 #include "insertfileplugin.moc"
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
 
 #include <assert.h>
 #include <kio/job.h>
@@ -37,7 +37,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_insertfile, KGenericFactory<InsertFilePlugin>( "ktexteditor_insertfile" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_insertfile, KGenericFactory<InsertFilePlugin>( "tdetexteditor_insertfile" ) )
 
 
 //BEGIN InsertFilePlugin
@@ -77,7 +77,7 @@ InsertFilePluginView::InsertFilePluginView( KTextEditor::View *view, const char
   setInstance( KGenericFactory<InsertFilePlugin>::instance() );
   _job = 0;
   (void) new KAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" );
-  setXMLFile( "ktexteditor_insertfileui.rc" );
+  setXMLFile( "tdetexteditor_insertfileui.rc" );
 }
 
 void InsertFilePluginView::slotInsertFile()
diff --git a/kate/plugins/insertfile/insertfileplugin.h b/kate/plugins/insertfile/insertfileplugin.h
index d6751f0d1..da08a02c7 100644
--- a/kate/plugins/insertfile/insertfileplugin.h
+++ b/kate/plugins/insertfile/insertfileplugin.h
@@ -22,8 +22,8 @@
 #ifndef _INSERT_FILE_PLUGIN_H_
 #define _INSERT_FILE_PLUGIN_H_
 
-#include <ktexteditor/plugin.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/plugin.h>
+#include <tdetexteditor/view.h>
 
 #include <kxmlguiclient.h>
 #include <tqobject.h>
diff --git a/kate/plugins/insertfile/ktexteditor_insertfile.desktop b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop
index 7e08d71b7..493369e29 100644
--- a/kate/plugins/insertfile/ktexteditor_insertfile.desktop
+++ b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop
@@ -149,7 +149,7 @@ Comment[vi]=Chèn bất kỳ tập tin có khả năng đọc tại vị trí c�
 Comment[zh_CN]=在光标位置插入任何可读文件
 Comment[zh_HK]=在游標處插入任意的檔案
 Comment[zh_TW]=在游標處插入任意的可讀檔案
-X-TDE-Library=ktexteditor_insertfile
+X-TDE-Library=tdetexteditor_insertfile
 ServiceTypes=KTextEditor/Plugin
 Type=Service
 InitialPreference=8
diff --git a/kate/plugins/insertfile/ktexteditor_insertfileui.rc b/kate/plugins/insertfile/tdetexteditor_insertfileui.rc
index 36ac0916f..d92e512ff 100644
--- a/kate/plugins/insertfile/ktexteditor_insertfileui.rc
+++ b/kate/plugins/insertfile/tdetexteditor_insertfileui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="ktexteditor_insertfile" library="ktexteditor_insertfile" version="2">
+<kpartplugin name="tdetexteditor_insertfile" library="tdetexteditor_insertfile" version="2">
 <MenuBar>
  <Menu name="tools"><Text>&amp;Tools</Text>
     <separator group="tools_operations" />