Rename many classes and header files to avoid conflicts with KDE4

10 files changed, 18 insertions, 18 deletions

diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index 968cdcc31..2f88769d2 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -53,7 +53,7 @@ configure_file( kdesktop.desktop.cmake kdesktop.desktop @ONLY )
 install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kdesktop.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
 install( FILES kdesktop_custom_menu1 kdesktop_custom_menu2 DESTINATION ${CONFIG_INSTALL_DIR} )
 install( FILES kdesktopSetAsBackground.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
-install( FILES kdesktop.kcfg klaunch.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+install( FILES kdesktop.kcfg tdelaunch.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 
 ##### kcheckrunning (executable) ################
@@ -101,5 +101,5 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
 ##### kdesktopsettings (static) #################
 
 tde_add_library( kdesktopsettings STATIC_PIC
-  SOURCES kdesktopsettings.kcfgc klaunchsettings.kcfgc
+  SOURCES kdesktopsettings.kcfgc tdelaunchsettings.kcfgc
 )
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index f363ac17e..959018afb 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -15,7 +15,7 @@ noinst_LTLIBRARIES = libkdesktopsettings.la
 
 libkdesktopsettings_la_LDFLAGS = $(all_libraries) -no-undefined
 libkdesktopsettings_la_LIBADD = $(LIB_TDECORE)
-libkdesktopsettings_la_SOURCES = kdesktopsettings.kcfgc klaunchsettings.kcfgc 
+libkdesktopsettings_la_SOURCES = kdesktopsettings.kcfgc tdelaunchsettings.kcfgc 
 
 kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \
 	lockeng.cc KDesktopIface.skel \
@@ -56,10 +56,10 @@ lockeng.lo: kdesktopsettings.h
 main.lo: kdesktopsettings.h
 minicli.lo: kdesktopsettings.h
 
-# List made with: grep -l klaunchsettings.h *[pc] | sed -e 's/\.c.*$/.lo: klaunchsettings.h/'
-desktop.lo: klaunchsettings.h
-klaunchsettings.lo: klaunchsettings.h
-startupid.lo: klaunchsettings.h
+# List made with: grep -l tdelaunchsettings.h *[pc] | sed -e 's/\.c.*$/.lo: tdelaunchsettings.h/'
+desktop.lo: tdelaunchsettings.h
+tdelaunchsettings.lo: tdelaunchsettings.h
+startupid.lo: tdelaunchsettings.h
 
 messages: rc.cpp
 	$(EXTRACTRC) lock/*.ui >> rc.cpp
@@ -74,4 +74,4 @@ autostartdir = $(datadir)/autostart
 konqservice_DATA = kdesktopSetAsBackground.desktop
 konqservicedir = $(kde_datadir)/konqueror/servicemenus
 
-kde_kcfg_DATA = kdesktop.kcfg klaunch.kcfg
+kde_kcfg_DATA = kdesktop.kcfg tdelaunch.kcfg
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index cc7838b42..65e532afc 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -27,7 +27,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kipc.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <twinmodule.h>
 #include <krootpixmap.h>
 
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 9ff390ec6..5b125de2c 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -26,7 +26,7 @@
 #include "kdiconview.h"
 #include "minicli.h"
 #include "kdesktopsettings.h"
-#include "klaunchsettings.h"
+#include "tdelaunchsettings.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -59,12 +59,12 @@
 #include <krun.h>
 #include <twin.h>
 #include <kglobalsettings.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kapplication.h>
 #include <kdirlister.h>
 // Create the equivalent of TDEAccelBase::connectItem
 // and then remove this include and fix reconnects in initRoot() -- ellis
-//#include <kaccelbase.h>
+//#include <tdeaccelbase.h>
 
 extern int kdesktop_screen_number;
 extern TQCString kdesktop_name, kicker_name, twin_name;
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index d80af8fe7..e8e95b2d1 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -23,7 +23,7 @@
 #include "kdesktopsettings.h"
 
 #include <tdeio/paste.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kapplication.h>
 #include <kcolordrag.h>
 #include <kdebug.h>
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index 7d8ff1527..f74b67954 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -23,7 +23,7 @@
 #include <tqlistview.h>
 
 #include <konq_iconviewwidget.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefileitem.h>
 #include <kdirnotify.h>
 #include <kmessagebox.h>
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 62bb0e2bc..719987130 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -34,7 +34,7 @@
 
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kcmultidialog.h>
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 0572413a8..e61167fca 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -20,7 +20,7 @@
 #include <config.h>
 
 #include "startupid.h"
-#include "klaunchsettings.h"
+#include "tdelaunchsettings.h"
 
 #include <kiconloader.h>
 #include <tqcursor.h>
diff --git a/kdesktop/tdelaunch.kcfg b/kdesktop/tdelaunch.kcfg
index f43592e70..0bd19a0d2 100644
--- a/kdesktop/tdelaunch.kcfg
+++ b/kdesktop/tdelaunch.kcfg
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                            http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="klaunchrc" />
+  <kcfgfile name="tdelaunchrc" />
   <!-- generated by TDEConfig XTraKtor -->
   
   <group name="BusyCursorSettings">
diff --git a/kdesktop/tdelaunchsettings.kcfgc b/kdesktop/tdelaunchsettings.kcfgc
index 4d10d280f..f7043920a 100644
--- a/kdesktop/tdelaunchsettings.kcfgc
+++ b/kdesktop/tdelaunchsettings.kcfgc
@@ -1,4 +1,4 @@
-File=klaunch.kcfg
+File=tdelaunch.kcfg
 ClassName=TDELaunchSettings
 Singleton=true
 Mutators=true