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

21 files changed, 31 insertions, 31 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index ff56d9e..3b00513 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$trinity2ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$trinity3ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
diff --git a/fileplugin/Makefile.am b/fileplugin/Makefile.am
index da17f8d..12e5903 100644
--- a/fileplugin/Makefile.am
+++ b/fileplugin/Makefile.am
@@ -1,18 +1,18 @@
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
 
-kde_module_LTLIBRARIES = kfile_kbarcode.la
+kde_module_LTLIBRARIES = tdefile_kbarcode.la
 
-kfile_kbarcode_la_SOURCES = kfile_kbarcode.cpp
-kfile_kbarcode_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) $(all_libraries)
-kfile_kbarcode_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDECORE)
+tdefile_kbarcode_la_SOURCES = tdefile_kbarcode.cpp
+tdefile_kbarcode_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) $(all_libraries)
+tdefile_kbarcode_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDECORE)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 
 # messages: rc.cpp
-# 	$(XGETTEXT) *.cpp -o $(podir)/kfile_kbarcode.pot
+# 	$(XGETTEXT) *.cpp -o $(podir)/tdefile_kbarcode.pot
 
-services_DATA = kfile_kbarcode.desktop
+services_DATA = tdefile_kbarcode.desktop
 servicesdir = $(kde_servicesdir)
 
diff --git a/fileplugin/kfile_kbarcode.cpp b/fileplugin/tdefile_kbarcode.cpp
index dbb9aac..4b1e253 100644
--- a/fileplugin/kfile_kbarcode.cpp
+++ b/fileplugin/tdefile_kbarcode.cpp
@@ -2,7 +2,7 @@
  * Copyright (C) 2003 Dominik Seichter <[email protected]>
  */
 
-#include "kfile_kbarcode.h"
+#include "tdefile_kbarcode.h"
 
 #include <kgenericfactory.h>
 #include <klocale.h>
@@ -10,7 +10,7 @@
 #include <tqfile.h>
 #include <tqdom.h>
 
-K_EXPORT_COMPONENT_FACTORY(kfile_kbarcode, KGenericFactory<KBarcodePlugin>( "kfile_kbarcode" ));
+K_EXPORT_COMPONENT_FACTORY(tdefile_kbarcode, KGenericFactory<KBarcodePlugin>( "tdefile_kbarcode" ));
 
 KBarcodePlugin::KBarcodePlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -81,4 +81,4 @@ bool KBarcodePlugin::readInfo( KFileMetaInfo& info, uint )
     return true;
 }
 
-#include "kfile_kbarcode.moc"
+#include "tdefile_kbarcode.moc"
diff --git a/fileplugin/kfile_kbarcode.desktop b/fileplugin/tdefile_kbarcode.desktop
index 4e43a28..5b3d77e 100644
--- a/fileplugin/kfile_kbarcode.desktop
+++ b/fileplugin/tdefile_kbarcode.desktop
@@ -5,5 +5,5 @@ Comment=KBarcode Info
 Icon=kbarcode
 ServiceTypes=KFilePlugin
 MimeType=application/kbarcode-label
-X-TDE-Library=kfile_kbarcode
+X-TDE-Library=tdefile_kbarcode
 SupportsThumbnail=
diff --git a/fileplugin/kfile_kbarcode.h b/fileplugin/tdefile_kbarcode.h
index 2ac3a4c..ae0a64d 100644
--- a/fileplugin/kfile_kbarcode.h
+++ b/fileplugin/tdefile_kbarcode.h
@@ -5,7 +5,7 @@
 #ifndef _PLUGIN_KBARCODEFILEPLUGIN_H_
 #define _PLUGIN_KBARCODEFILEPLUGIN_H_
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/kbarcode/barcodedialog.cpp b/kbarcode/barcodedialog.cpp
index dc58bdd..890cef5 100644
--- a/kbarcode/barcodedialog.cpp
+++ b/kbarcode/barcodedialog.cpp
@@ -24,7 +24,7 @@
 
 // KDE includes
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <klocale.h>
diff --git a/kbarcode/batchprinter.cpp b/kbarcode/batchprinter.cpp
index 1922345..b7d3ede 100644
--- a/kbarcode/batchprinter.cpp
+++ b/kbarcode/batchprinter.cpp
@@ -33,7 +33,7 @@
 #include <kabc/addressee.h>
 #include <kabc/addresseelist.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kimageio.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kbarcode/batchwizard.cpp b/kbarcode/batchwizard.cpp
index 3eb5c5e..d71104e 100644
--- a/kbarcode/batchwizard.cpp
+++ b/kbarcode/batchwizard.cpp
@@ -50,7 +50,7 @@
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <kcompletion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <klineedit.h>
diff --git a/kbarcode/configdialog.cpp b/kbarcode/configdialog.cpp
index 8fad98b..5cb71e4 100644
--- a/kbarcode/configdialog.cpp
+++ b/kbarcode/configdialog.cpp
@@ -32,7 +32,7 @@
 // KDE includes
 #include <kabc/addressee.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolorbutton.h>
 #include <kiconloader.h>
 #include <kimageio.h>
diff --git a/kbarcode/definition.cpp b/kbarcode/definition.cpp
index 8fdcb4a..7405ed5 100644
--- a/kbarcode/definition.cpp
+++ b/kbarcode/definition.cpp
@@ -25,7 +25,7 @@
 
 // KDE includes
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/kbarcode/dsmainwindow.cpp b/kbarcode/dsmainwindow.cpp
index 7621f1f..04205d8 100644
--- a/kbarcode/dsmainwindow.cpp
+++ b/kbarcode/dsmainwindow.cpp
@@ -31,7 +31,7 @@
 // KDE includes
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmenubar.h>
diff --git a/kbarcode/kbarcodesettings.cpp b/kbarcode/kbarcodesettings.cpp
index 8c6e43f..0b33e0b 100644
--- a/kbarcode/kbarcodesettings.cpp
+++ b/kbarcode/kbarcodesettings.cpp
@@ -23,7 +23,7 @@
 // KDE includes
 #include <kapplication.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <knuminput.h>
 
diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp
index c98f5e8..c4a1b51 100644
--- a/kbarcode/labeleditor.cpp
+++ b/kbarcode/labeleditor.cpp
@@ -83,7 +83,7 @@
 #include <kcolordialog.h>
 #include <kcommand.h>
 #include <kcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <klineedit.h>
diff --git a/kbarcode/multilineeditdlg.cpp b/kbarcode/multilineeditdlg.cpp
index 028ac64..9d7b39d 100644
--- a/kbarcode/multilineeditdlg.cpp
+++ b/kbarcode/multilineeditdlg.cpp
@@ -22,7 +22,7 @@
 #include <kaction.h>
 #include <tdeversion.h>
 #include <kcolordialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <tdespell.h>
 #include <dstextedit.h>
diff --git a/kbarcode/mybarcode.cpp b/kbarcode/mybarcode.cpp
index 6c4f823..50f9bd8 100644
--- a/kbarcode/mybarcode.cpp
+++ b/kbarcode/mybarcode.cpp
@@ -29,7 +29,7 @@ f/***************************************************************************
 
 // KDE includes
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
diff --git a/kbarcode/previewdialog.cpp b/kbarcode/previewdialog.cpp
index f607fc2..55c631c 100644
--- a/kbarcode/previewdialog.cpp
+++ b/kbarcode/previewdialog.cpp
@@ -33,7 +33,7 @@
 #include <kabc/addresseedialog.h>
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/kbarcode/printersettings.cpp b/kbarcode/printersettings.cpp
index da52475..e8ff2b8 100644
--- a/kbarcode/printersettings.cpp
+++ b/kbarcode/printersettings.cpp
@@ -21,7 +21,7 @@
 // KDE includes
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kurl.h>
diff --git a/kbarcode/sqltables.cpp b/kbarcode/sqltables.cpp
index 60ddacd..1756984 100644
--- a/kbarcode/sqltables.cpp
+++ b/kbarcode/sqltables.cpp
@@ -31,7 +31,7 @@
 // KDE includes
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kbarcode/tec.cpp b/kbarcode/tec.cpp
index 1d183b8..75f8404 100644
--- a/kbarcode/tec.cpp
+++ b/kbarcode/tec.cpp
@@ -36,7 +36,7 @@
 // KDE includes
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klistview.h>
 #include <klineedit.h>
diff --git a/kbarcode/tec.h b/kbarcode/tec.h
index 73de630..163dfee 100644
--- a/kbarcode/tec.h
+++ b/kbarcode/tec.h
@@ -36,7 +36,7 @@
 // KDE includes
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klistview.h>
 #include <klineedit.h>
diff --git a/kbarcode/textlineedit.cpp b/kbarcode/textlineedit.cpp
index a23764e..b9eca4b 100644
--- a/kbarcode/textlineedit.cpp
+++ b/kbarcode/textlineedit.cpp
@@ -17,7 +17,7 @@
 #include <kaction.h>
 #include <tdeversion.h>
 #include <kcolordialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <tdespell.h>
 #include <klineedit.h>