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

14 files changed, 48 insertions, 48 deletions

diff --git a/kig/ChangeLog b/kig/ChangeLog
index 8845e357..48a0a4e5 100644
--- a/kig/ChangeLog
+++ b/kig/ChangeLog
@@ -105,7 +105,7 @@
 
 2005-05-25  Pino Toscano <toscano.pino@tiscali.it>
 
-	* The kfile_kig displays also whether the file is compressed or
+	* The tdefile_kig displays also whether the file is compressed or
 	not.
 
 2005-05-21  Pino Toscano <toscano.pino@tiscali.it>
@@ -127,7 +127,7 @@
 
 2005-05-19  Pino Toscano <toscano.pino@tiscali.it>
 
-	* Give to the kfile_kig the ability to read info from compressed
+	* Give to the tdefile_kig the ability to read info from compressed
 	files.
 
 2005-05-15  Danny Allen <dannya40uk@yahoo.co.uk>
@@ -498,7 +498,7 @@
 
 	* Small changes to Script Wizard UI.
 
-	* kfile_kig read also the compatibility version.
+	* tdefile_kig read also the compatibility version.
 
 2004-07-21  Pino Toscano <toscano.pino@tiscali.it>
 
@@ -592,7 +592,7 @@
 	* Fixed a small bug that leads to display "Select the point" when
 	I reset the name of an object after setting it.
 
-	* i18n fixes in kfile_kig.
+	* i18n fixes in tdefile_kig.
 
 2004-06-29  Dominique Devriese  <devriese@kde.org>
 
@@ -606,7 +606,7 @@
 
 2004-06-15  Pino Toscano <toscano.pino@tiscali.it>
 
-	* Add info about whether grid and axes are shown to the kig kfile
+	* Add info about whether grid and axes are shown to the kig tdefile
 	thing.
 	
 	* Now the coordinate system toggleaction is correctly updated
@@ -742,7 +742,7 @@
 	* Add a Copy action to text labels to copy their text ( with
 	substitutions already made ) into the clipboard.
 
-	* Add two little kfile plugins: kfile_kig and kfile_drgeo.
+	* Add two little tdefile plugins: tdefile_kig and tdefile_drgeo.
 
 	* Various little improvements
 
diff --git a/kig/Makefile.am b/kig/Makefile.am
index e011bf79..d7eb4457 100644
--- a/kig/Makefile.am
+++ b/kig/Makefile.am
@@ -18,7 +18,7 @@ SUBDIRS = \
 	kig \
 	mimetypes \
 	macros \
-	kfile \
+	tdefile \
 	data \
 	pykig \
 	$(scriptingdir)
@@ -42,8 +42,8 @@ messages: rc.cpp
 		cat "$$file" | grep '<SelectStatement>' | sed -e 's/^ *<SelectStatement>\([^<]*\)<\/SelectStatement>/i18n( "\1" );/' | sed -e 's/&amp;/\&/g' >> rc.cpp; \
 	done
 	$(XGETTEXT) tips.cpp rc.cpp filters/*.h kig/*.h misc/*.h modes/*.h objects/*.h scripting/*.h */*.cc kig/*.cpp misc/*.cpp modes/*.cpp -o $(podir)/kig.pot
-	$(XGETTEXT) kfile/kfile_drgeo.cpp kfile/kfile_drgeo.h -o $(podir)/kfile_drgeo.pot
-	$(XGETTEXT) kfile/kfile_kig.cpp kfile/kfile_kig.h -o $(podir)/kfile_kig.pot
+	$(XGETTEXT) tdefile/tdefile_drgeo.cpp tdefile/tdefile_drgeo.h -o $(podir)/tdefile_drgeo.pot
+	$(XGETTEXT) tdefile/tdefile_kig.cpp tdefile/tdefile_kig.h -o $(podir)/tdefile_kig.pot
 
 CLEANFILES = dummy.cpp
 
diff --git a/kig/kfile/Makefile.am b/kig/kfile/Makefile.am
deleted file mode 100644
index 715a9c7a..00000000
--- a/kig/kfile/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-INCLUDES         = $(all_includes)
-
-noinst_HEADERS   = \
-	kfile_drgeo.h \
-	kfile_kig.h
-
-kde_module_LTLIBRARIES = \
-	kfile_drgeo.la \
-	kfile_kig.la
-
-kfile_drgeo_la_SOURCES = kfile_drgeo.cpp
-kfile_drgeo_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN)
-kfile_drgeo_la_LIBADD = $(LIB_KIO)
-
-kfile_kig_la_SOURCES = kfile_kig.cpp
-kfile_kig_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN)
-kfile_kig_la_LIBADD = $(LIB_KIO)
-
-METASOURCES = AUTO
-
-services_DATA = \
-	kfile_drgeo.desktop \
-	kfile_kig.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index 13cbd8b7..b0eda780 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -26,10 +26,10 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kkeydialog.h>
 #include <klibloader.h>
 #include <klocale.h>
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index a8117c6e..ef7fa470 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -46,7 +46,7 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kinstance.h>
diff --git a/kig/misc/kigfiledialog.h b/kig/misc/kigfiledialog.h
index d1acc1fd..14c53a2d 100644
--- a/kig/misc/kigfiledialog.h
+++ b/kig/misc/kigfiledialog.h
@@ -18,7 +18,7 @@
 #ifndef KIG_MISC_KIGFILEDIALOG_H
 #define KIG_MISC_KIGFILEDIALOG_H
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 /**
  * This file dialog is pretty like KFileDialog, but allow us to make an option
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index ec6a16c3..db30d652 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -30,7 +30,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kig/tdefile/Makefile.am b/kig/tdefile/Makefile.am
new file mode 100644
index 00000000..fc0e4c0f
--- /dev/null
+++ b/kig/tdefile/Makefile.am
@@ -0,0 +1,24 @@
+INCLUDES         = $(all_includes)
+
+noinst_HEADERS   = \
+	tdefile_drgeo.h \
+	tdefile_kig.h
+
+kde_module_LTLIBRARIES = \
+	tdefile_drgeo.la \
+	tdefile_kig.la
+
+tdefile_drgeo_la_SOURCES = tdefile_drgeo.cpp
+tdefile_drgeo_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN)
+tdefile_drgeo_la_LIBADD = $(LIB_KIO)
+
+tdefile_kig_la_SOURCES = tdefile_kig.cpp
+tdefile_kig_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN)
+tdefile_kig_la_LIBADD = $(LIB_KIO)
+
+METASOURCES = AUTO
+
+services_DATA = \
+	tdefile_drgeo.desktop \
+	tdefile_kig.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kig/kfile/kfile_drgeo.cpp b/kig/tdefile/tdefile_drgeo.cpp
index b921131b..0f7eb3ee 100644
--- a/kig/kfile/kfile_drgeo.cpp
+++ b/kig/tdefile/tdefile_drgeo.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include "kfile_drgeo.h"
+#include "tdefile_drgeo.h"
 
 #include <tqdom.h>
 #include <tqfile.h>
@@ -27,7 +27,7 @@
 
 typedef KGenericFactory<DrgeoPlugin> drgeoFactory;
 
-K_EXPORT_COMPONENT_FACTORY( kfile_drgeo, drgeoFactory( "kfile_drgeo" ) )
+K_EXPORT_COMPONENT_FACTORY( tdefile_drgeo, drgeoFactory( "tdefile_drgeo" ) )
 
 DrgeoPlugin::DrgeoPlugin( TQObject *parent, const char *name, const TQStringList &args )
     : KFilePlugin( parent, name, args )
@@ -95,5 +95,5 @@ bool DrgeoPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
   return true;
 }
 
-#include "kfile_drgeo.moc"
+#include "tdefile_drgeo.moc"
 
diff --git a/kig/kfile/kfile_drgeo.desktop b/kig/tdefile/tdefile_drgeo.desktop
index b33e255f..fc06ea50 100644
--- a/kig/kfile/kfile_drgeo.desktop
+++ b/kig/tdefile/tdefile_drgeo.desktop
@@ -49,7 +49,7 @@ Name[vi]=Tiến sĩ Thông tin Hình học
 Name[zh_CN]=Dr. Geo 信息
 Name[zh_TW]=Dr. Geo 資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_drgeo
+X-TDE-Library=tdefile_drgeo
 MimeType=application/x-drgeo
 PreferredGroups=DrgeoInfo
 PreferredItems=NumOfFigures;NumOfTexts;NumOfMacros
diff --git a/kig/kfile/kfile_drgeo.h b/kig/tdefile/tdefile_drgeo.h
index 94b6f696..b9f0b52a 100644
--- a/kig/kfile/kfile_drgeo.h
+++ b/kig/tdefile/tdefile_drgeo.h
@@ -21,7 +21,7 @@
 #ifndef KIG_KFILE_KFILE_DRGEO_H
 #define KIG_KFILE_KFILE_DRGEO_H
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/kig/kfile/kfile_kig.cpp b/kig/tdefile/tdefile_kig.cpp
index d44eb1fa..48042368 100644
--- a/kig/kfile/kfile_kig.cpp
+++ b/kig/tdefile/tdefile_kig.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include "kfile_kig.h"
+#include "tdefile_kig.h"
 
 #include <tqdom.h>
 #include <tqfile.h>
@@ -33,7 +33,7 @@
 
 typedef KGenericFactory<KigPlugin> kigFactory;
 
-K_EXPORT_COMPONENT_FACTORY( kfile_kig, kigFactory( "kfile_kig" ) )
+K_EXPORT_COMPONENT_FACTORY( tdefile_kig, kigFactory( "tdefile_kig" ) )
 
 KigPlugin::KigPlugin( TQObject *parent, const char *name, const TQStringList &args )
     : KFilePlugin( parent, name, args )
@@ -150,4 +150,4 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
   return true;
 }
 
-#include "kfile_kig.moc"
+#include "tdefile_kig.moc"
diff --git a/kig/kfile/kfile_kig.desktop b/kig/tdefile/tdefile_kig.desktop
index 19c37422..ac5597f8 100644
--- a/kig/kfile/kfile_kig.desktop
+++ b/kig/tdefile/tdefile_kig.desktop
@@ -48,7 +48,7 @@ Name[vi]=Thông tin Kig
 Name[zh_CN]=Kig 信息
 Name[zh_TW]=Kig 資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_kig
+X-TDE-Library=tdefile_kig
 MimeType=application/x-kig
 PreferredGroups=KigInfo
 PreferredItems=Version;CoordSytem
diff --git a/kig/kfile/kfile_kig.h b/kig/tdefile/tdefile_kig.h
index 5d1790ce..c910b33b 100644
--- a/kig/kfile/kfile_kig.h
+++ b/kig/tdefile/tdefile_kig.h
@@ -21,7 +21,7 @@
 #ifndef KIG_KFILE_KFILE_KIG_H
 #define KIG_KFILE_KFILE_KIG_H
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;