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

28 files changed, 32 insertions, 46 deletions

diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index b9751944b..968cdcc31 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -85,7 +85,7 @@ set( ${target}_SRCS
   pixmapserver.cc kcustommenu.cc startupid.cpp minicli_ui.ui
   xautolock_diy.c xautolock_engine.c kshadowengine.cpp
   kshadowsettings.cpp kdesktopshadowsettings.cpp
-  kfileividesktop.cpp kdesktopapp.cpp
+  tdefileividesktop.cpp kdesktopapp.cpp
 )
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
diff --git a/kdesktop/ConfigureChecks.cmake b/kdesktop/ConfigureChecks.cmake
index 9e59185a4..87e2213ce 100644
--- a/kdesktop/ConfigureChecks.cmake
+++ b/kdesktop/ConfigureChecks.cmake
@@ -14,10 +14,3 @@
 if( WITH_PAM AND (NOT DEFINED KSCREENSAVER_PAM_SERVICE) )
   set( KSCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" )
 endif( )
-
-if( WITH_KDESKTOP_LOCK_BACKTRACE )
-  check_include_files( "bfd.h;demangle.h;libiberty.h" HAVE_BINUTILS_DEV )
-  if( NOT HAVE_BINUTILS_DEV )
-    tde_message_fatal( "binutils-dev are required, but not found on your system" )
-  endif( )
-endif( )
diff --git a/kdesktop/DESIGN b/kdesktop/DESIGN
index f13a7b2f5..f69ee2198 100644
--- a/kdesktop/DESIGN
+++ b/kdesktop/DESIGN
@@ -37,8 +37,8 @@ lock* : screen saver/locker
 Libs used by KDesktop
 ======================
  
-tdecore, tdeui, kfile  - usual stuff :)
-libkio - I/O stuff, mimetypes, services, registry
+tdecore, tdeui, tdefile  - usual stuff :)
+libtdeio - I/O stuff, mimetypes, services, registry
 libkonq - properties dialog, templates ("new") menu, dir lister, settings
 
 Screensaver
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index 1b4927db6..f363ac17e 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -23,7 +23,7 @@ kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \
 	minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \
 	startupid.cpp minicli_ui.ui xautolock_diy.c xautolock_engine.c \
 	kshadowengine.cpp kshadowsettings.cpp \
-	kdesktopshadowsettings.cpp kfileividesktop.cpp \
+	kdesktopshadowsettings.cpp tdefileividesktop.cpp \
 	kdesktopapp.cpp
 
 include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index e15c6aabe..cc7838b42 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -22,7 +22,7 @@
 #include <tqscrollview.h>
 
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <twin.h>
 #include <kapplication.h>
 #include <kdebug.h>
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 073a69a5a..07fbaf5cd 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -33,7 +33,7 @@
 #include <kcolordrag.h>
 #include <kurldrag.h>
 #include <stdlib.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqfile.h>
 
 #include <tqdir.h>
@@ -49,7 +49,7 @@
 #include <kinputdialog.h>
 #include <kipc.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kprocess.h>
 #include <tdesycoca.h>
 #include <ktempfile.h>
diff --git a/kdesktop/init.cc b/kdesktop/init.cc
index cf45c71d4..e9c805bfe 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cc
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 #include <kglobalsettings.h>
diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc
index b32c77096..a0bf92556 100644
--- a/kdesktop/kcustommenu.cc
+++ b/kdesktop/kcustommenu.cc
@@ -20,7 +20,7 @@
 #include <tqimage.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index 6fee5d5c4..bbb495989 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -65,7 +65,7 @@
       <label>Sort directories first</label>
       <whatsthis></whatsthis>
       <!-- krootwm.cc:251 -->
-      <!--         aSortDirsFirst->setChecked( kconfig->readBoolEntry("SortDirectoriesFirst", true)); -->
+      <!--         aSortDirsFirst->setChecked( tdeconfig->readBoolEntry("SortDirectoriesFirst", true)); -->
       <!-- krootwm.cc:496 -->
       <!--     config->writeEntry( "SortDirectoriesFirst", b ); -->
     </entry>
diff --git a/kdesktop/kdesktopshadowsettings.h b/kdesktop/kdesktopshadowsettings.h
index 7e421c6d6..c7e73db71 100644
--- a/kdesktop/kdesktopshadowsettings.h
+++ b/kdesktop/kdesktopshadowsettings.h
@@ -25,7 +25,7 @@
 
 #include <tqcolor.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kshadowsettings.h>
 
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index ad049256d..57287014a 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -22,7 +22,7 @@
 #include "desktop.h"
 #include "kdesktopsettings.h"
 
-#include <kio/paste.h>
+#include <tdeio/paste.h>
 #include <kaccel.h>
 #include <kapplication.h>
 #include <kcolordrag.h>
@@ -57,7 +57,7 @@
 
 #include "kshadowengine.h"
 #include "kdesktopshadowsettings.h"
-#include "kfileividesktop.h"
+#include "tdefileividesktop.h"
 
 // for multihead
 extern int kdesktop_screen_number;
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index f951765ba..c9feecaf7 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -24,7 +24,7 @@
 
 #include <konq_iconviewwidget.h>
 #include <kaction.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdirnotify.h>
 #include <kmessagebox.h>
 
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 08db2eb95..a263b529c 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -36,7 +36,7 @@
 #include <kstandarddirs.h>
 #include <kpopupmenu.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcmultidialog.h>
 #include <kbookmarkmenu.h>
 #include <konqbookmarkmanager.h>
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index ff60d0fd6..661d644a6 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -22,13 +22,13 @@
 #include <config.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <kurifilter.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tqscrollview.h>
 #include "kwebdesktop.h"
diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp
index 05c5f4ef2..4433ef367 100644
--- a/kdesktop/kxdglauncher.cpp
+++ b/kdesktop/kxdglauncher.cpp
@@ -30,7 +30,7 @@
 #include <kglobalsettings.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <stdlib.h>
 
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index e847cf1fc..80c2b2cdb 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -32,16 +32,11 @@ set( target kdesktop_lock )
 
 set( ${target}_SRCS
   lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc sakdlg.cc
-  securedlg.cc autologout.cc main.cc
+  securedlg.cc autologout.cc main.cc backtrace_symbols.c
 )
 
-if( WITH_KDESKTOP_LOCK_BACKTRACE )
-  list( APPEND ${target}_SRCS backtrace_symbols.c )
-  set( BACKTRACE_LIBRARY bfd )
-endif( )
-
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdesktopsettings-static dmctl-static kio-shared Xext ${BACKTRACE_LIBRARY} ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}"
+  LINK kdesktopsettings-static dmctl-static tdeio-shared Xext bfd ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}"
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc
index 024425d2c..ef683cbcc 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cc
@@ -10,7 +10,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <dcopref.h>
diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc
index 725122134..56ee83e38 100644
--- a/kdesktop/lock/infodlg.cc
+++ b/kdesktop/lock/infodlg.cc
@@ -16,7 +16,7 @@
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
 #include <kpassdlg.h>
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 29dc8bd9c..2684403a5 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -21,7 +21,7 @@
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
 #include <kpassdlg.h>
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 5f01274a8..a3f5fb56f 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -137,7 +137,6 @@ static Atom   gXA_SCREENSAVER_VERSION;
 
 void print_trace()
 {
-#ifdef WITH_KDESKTOP_LOCK_BACKTRACE
 	void *array[10];
 	size_t size;
 	char **strings;
@@ -153,7 +152,6 @@ void print_trace()
 	}
 
 	free (strings);
-#endif
 }
 
 static void segv_handler(int)
diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc
index 401370b21..acac92127 100644
--- a/kdesktop/lock/querydlg.cc
+++ b/kdesktop/lock/querydlg.cc
@@ -16,7 +16,7 @@
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
 #include <kpassdlg.h>
diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc
index 6f983ce70..4904e71e1 100644
--- a/kdesktop/lock/sakdlg.cc
+++ b/kdesktop/lock/sakdlg.cc
@@ -16,7 +16,7 @@
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
 #include <kpassdlg.h>
diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cc
index 08a70a17d..79147ae0a 100644
--- a/kdesktop/lock/securedlg.cc
+++ b/kdesktop/lock/securedlg.cc
@@ -16,7 +16,7 @@
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
 #include <kpassdlg.h>
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index 17fc4addf..9f549e54a 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmanagerselection.h>
 
 #include "desktop.h"
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index dca215de3..6f940a5b2 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -60,7 +60,7 @@
 #include <twin.h>
 #include <tdesu/su.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kguiitem.h>
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 36d566e31..6603e7b7b 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -27,7 +27,7 @@
 #include <kapplication.h>
 #include <tqimage.h>
 #include <tqbitmap.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <X11/Xlib.h>
 
 #define KDE_STARTUP_ICON "kmenu"
diff --git a/kdesktop/kfileividesktop.cpp b/kdesktop/tdefileividesktop.cpp
index 90dc69327..420aeac4f 100644
--- a/kdesktop/kfileividesktop.cpp
+++ b/kdesktop/tdefileividesktop.cpp
@@ -35,7 +35,7 @@
 
 #include <kshadowengine.h>
 #include "kdesktopshadowsettings.h"
-#include "kfileividesktop.h"
+#include "tdefileividesktop.h"
 
 //#define DEBUG
 
diff --git a/kdesktop/kfileividesktop.h b/kdesktop/tdefileividesktop.h
index 129abec07..8dd0f1fc4 100644
--- a/kdesktop/kfileividesktop.h
+++ b/kdesktop/tdefileividesktop.h
@@ -28,7 +28,7 @@
 #include <tqpixmap.h>
 #include <tqimage.h>
 #include <tqstring.h>
-#include <kfileivi.h>
+#include <tdefileivi.h>
 
 /*
  * The dither flags used to display the shadow image