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

11 files changed, 24 insertions, 24 deletions

diff --git a/kiosktool/Makefile.am b/kiosktool/Makefile.am
index 8b1eb30..42aee63 100644
--- a/kiosktool/Makefile.am
+++ b/kiosktool/Makefile.am
@@ -48,7 +48,7 @@ METASOURCES = AUTO
 
 messages: rc.cpp
 	./extractxml kiosk_data.xml > kiosk_data.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kiosktool.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeiosktool.pot
 	rm kiosk_data.cpp
 
 KDE_ICON = kiosktool
@@ -56,7 +56,7 @@ KDE_ICON = kiosktool
 xdg_apps_DATA = kiosktool.desktop
 
 # this is where the XML-GUI resource file goes
-rcdir = $(kde_datadir)/kiosktool
+rcdir = $(kde_datadir)/tdeiosktool
 rc_DATA = kiosktoolui.rc kiosk_data.xml caption.png background.png logo.png \
 	caption-da.png caption-empty.png caption-et.png caption-pt.png caption-pt_BR.png \
 	caption-sv.png
diff --git a/kiosktool/componentSelectionPage.cpp b/kiosktool/componentSelectionPage.cpp
index 40f3eb2..43ee39f 100644
--- a/kiosktool/componentSelectionPage.cpp
+++ b/kiosktool/componentSelectionPage.cpp
@@ -22,7 +22,7 @@
 #include <tqpushbutton.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kiconview.h>
 #include <klocale.h>
diff --git a/kiosktool/kcms/autostart/kcmautostart.desktop b/kiosktool/kcms/autostart/kcmautostart.desktop
index fbdc99f..599da87 100644
--- a/kiosktool/kcms/autostart/kcmautostart.desktop
+++ b/kiosktool/kcms/autostart/kcmautostart.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell kcmautostart
+Exec=tdecmshell kcmautostart
 Icon=autostart
 Type=Application
 
diff --git a/kiosktool/kioskConfigDialog.cpp b/kiosktool/kioskConfigDialog.cpp
index a8db84e..e624afe 100644
--- a/kiosktool/kioskConfigDialog.cpp
+++ b/kiosktool/kioskConfigDialog.cpp
@@ -23,8 +23,8 @@
 #include <tqtextedit.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <knuminput.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/kiosktool/kiosk_data.xml b/kiosktool/kiosk_data.xml
index cb4b141..92144b6 100644
--- a/kiosktool/kiosk_data.xml
+++ b/kiosktool/kiosk_data.xml
@@ -156,7 +156,7 @@
     </description>
     <preview binary="kdesktop" dcop="kdesktop" options="restart">
     </preview>
-    <setup binary="kcmshell" args="tde-background.desktop">
+    <setup binary="tdecmshell" args="tde-background.desktop">
        <mutable file="kdesktoprc" />
        <mutable file="kdeglobals" />
     </setup>
@@ -184,7 +184,7 @@
     </description>
     <preview binary="kdesktop" dcop="kdesktop" options="restart">
     </preview>
-    <setup binary="kcmshell" args="tde-screensaver.desktop">
+    <setup binary="tdecmshell" args="tde-screensaver.desktop">
        <mutable file="kdesktoprc" />
        <mutable file="kdeglobals" />
     </setup>
@@ -249,7 +249,7 @@
     <preview binary="kdesktop" dcop="kdesktop" options="restart">
     </preview>
 -->
-    <setup binary="kcmshell" args="tde-style.desktop,tde-colors.desktop,tde-fonts.desktop,tde-twindecoration.desktop">
+    <setup binary="tdecmshell" args="tde-style.desktop,tde-colors.desktop,tde-fonts.desktop,tde-twindecoration.desktop">
        <mutable file="kdesktoprc" />
        <mutable file="kdeglobals" />
     </setup>
@@ -312,7 +312,7 @@
     <description>
       Set up of Network Proxy settings
     </description>
-    <setup binary="kcmshell" args="tde-proxy.desktop">
+    <setup binary="tdecmshell" args="tde-proxy.desktop">
        <mutable file="kdesktoprc" />
        <mutable file="kdeglobals" />
     </setup>
@@ -736,7 +736,7 @@
     <description>
       Remote Desktop Sharing
     </description>
-    <setup binary="kcmshell" args="kcmkrfb">
+    <setup binary="tdecmshell" args="kcmkrfb">
     </setup>
     <actions>
        <action type="immutable" file="krfbrc">
@@ -752,7 +752,7 @@
     <description>
       Configure the applications used for opening files.
     </description>
-    <setup binary="kcmshell" args="filetypes">
+    <setup binary="tdecmshell" args="filetypes">
     </setup>
     <actions>
        <action type="module" key="tde-filetypes.desktop">
@@ -775,4 +775,4 @@
 -->
     </actions>
   </group> 
-</kiosk>
+</tdeiosk>
diff --git a/kiosktool/kioskgui.cpp b/kiosktool/kioskgui.cpp
index 3a6f2a3..ca615fe 100644
--- a/kiosktool/kioskgui.cpp
+++ b/kiosktool/kioskgui.cpp
@@ -27,8 +27,8 @@
 #include <kapplication.h>
 #include <kaction.h>
 #include <kcombobox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kiconview.h>
diff --git a/kiosktool/kioskgui.h b/kiosktool/kioskgui.h
index 8df13f3..c90a3a9 100644
--- a/kiosktool/kioskgui.h
+++ b/kiosktool/kioskgui.h
@@ -21,7 +21,7 @@
 
 #include <tqlistview.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmainwindow.h>
 
 class MainView;
diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp
index 543bc91..e77e874 100644
--- a/kiosktool/kioskrun.cpp
+++ b/kiosktool/kioskrun.cpp
@@ -31,7 +31,7 @@
 
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -44,7 +44,7 @@
 
 #include "kiosksync.h"
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #define NETACCESS	TDEIO::NetAccess
 
 #undef DEBUG_ENTRIES
@@ -198,7 +198,7 @@ KioskRun::updateSycoca()
    file.open(IO_WriteOnly);
    file.close();
 
-   dcopRef("kded", "kbuildsycoca").call("recreate");
+   dcopRef("kded", "tdebuildsycoca").call("recreate");
 }
 
 TDEProcess*
@@ -673,7 +673,7 @@ KioskRun::makeMutable(bool bMutable)
       }
    }
    // Propagate to tdeinit
-   dcopRef("klauncher", "klauncher").call("setLaunchEnv", 
+   dcopRef("tdelauncher", "tdelauncher").call("setLaunchEnv", 
    	TQCString("TDE_KIOSK_NO_RESTRICTIONS"), TQCString(m_noRestrictions ? "true" : ""));
    
    setConfigImmutable("kdeglobals", "KDE Action Restrictions", true);
@@ -685,7 +685,7 @@ KioskRun::newConfigFiles()
    setupConfigEnv();
 
    TQStringList exceptions;
-   exceptions << "kconf_updaterc";
+   exceptions << "tdeconf_updaterc";
    
    TQStringList result;
    TQDir dir(m_configDir);
diff --git a/kiosktool/pageWidget.cpp b/kiosktool/pageWidget.cpp
index 51bcfd0..96873c7 100644
--- a/kiosktool/pageWidget.cpp
+++ b/kiosktool/pageWidget.cpp
@@ -19,7 +19,7 @@
 
 #include "pageWidget.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 
 #include "kioskdata.h"
diff --git a/kiosktool/profilePropsPage.cpp b/kiosktool/profilePropsPage.cpp
index 793fd48..d90d131 100644
--- a/kiosktool/profilePropsPage.cpp
+++ b/kiosktool/profilePropsPage.cpp
@@ -23,7 +23,7 @@
 #include <tqvalidator.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kiosktool/userManagement.cpp b/kiosktool/userManagement.cpp
index 689b7bd..000e00e 100644
--- a/kiosktool/userManagement.cpp
+++ b/kiosktool/userManagement.cpp
@@ -29,7 +29,7 @@
 #include <tqpushbutton.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>