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

9 files changed, 34 insertions, 34 deletions

diff --git a/kbabel/addons/CMakeLists.txt b/kbabel/addons/CMakeLists.txt
index 8b387853..6cf70a4c 100644
--- a/kbabel/addons/CMakeLists.txt
+++ b/kbabel/addons/CMakeLists.txt
@@ -10,4 +10,4 @@
 #################################################
 
 add_subdirectory( preview )
-add_subdirectory( kfile-plugins )
+add_subdirectory( tdefile-plugins )
diff --git a/kbabel/addons/Makefile.am b/kbabel/addons/Makefile.am
index 291996f0..ea1e5c4e 100644
--- a/kbabel/addons/Makefile.am
+++ b/kbabel/addons/Makefile.am
@@ -1,3 +1,3 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
-SUBDIRS = preview kfile-plugins
+SUBDIRS = preview tdefile-plugins
diff --git a/kbabel/addons/kfile-plugins/Makefile.am b/kbabel/addons/kfile-plugins/Makefile.am
deleted file mode 100644
index fab776e0..00000000
--- a/kbabel/addons/kfile-plugins/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for po file meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES = -I$(srcdir)/../../common/ $(all_includes)
-
-# these are the headers for the project
-noinst_HEADERS   = kfile_po.h
-
-kde_module_LTLIBRARIES = kfile_po.la
-
-kfile_po_la_SOURCES = kfile_po.cpp
-kfile_po_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_po_la_LIBADD  = ../../common/libkbabelcommon.la $(LIB_KIO)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_po.cpp -o $(podir)/kfile_po.pot
-
-services_DATA = kfile_po.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kbabel/addons/preview/pothumbcreator.h b/kbabel/addons/preview/pothumbcreator.h
index f975b554..d74a8ccd 100644
--- a/kbabel/addons/preview/pothumbcreator.h
+++ b/kbabel/addons/preview/pothumbcreator.h
@@ -35,7 +35,7 @@
 #ifndef POTHUMBCREATOR_H
 #define POTHUMBCREATOR_H
 
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 
 class KPixmapSplitter;
 
diff --git a/kbabel/addons/kfile-plugins/CMakeLists.txt b/kbabel/addons/tdefile-plugins/CMakeLists.txt
index f6fffd65..57fe6f65 100644
--- a/kbabel/addons/kfile-plugins/CMakeLists.txt
+++ b/kbabel/addons/tdefile-plugins/CMakeLists.txt
@@ -23,13 +23,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kfile_po.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_po.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kfile_po (module) #########################
+##### tdefile_po (module) #########################
 
-tde_add_kpart( kfile_po AUTOMOC
-  SOURCES kfile_po.cpp
+tde_add_kpart( tdefile_po AUTOMOC
+  SOURCES tdefile_po.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/addons/tdefile-plugins/Makefile.am b/kbabel/addons/tdefile-plugins/Makefile.am
new file mode 100644
index 00000000..2d2b252f
--- /dev/null
+++ b/kbabel/addons/tdefile-plugins/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for po file meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES = -I$(srcdir)/../../common/ $(all_includes)
+
+# these are the headers for the project
+noinst_HEADERS   = tdefile_po.h
+
+kde_module_LTLIBRARIES = tdefile_po.la
+
+tdefile_po_la_SOURCES = tdefile_po.cpp
+tdefile_po_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_po_la_LIBADD  = ../../common/libkbabelcommon.la $(LIB_KIO)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_po.cpp -o $(podir)/tdefile_po.pot
+
+services_DATA = tdefile_po.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kbabel/addons/kfile-plugins/kfile_po.cpp b/kbabel/addons/tdefile-plugins/tdefile_po.cpp
index 156f52c1..248f6fc1 100644
--- a/kbabel/addons/kfile-plugins/kfile_po.cpp
+++ b/kbabel/addons/tdefile-plugins/tdefile_po.cpp
@@ -28,7 +28,7 @@
  */
 
 
-#include "kfile_po.h"
+#include "tdefile_po.h"
 
 #include <tqstringlist.h>
 
@@ -38,7 +38,7 @@
 using namespace KBabel;
 
 typedef KGenericFactory<KPoPlugin> POFactory;
-K_EXPORT_COMPONENT_FACTORY(kfile_po, POFactory("kfile_po"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_po, POFactory("tdefile_po"))
 
 KPoPlugin::KPoPlugin(TQObject *parent, const char *name,
                      const TQStringList& args)
@@ -78,4 +78,4 @@ bool KPoPlugin::readInfo(KFileMetaInfo& metaInfo, uint)
   return false;
 }
 
-#include "kfile_po.moc"
+#include "tdefile_po.moc"
diff --git a/kbabel/addons/kfile-plugins/kfile_po.desktop b/kbabel/addons/tdefile-plugins/tdefile_po.desktop
index f844f531..7661ed91 100644
--- a/kbabel/addons/kfile-plugins/kfile_po.desktop
+++ b/kbabel/addons/tdefile-plugins/tdefile_po.desktop
@@ -55,7 +55,7 @@ Name[xh]=Ulwazi Lwencwadi yemifanekiso
 Name[zh_CN]=目录信息
 Name[zh_TW]=類別資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_po
+X-TDE-Library=tdefile_po
 MimeType=application/x-gettext
 PreferredGroups=CatalogInfo
 PreferredItems=Total,Fuzzy,Untranslated,LastTranslator,LanguageTeam,Revision
diff --git a/kbabel/addons/kfile-plugins/kfile_po.h b/kbabel/addons/tdefile-plugins/tdefile_po.h
index 63e740aa..75ed429b 100644
--- a/kbabel/addons/kfile-plugins/kfile_po.h
+++ b/kbabel/addons/tdefile-plugins/tdefile_po.h
@@ -32,7 +32,7 @@
 #ifndef KFILE_PO_H
 #define KFILE_PO_H
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;