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

acinclude.m4

@@ -606,7 +606,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
@@ -1790,7 +1790,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
@@ -2090,7 +2090,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")
@@ -2100,7 +2100,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
 ])

aclocal.m4

@@ -618,7 +618,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
@@ -1802,7 +1802,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
@@ -2102,7 +2102,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")
@@ -2112,7 +2112,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/canvasmanipulator.cpp

@@ -26,7 +26,7 @@
 
 #include <cmath>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 

src/core/main.cpp

@@ -14,7 +14,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 static const char description[] =

src/document.cpp

@@ -15,7 +15,7 @@
 #include "view.h"
 #include "viewcontainer.h"
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktabwidget.h>

src/electronics/subcircuits.cpp

@@ -16,7 +16,7 @@
 #include "subcircuits.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>

src/filemetainfo.cpp

@@ -12,7 +12,7 @@
 #include "textdocument.h"
 #include "textview.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 //BEGIN class MetaInfo

src/gui/itemselector.cpp

@@ -19,7 +19,7 @@
 #include "mechanicsdocument.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 

src/gui/oscilloscope.cpp

@@ -18,7 +18,7 @@
 
 #include <cmath>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>

src/gui/oscilloscopeview.cpp

@@ -14,7 +14,7 @@
 #include "probepositioner.h"
 #include "simulator.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>

src/gui/outputmethoddlg.cpp

@@ -18,7 +18,7 @@
 #include "projectmanager.h"
 
 #include <kcombobox.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 #include <ktempfile.h>
 #include <kurlrequester.h>

src/gui/projectdlgs.cpp

@@ -20,7 +20,7 @@
 #include <assert.h>
 #include <kcombobox.h>
 #include <tdeversion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kurlrequester.h>

src/gui/settingsdlg.cpp

@@ -22,7 +22,7 @@
 #include <kapplication.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
 #include <klocale.h>

src/gui/settingsdlg.h

@@ -11,7 +11,7 @@
 #ifndef SETTINGSDLG_H
 #define SETTINGSDLG_H
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <tqmap.h>
 
 class AsmFormattingWidget;

src/gui/symbolviewer.cpp

@@ -15,7 +15,7 @@
 #include "symbolviewer.h"
 
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tqlabel.h>

src/icnview.cpp

@@ -13,7 +13,7 @@
 #include "icnview.h"
 #include "ktechlab.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>

src/itemdocument.cpp

@@ -26,7 +26,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -787,7 +787,7 @@ void ItemDocument::exportToImage()
 	// the Export shortcut is pressed or the Export toolbar
 	// button is clicked
 	
-	// widget for the kfiledialog
+	// widget for the tdefiledialog
 	// It is the bit that says "Crop circuit?"
 	// Okay need to think of something way better to say here.
 	// gotme here, KFileDialog makes itself parent so tries to destroy cropCheck when it is deleted.

src/itemdocumentdata.cpp

@@ -20,7 +20,7 @@
 #include "pinmapping.h"
 
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h> 
 #include <ktempfile.h>

src/katemdi.cpp

@@ -26,7 +26,7 @@
 #include <kglobalsettings.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
 

src/ktechlab.cpp

@@ -43,9 +43,9 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>

src/languages/language.cpp

@@ -19,7 +19,7 @@
 #include "src/core/ktlconfig.h"
 
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <tqregexp.h>

src/languages/picprogrammer.cpp

@@ -13,7 +13,7 @@
 #include "src/core/ktlconfig.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>

src/projectmanager.cpp

@@ -21,9 +21,9 @@
 #include "recentfilesaction.h"
 
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h> 
 #include <kmimetype.h>

src/recentfilesaction.cpp

@@ -10,7 +10,7 @@
 
 #include "recentfilesaction.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 #include <kstandarddirs.h>
 #include <kurl.h>

src/viewcontainer.cpp

@@ -14,7 +14,7 @@
 #include "view.h"
 #include "viewcontainer.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <klocale.h>