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

acinclude.m4

@@ -590,7 +590,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
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@@ -1741,7 +1741,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
@@ -2037,7 +2037,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")
@@ -2047,7 +2047,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
 ])

src/codeeditor.cpp

@@ -23,7 +23,7 @@
 #include <tqmessagebox.h>
 #include <kmessagebox.h>
 #include <tqlayout.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 CodeEditor::CodeEditor(TQWidget *parent, const char *name)
  : TQWidget(parent, name)

src/kexportdialog.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 #include "kexportdialog.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 KExportDialog::KExportDialog( TQWidget *parent, const char *name ) : TQDialog(parent, name)
 {

src/kjtagdialog.cpp

@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "kjtagdialog.h"
 #include <tqmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 KJTAGDialog::KJTAGDialog( TQWidget *parent )

src/kpicosim.cpp

@@ -77,7 +77,7 @@
 #include <kiconloader.h>
 #include "kexportdialog.h"
 #include "kjtagdialog.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <tqlayout.h>
 #include <ksimpleconfig.h>

src/kpicosimconfig.h

@@ -20,7 +20,7 @@
 #ifndef KPICOSIMCONFIG_H
 #define KPICOSIMCONFIG_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 
 /**
 @author Mark Six