Rename many classes and header files to avoid conflicts with KDE4

110 files changed, 25 insertions, 25 deletions

diff --git a/TODO b/TODO
index 3ebcb06..9e39e25 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-Kiosktool:
+Kiostdetool:
 * Make it possible to select targeted KDE version
 (e.g. in order to use KDE 3.4 only features)
 * Add editor for URL (file) restrictions
diff --git a/configure.files b/configure.files
index e3dd24d..4b47a4a 100644
--- a/configure.files
+++ b/configure.files
@@ -1,3 +1,3 @@
 ./admin/configure.in.min
 configure.in.in
-./tdeiosktool/configure.in.in
+./kiosktool/configure.in.in
diff --git a/configure.in b/configure.in
index a6dabb9..7895601 100644
--- a/configure.in
+++ b/configure.in
@@ -68,7 +68,7 @@ dnl =======================================================
 KDE_INIT_DOXYGEN([The API Reference], [Version $VERSION])
 
 dnl =======================================================
-dnl FILE: ./tdeiosktool/configure.in.in
+dnl FILE: ./kiosktool/configure.in.in
 dnl =======================================================
 
 AC_CHECK_SETENV
@@ -81,7 +81,7 @@ AC_CONFIG_FILES([ Makefile ])
 AC_CONFIG_FILES([ doc/Makefile ])
 AC_CONFIG_FILES([ doc/da/Makefile ])
 AC_CONFIG_FILES([ doc/it/Makefile ])
-AC_CONFIG_FILES([ doc/tdeiosktool/Makefile ])
+AC_CONFIG_FILES([ doc/kiosktool/Makefile ])
 AC_CONFIG_FILES([ doc/nl/Makefile ])
 AC_CONFIG_FILES([ doc/pt/Makefile ])
 AC_CONFIG_FILES([ doc/sv/Makefile ])
diff --git a/doc/da/index.docbook b/doc/da/index.docbook
index 589d0af..890383e 100644
--- a/doc/da/index.docbook
+++ b/doc/da/index.docbook
@@ -58,7 +58,7 @@
 
 <abstract>
 <para
-><ulink url="http://extragear.kde.org/apps/tdeiosktool.php"
+><ulink url="http://extragear.kde.org/apps/kiosktool.php"
 >&kiosktool;</ulink
 > er et administrationsværktøj for &kde; som tilbyder en nem måde for systemadministratorer at oprette fordefinerede desktopindstillinger for grupper af brugere, låse indstillinger eller på anden måde begrænse funktionerne af &kde;'s desktopmiljø.</para>
 </abstract>
diff --git a/doc/it/index.docbook b/doc/it/index.docbook
index 36e178c..f3ed5cb 100644
--- a/doc/it/index.docbook
+++ b/doc/it/index.docbook
@@ -72,7 +72,7 @@
 
 <abstract>
 <para
-><ulink url="http://extragear.kde.org/apps/tdeiosktool.php"
+><ulink url="http://extragear.kde.org/apps/kiosktool.php"
 >&kiosktool;</ulink
 > è uno strumento di amministrazione di &kde; che offre agli amministratori di sistema un modo semplice di predefinire configurazioni desktop per gruppi di utenti, bloccare impostazioni o altrimenti restringere l'accesso a funzionalità dell'ambiente desktop &kde;.</para>
 </abstract>
diff --git a/doc/kiostdetool/Makefile.am b/doc/kiosktool/Makefile.am
index c01e3fc..c01e3fc 100644
--- a/doc/kiostdetool/Makefile.am
+++ b/doc/kiosktool/Makefile.am
diff --git a/doc/kiostdetool/extra-steps.docbook b/doc/kiosktool/extra-steps.docbook
index da9c35e..da9c35e 100644
--- a/doc/kiostdetool/extra-steps.docbook
+++ b/doc/kiosktool/extra-steps.docbook
diff --git a/doc/kiostdetool/index.docbook b/doc/kiosktool/index.docbook
index 12c2221..ab1adbb 100644
--- a/doc/kiostdetool/index.docbook
+++ b/doc/kiosktool/index.docbook
@@ -42,7 +42,7 @@
 <releaseinfo>1.0</releaseinfo>
 
 <abstract>
-<para><ulink url="http://extragear.kde.org/apps/tdeiosktool.php">&kiosktool;</ulink>
+<para><ulink url="http://extragear.kde.org/apps/kiosktool.php">&kiosktool;</ulink>
 is a &kde; administration tool that offers system administrators an easy way to
 predefine desktop configurations for groups of users, lock down settings or otherwise
 restrict features of the &kde; desktop environment.</para>
diff --git a/doc/kiostdetool/introduction.docbook b/doc/kiosktool/introduction.docbook
index 629a78d..629a78d 100644
--- a/doc/kiostdetool/introduction.docbook
+++ b/doc/kiosktool/introduction.docbook
diff --git a/doc/kiostdetool/profile-assign.docbook b/doc/kiosktool/profile-assign.docbook
index 057f1fc..057f1fc 100644
--- a/doc/kiostdetool/profile-assign.docbook
+++ b/doc/kiosktool/profile-assign.docbook
diff --git a/doc/kiostdetool/profile-create.docbook b/doc/kiosktool/profile-create.docbook
index f455920..f455920 100644
--- a/doc/kiostdetool/profile-create.docbook
+++ b/doc/kiosktool/profile-create.docbook
diff --git a/doc/kiostdetool/profile-setup.docbook b/doc/kiosktool/profile-setup.docbook
index 31384e8..31384e8 100644
--- a/doc/kiostdetool/profile-setup.docbook
+++ b/doc/kiosktool/profile-setup.docbook
diff --git a/doc/kiostdetool/profiles.docbook b/doc/kiosktool/profiles.docbook
index 1753c11..1753c11 100644
--- a/doc/kiostdetool/profiles.docbook
+++ b/doc/kiosktool/profiles.docbook
diff --git a/doc/kiostdetool/settings.docbook b/doc/kiosktool/settings.docbook
index d4e4a78..d4e4a78 100644
--- a/doc/kiostdetool/settings.docbook
+++ b/doc/kiosktool/settings.docbook
diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook
index a80e255..bbe44aa 100644
--- a/doc/nl/index.docbook
+++ b/doc/nl/index.docbook
@@ -58,7 +58,7 @@
 
 <abstract>
 <para
-><ulink url="http://extragear.kde.org/apps/tdeiosktool.php"
+><ulink url="http://extragear.kde.org/apps/kiosktool.php"
 >&kiosktool;</ulink
 > is een beheerprogramma voor &kde; dat systeembeheerders een eenvoudige manier biedt om desktopconfiguraties voor gebruikersgroepen voor te definiëren, instellingen vast te zetten of op andere wijze de functionaliteit van de &kde; Desktop Environment te beperken.</para>
 </abstract>
diff --git a/doc/pt/index.docbook b/doc/pt/index.docbook
index ff997f9..bb064dc 100644
--- a/doc/pt/index.docbook
+++ b/doc/pt/index.docbook
@@ -72,7 +72,7 @@
 
 <abstract>
 <para
->O <ulink url="http://extragear.kde.org/apps/tdeiosktool.php"
+>O <ulink url="http://extragear.kde.org/apps/kiosktool.php"
 >&kiosktool;</ulink
 > é uma ferramenta de administração do &kde; que oferece aos administradores de sistema uma forma simples de predefinir configurações do ambiente de trabalho para os grupos de utilizadores, bloquear as opções ou restringir de outra forma as funcionalidades do ambiente de trabalho do &kde;.</para>
 </abstract>
diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook
index ffd3234..c8e553a 100644
--- a/doc/sv/index.docbook
+++ b/doc/sv/index.docbook
@@ -72,7 +72,7 @@
 
 <abstract>
 <para
-><ulink url="http://extragear.kde.org/apps/tdeiosktool.php"
+><ulink url="http://extragear.kde.org/apps/kiosktool.php"
 >&kiosktool;</ulink
 > är ett administrationsverktyg för &kde; som erbjuder ett enkelt sätt för systemadministratörer att skapa fördefinierade skrivbordsinställningar för grupper av användare, låsa inställningar eller på andra sätt begränsa funktionerna hos &kde;:s skrivbordsmiljö.</para>
 </abstract>
diff --git a/kiostdetool/Makefile.am b/kiosktool/Makefile.am
index 47756e9..5561505 100644
--- a/kiostdetool/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)/tdeiosktool.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kiosktool.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)/tdeiosktool
+rcdir = $(kde_datadir)/kiosktool
 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/kiostdetool/background.png b/kiosktool/background.png
index 0341206..0341206 100644
--- a/kiostdetool/background.png
+++ b/kiosktool/background.png
diff --git a/kiostdetool/caption-da.png b/kiosktool/caption-da.png
index 7894085..7894085 100644
--- a/kiostdetool/caption-da.png
+++ b/kiosktool/caption-da.png
diff --git a/kiostdetool/caption-empty.png b/kiosktool/caption-empty.png
index 07a6a3a..07a6a3a 100644
--- a/kiostdetool/caption-empty.png
+++ b/kiosktool/caption-empty.png
diff --git a/kiostdetool/caption-et.png b/kiosktool/caption-et.png
index 8cba1b3..8cba1b3 100644
--- a/kiostdetool/caption-et.png
+++ b/kiosktool/caption-et.png
diff --git a/kiostdetool/caption-pt.png b/kiosktool/caption-pt.png
index db57843..db57843 100644
--- a/kiostdetool/caption-pt.png
+++ b/kiosktool/caption-pt.png
diff --git a/kiostdetool/caption-pt_BR.png b/kiosktool/caption-pt_BR.png
index db57843..db57843 100644
--- a/kiostdetool/caption-pt_BR.png
+++ b/kiosktool/caption-pt_BR.png
diff --git a/kiostdetool/caption-sv.png b/kiosktool/caption-sv.png
index 358cad3..358cad3 100644
--- a/kiostdetool/caption-sv.png
+++ b/kiosktool/caption-sv.png
diff --git a/kiostdetool/caption.png b/kiosktool/caption.png
index 0ce1c8d..0ce1c8d 100644
--- a/kiostdetool/caption.png
+++ b/kiosktool/caption.png
diff --git a/kiostdetool/component.cpp b/kiosktool/component.cpp
index 00b98bc..00b98bc 100644
--- a/kiostdetool/component.cpp
+++ b/kiosktool/component.cpp
diff --git a/kiostdetool/component.h b/kiosktool/component.h
index febcd81..febcd81 100644
--- a/kiostdetool/component.h
+++ b/kiosktool/component.h
diff --git a/kiostdetool/componentPage.cpp b/kiosktool/componentPage.cpp
index 915a3e3..860b126 100644
--- a/kiostdetool/componentPage.cpp
+++ b/kiosktool/componentPage.cpp
@@ -30,7 +30,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
diff --git a/kiostdetool/componentPage.h b/kiosktool/componentPage.h
index 8e0e716..8e0e716 100644
--- a/kiostdetool/componentPage.h
+++ b/kiosktool/componentPage.h
diff --git a/kiostdetool/componentPage_ui.ui b/kiosktool/componentPage_ui.ui
index c305237..c305237 100644
--- a/kiostdetool/componentPage_ui.ui
+++ b/kiosktool/componentPage_ui.ui
diff --git a/kiostdetool/componentSelectionPage.cpp b/kiosktool/componentSelectionPage.cpp
index 43ee39f..43ee39f 100644
--- a/kiostdetool/componentSelectionPage.cpp
+++ b/kiosktool/componentSelectionPage.cpp
diff --git a/kiostdetool/componentSelectionPage.h b/kiosktool/componentSelectionPage.h
index c9366de..c9366de 100644
--- a/kiostdetool/componentSelectionPage.h
+++ b/kiosktool/componentSelectionPage.h
diff --git a/kiostdetool/componentSelectionPage_ui.ui b/kiosktool/componentSelectionPage_ui.ui
index be874a4..be874a4 100644
--- a/kiostdetool/componentSelectionPage_ui.ui
+++ b/kiosktool/componentSelectionPage_ui.ui
diff --git a/kiostdetool/configure.in.in b/kiosktool/configure.in.in
index 84cf170..84cf170 100644
--- a/kiostdetool/configure.in.in
+++ b/kiosktool/configure.in.in
diff --git a/kiostdetool/cr16-app-kiostdetool.png b/kiosktool/cr16-app-kiosktool.png
index ccd2b43..ccd2b43 100644
--- a/kiostdetool/cr16-app-kiostdetool.png
+++ b/kiosktool/cr16-app-kiosktool.png
diff --git a/kiostdetool/cr32-app-kiostdetool.png b/kiosktool/cr32-app-kiosktool.png
index a987516..a987516 100644
--- a/kiostdetool/cr32-app-kiostdetool.png
+++ b/kiosktool/cr32-app-kiosktool.png
diff --git a/kiostdetool/cr48-app-kiostdetool.png b/kiosktool/cr48-app-kiosktool.png
index 87e18dd..87e18dd 100644
--- a/kiostdetool/cr48-app-kiostdetool.png
+++ b/kiosktool/cr48-app-kiosktool.png
diff --git a/kiostdetool/desktopComponent.cpp b/kiosktool/desktopComponent.cpp
index 5456687..5456687 100644
--- a/kiostdetool/desktopComponent.cpp
+++ b/kiosktool/desktopComponent.cpp
diff --git a/kiostdetool/desktopComponent.h b/kiosktool/desktopComponent.h
index 1b28c13..1b28c13 100644
--- a/kiostdetool/desktopComponent.h
+++ b/kiosktool/desktopComponent.h
diff --git a/kiostdetool/extractxml b/kiosktool/extractxml
index 629ab1d..629ab1d 100755
--- a/kiostdetool/extractxml
+++ b/kiosktool/extractxml
diff --git a/kiostdetool/filetypeeditComponent.cpp b/kiosktool/filetypeeditComponent.cpp
index ce9b815..ce9b815 100644
--- a/kiostdetool/filetypeeditComponent.cpp
+++ b/kiosktool/filetypeeditComponent.cpp
diff --git a/kiostdetool/filetypeeditComponent.h b/kiosktool/filetypeeditComponent.h
index 2113bbd..2113bbd 100644
--- a/kiostdetool/filetypeeditComponent.h
+++ b/kiosktool/filetypeeditComponent.h
diff --git a/kiostdetool/kcms/Makefile.am b/kiosktool/kcms/Makefile.am
index 335ab60..335ab60 100644
--- a/kiostdetool/kcms/Makefile.am
+++ b/kiosktool/kcms/Makefile.am
diff --git a/kiostdetool/kcms/autostart/Makefile.am b/kiosktool/kcms/autostart/Makefile.am
index 993941a..993941a 100644
--- a/kiostdetool/kcms/autostart/Makefile.am
+++ b/kiosktool/kcms/autostart/Makefile.am
diff --git a/kiostdetool/kcms/autostart/kcmautostart.cpp b/kiosktool/kcms/autostart/kcmautostart.cpp
index 77dbc6e..c0e6a62 100644
--- a/kiostdetool/kcms/autostart/kcmautostart.cpp
+++ b/kiosktool/kcms/autostart/kcmautostart.cpp
@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.
 #include <kdesktopfile.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
diff --git a/kiostdetool/kcms/autostart/kcmautostart.desktop b/kiosktool/kcms/autostart/kcmautostart.desktop
index 599da87..599da87 100644
--- a/kiostdetool/kcms/autostart/kcmautostart.desktop
+++ b/kiosktool/kcms/autostart/kcmautostart.desktop
diff --git a/kiostdetool/kcms/autostart/kcmautostart.h b/kiosktool/kcms/autostart/kcmautostart.h
index dcfe25a..dcfe25a 100644
--- a/kiostdetool/kcms/autostart/kcmautostart.h
+++ b/kiosktool/kcms/autostart/kcmautostart.h
diff --git a/kiostdetool/kioskConfigDialog.cpp b/kiosktool/kioskConfigDialog.cpp
index e624afe..e624afe 100644
--- a/kiostdetool/kioskConfigDialog.cpp
+++ b/kiosktool/kioskConfigDialog.cpp
diff --git a/kiostdetool/kioskConfigDialog.h b/kiosktool/kioskConfigDialog.h
index 7695f40..7695f40 100644
--- a/kiostdetool/kioskConfigDialog.h
+++ b/kiosktool/kioskConfigDialog.h
diff --git a/kiostdetool/kioskConfigDialog_ui.ui b/kiosktool/kioskConfigDialog_ui.ui
index 64d2753..64d2753 100644
--- a/kiostdetool/kioskConfigDialog_ui.ui
+++ b/kiosktool/kioskConfigDialog_ui.ui
diff --git a/kiostdetool/kiosk_data.xml b/kiosktool/kiosk_data.xml
index 92144b6..92144b6 100644
--- a/kiostdetool/kiosk_data.xml
+++ b/kiosktool/kiosk_data.xml
diff --git a/kiostdetool/kioskdata.cpp b/kiosktool/kioskdata.cpp
index a5d9f2b..f191260 100644
--- a/kiostdetool/kioskdata.cpp
+++ b/kiosktool/kioskdata.cpp
@@ -22,7 +22,7 @@
 #include <tqdom.h>
 #include <tqfile.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kiostdetool/kioskdata.h b/kiosktool/kioskdata.h
index 57b265e..57b265e 100644
--- a/kiostdetool/kioskdata.h
+++ b/kiosktool/kioskdata.h
diff --git a/kiostdetool/kioskgui.cpp b/kiosktool/kioskgui.cpp
index ee9afac..e4c279c 100644
--- a/kiostdetool/kioskgui.cpp
+++ b/kiosktool/kioskgui.cpp
@@ -25,7 +25,7 @@
 #include <tqpushbutton.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
@@ -36,7 +36,7 @@
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
diff --git a/kiostdetool/kioskgui.h b/kiosktool/kioskgui.h
index e196474..94b3356 100644
--- a/kiostdetool/kioskgui.h
+++ b/kiosktool/kioskgui.h
@@ -22,7 +22,7 @@
 #include <tqlistview.h>
 
 #include <tdeconfig.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class MainView;
 class ProfileSelectionPageUI;
diff --git a/kiostdetool/kioskrun.cpp b/kiosktool/kioskrun.cpp
index f5693ca..f5693ca 100644
--- a/kiostdetool/kioskrun.cpp
+++ b/kiosktool/kioskrun.cpp
diff --git a/kiostdetool/kioskrun.h b/kiosktool/kioskrun.h
index 54a25a2..54a25a2 100644
--- a/kiostdetool/kioskrun.h
+++ b/kiosktool/kioskrun.h
diff --git a/kiostdetool/kiosksync.cpp b/kiosktool/kiosksync.cpp
index 3f20044..3f20044 100644
--- a/kiostdetool/kiosksync.cpp
+++ b/kiosktool/kiosksync.cpp
diff --git a/kiostdetool/kiosksync.h b/kiosktool/kiosksync.h
index 9218f77..9218f77 100644
--- a/kiostdetool/kiosksync.h
+++ b/kiosktool/kiosksync.h
diff --git a/kiostdetool/kiostdetool-tdedirs.cpp b/kiosktool/kiosktool-tdedirs.cpp
index 7f8b1f7..7f8b1f7 100644
--- a/kiostdetool/kiostdetool-tdedirs.cpp
+++ b/kiosktool/kiosktool-tdedirs.cpp
diff --git a/kiostdetool/kiostdetool.desktop b/kiosktool/kiosktool.desktop
index 96faf29..96faf29 100644
--- a/kiostdetool/kiostdetool.desktop
+++ b/kiosktool/kiosktool.desktop
diff --git a/kiostdetool/kiostdetoolui.rc b/kiosktool/kiosktoolui.rc
index 7ab96c6..7ab96c6 100644
--- a/kiostdetool/kiostdetoolui.rc
+++ b/kiosktool/kiosktoolui.rc
diff --git a/kiostdetool/logo.png b/kiosktool/logo.png
index f3163c0..f3163c0 100644
--- a/kiostdetool/logo.png
+++ b/kiosktool/logo.png
diff --git a/kiostdetool/main.cpp b/kiosktool/main.cpp
index 716b894..716b894 100644
--- a/kiostdetool/main.cpp
+++ b/kiosktool/main.cpp
diff --git a/kiostdetool/mainview.ui b/kiosktool/mainview.ui
index 9cd33c8..9cd33c8 100644
--- a/kiostdetool/mainview.ui
+++ b/kiosktool/mainview.ui
diff --git a/kiostdetool/menueditComponent.cpp b/kiosktool/menueditComponent.cpp
index c087e91..c087e91 100644
--- a/kiostdetool/menueditComponent.cpp
+++ b/kiosktool/menueditComponent.cpp
diff --git a/kiostdetool/menueditComponent.h b/kiosktool/menueditComponent.h
index cea42a0..cea42a0 100644
--- a/kiostdetool/menueditComponent.h
+++ b/kiosktool/menueditComponent.h
diff --git a/kiostdetool/pageWidget.cpp b/kiosktool/pageWidget.cpp
index 05571c2..5573098 100644
--- a/kiostdetool/pageWidget.cpp
+++ b/kiosktool/pageWidget.cpp
@@ -20,7 +20,7 @@
 #include "pageWidget.h"
 
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "kioskdata.h"
 #include "kioskrun.h"
diff --git a/kiostdetool/pageWidget.h b/kiosktool/pageWidget.h
index cd64137..0d364df 100644
--- a/kiostdetool/pageWidget.h
+++ b/kiosktool/pageWidget.h
@@ -19,7 +19,7 @@
 #ifndef _PAGEWIDGET_H_
 #define _PAGEWIDGET_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class ComponentAction;
 class ComponentData;
diff --git a/kiostdetool/panelComponent.cpp b/kiosktool/panelComponent.cpp
index 9f0b984..9f0b984 100644
--- a/kiostdetool/panelComponent.cpp
+++ b/kiosktool/panelComponent.cpp
diff --git a/kiostdetool/panelComponent.h b/kiosktool/panelComponent.h
index 05fac1b..05fac1b 100644
--- a/kiostdetool/panelComponent.h
+++ b/kiosktool/panelComponent.h
diff --git a/kiostdetool/profilePropsPage.cpp b/kiosktool/profilePropsPage.cpp
index d90d131..d90d131 100644
--- a/kiostdetool/profilePropsPage.cpp
+++ b/kiosktool/profilePropsPage.cpp
diff --git a/kiostdetool/profilePropsPage.h b/kiosktool/profilePropsPage.h
index 446ae5d..446ae5d 100644
--- a/kiostdetool/profilePropsPage.h
+++ b/kiosktool/profilePropsPage.h
diff --git a/kiostdetool/profilePropsPage_ui.ui b/kiosktool/profilePropsPage_ui.ui
index 96043b2..96043b2 100644
--- a/kiostdetool/profilePropsPage_ui.ui
+++ b/kiosktool/profilePropsPage_ui.ui
diff --git a/kiostdetool/profileSelectionPage_ui.ui b/kiosktool/profileSelectionPage_ui.ui
index 5ba9974..5ba9974 100644
--- a/kiostdetool/profileSelectionPage_ui.ui
+++ b/kiosktool/profileSelectionPage_ui.ui
diff --git a/kiostdetool/screensaverComponent.cpp b/kiosktool/screensaverComponent.cpp
index 73a99c0..73a99c0 100644
--- a/kiostdetool/screensaverComponent.cpp
+++ b/kiosktool/screensaverComponent.cpp
diff --git a/kiostdetool/screensaverComponent.h b/kiosktool/screensaverComponent.h
index 5c507f8..5c507f8 100644
--- a/kiostdetool/screensaverComponent.h
+++ b/kiosktool/screensaverComponent.h
diff --git a/kiostdetool/userManagement.cpp b/kiosktool/userManagement.cpp
index 000e00e..e799639 100644
--- a/kiostdetool/userManagement.cpp
+++ b/kiosktool/userManagement.cpp
@@ -30,7 +30,7 @@
 
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kiostdetool/userManagement.h b/kiosktool/userManagement.h
index 309e764..309e764 100644
--- a/kiostdetool/userManagement.h
+++ b/kiosktool/userManagement.h
diff --git a/kiostdetool/userManagementGroup_ui.ui b/kiosktool/userManagementGroup_ui.ui
index 92879a9..92879a9 100644
--- a/kiostdetool/userManagementGroup_ui.ui
+++ b/kiosktool/userManagementGroup_ui.ui
diff --git a/kiostdetool/userManagementUser_ui.ui b/kiosktool/userManagementUser_ui.ui
index d7bd5e5..d7bd5e5 100644
--- a/kiostdetool/userManagementUser_ui.ui
+++ b/kiosktool/userManagementUser_ui.ui
diff --git a/kiostdetool/userManagement_ui.ui b/kiosktool/userManagement_ui.ui
index 3062e41..3062e41 100644
--- a/kiostdetool/userManagement_ui.ui
+++ b/kiosktool/userManagement_ui.ui
diff --git a/po/bg/kiostdetool.po b/po/bg/kiosktool.po
index 01fc9b3..01fc9b3 100644
--- a/po/bg/kiostdetool.po
+++ b/po/bg/kiosktool.po
diff --git a/po/br/kiostdetool.po b/po/br/kiosktool.po
index 0f64058..af75e82 100644
--- a/po/br/kiostdetool.po
+++ b/po/br/kiosktool.po
@@ -2,7 +2,7 @@
 # Thierry Vignaud <tvignaud@mandrakesoft.com>, 2004-2005
 msgid ""
 msgstr ""
-"Project-Id-Version: kdeextragear-3/tdeiosktool.po\n"
+"Project-Id-Version: kdeextragear-3/kiosktool.po\n"
 "POT-Creation-Date: 2005-01-22 01:28+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/po/ca/kiostdetool.po b/po/ca/kiosktool.po
index 58013cf..58013cf 100644
--- a/po/ca/kiostdetool.po
+++ b/po/ca/kiosktool.po
diff --git a/po/cs/kiostdetool.po b/po/cs/kiosktool.po
index 99c303a..99c303a 100644
--- a/po/cs/kiostdetool.po
+++ b/po/cs/kiosktool.po
diff --git a/po/cy/kiostdetool.po b/po/cy/kiosktool.po
index a78595d..245e4e4 100644
--- a/po/cy/kiostdetool.po
+++ b/po/cy/kiosktool.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//kdeextragear-3/tdeiosktool.po\n"
+"Project-Id-Version: ../cy/messages//kdeextragear-3/kiosktool.po\n"
 "POT-Creation-Date: 2005-01-22 01:28+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/po/da/kiostdetool.po b/po/da/kiosktool.po
index 548f2dc..548f2dc 100644
--- a/po/da/kiostdetool.po
+++ b/po/da/kiosktool.po
diff --git a/po/de/kiostdetool.po b/po/de/kiosktool.po
index e3cbfe4..e3cbfe4 100644
--- a/po/de/kiostdetool.po
+++ b/po/de/kiosktool.po
diff --git a/po/en_GB/kiostdetool.po b/po/en_GB/kiosktool.po
index 64b3304..64b3304 100644
--- a/po/en_GB/kiostdetool.po
+++ b/po/en_GB/kiosktool.po
diff --git a/po/es/kiostdetool.po b/po/es/kiosktool.po
index ab98e9c..ab98e9c 100644
--- a/po/es/kiostdetool.po
+++ b/po/es/kiosktool.po
diff --git a/po/et/kiostdetool.po b/po/et/kiosktool.po
index e9d369e..e9d369e 100644
--- a/po/et/kiostdetool.po
+++ b/po/et/kiosktool.po
diff --git a/po/fr/kiostdetool.po b/po/fr/kiosktool.po
index 3d8f0f1..3d8f0f1 100755
--- a/po/fr/kiostdetool.po
+++ b/po/fr/kiosktool.po
diff --git a/po/ga/kiostdetool.po b/po/ga/kiosktool.po
index 108ba7c..4944c82 100644
--- a/po/ga/kiostdetool.po
+++ b/po/ga/kiosktool.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: kdeextragear-3/tdeiosktool.po\n"
+"Project-Id-Version: kdeextragear-3/kiosktool.po\n"
 "POT-Creation-Date: 2005-01-22 01:28+0100\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
diff --git a/po/is/kiostdetool.po b/po/is/kiosktool.po
index 58013cf..58013cf 100644
--- a/po/is/kiostdetool.po
+++ b/po/is/kiosktool.po
diff --git a/po/it/kiostdetool.po b/po/it/kiosktool.po
index 3f24622..3f24622 100644
--- a/po/it/kiostdetool.po
+++ b/po/it/kiosktool.po
diff --git a/po/lt/kiostdetool.po b/po/lt/kiosktool.po
index 5ddec71..739e0e5 100644
--- a/po/lt/kiostdetool.po
+++ b/po/lt/kiosktool.po
@@ -537,7 +537,7 @@ msgstr ""
 "Bendra\n"
 "#-#-#-#-#  privacy.po (privacy)  #-#-#-#-#\n"
 "Bendras\n"
-"#-#-#-#-#  kfontinst.po (kfontinst)  #-#-#-#-#\n"
+"#-#-#-#-#  tdefontinst.po (tdefontinst)  #-#-#-#-#\n"
 "Pagrindinis\n"
 "#-#-#-#-#  keduca.po (keduca)  #-#-#-#-#\n"
 "Bendra\n"
diff --git a/po/mt/kiostdetool.po b/po/mt/kiosktool.po
index 592f2e4..592f2e4 100644
--- a/po/mt/kiostdetool.po
+++ b/po/mt/kiosktool.po
diff --git a/po/nl/kiostdetool.po b/po/nl/kiosktool.po
index 3fa6a09..3fa6a09 100644
--- a/po/nl/kiostdetool.po
+++ b/po/nl/kiosktool.po
diff --git a/po/pt/kiostdetool.po b/po/pt/kiosktool.po
index 4df2657..4df2657 100644
--- a/po/pt/kiostdetool.po
+++ b/po/pt/kiosktool.po
diff --git a/po/pt_BR/kiostdetool.po b/po/pt_BR/kiosktool.po
index 5ced85f..5ced85f 100644
--- a/po/pt_BR/kiostdetool.po
+++ b/po/pt_BR/kiosktool.po
diff --git a/po/ro/kiostdetool.po b/po/ro/kiosktool.po
index 06e5ce3..06e5ce3 100644
--- a/po/ro/kiostdetool.po
+++ b/po/ro/kiosktool.po
diff --git a/po/ru/kiostdetool.po b/po/ru/kiosktool.po
index ea488b0..ea488b0 100644
--- a/po/ru/kiostdetool.po
+++ b/po/ru/kiosktool.po
diff --git a/po/sr/kiostdetool.po b/po/sr/kiosktool.po
index 7d30457..7d30457 100644
--- a/po/sr/kiostdetool.po
+++ b/po/sr/kiosktool.po
diff --git a/po/sr@Latn/kiostdetool.po b/po/sr@Latn/kiosktool.po
index 9819a24..9819a24 100644
--- a/po/sr@Latn/kiostdetool.po
+++ b/po/sr@Latn/kiosktool.po
diff --git a/po/sv/kiostdetool.po b/po/sv/kiosktool.po
index 8a79861..8a79861 100644
--- a/po/sv/kiostdetool.po
+++ b/po/sv/kiosktool.po
diff --git a/po/ta/kiostdetool.po b/po/ta/kiosktool.po
index aec9ec7..aec9ec7 100644
--- a/po/ta/kiostdetool.po
+++ b/po/ta/kiosktool.po
diff --git a/po/tr/kiostdetool.po b/po/tr/kiosktool.po
index d131df6..d131df6 100755
--- a/po/tr/kiostdetool.po
+++ b/po/tr/kiosktool.po
diff --git a/po/xx/kiostdetool.po b/po/xx/kiosktool.po
index 58af7dd..58af7dd 100644
--- a/po/xx/kiostdetool.po
+++ b/po/xx/kiosktool.po