Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 3c66b171a6
commit 65f5e7cb4d

@ -1,4 +1,4 @@
Kiosktool: Kiostdetool:
* Make it possible to select targeted KDE version * Make it possible to select targeted KDE version
(e.g. in order to use KDE 3.4 only features) (e.g. in order to use KDE 3.4 only features)
* Add editor for URL (file) restrictions * Add editor for URL (file) restrictions

@ -1,3 +1,3 @@
./admin/configure.in.min ./admin/configure.in.min
configure.in.in configure.in.in
./tdeiosktool/configure.in.in ./kiosktool/configure.in.in

@ -68,7 +68,7 @@ dnl =======================================================
KDE_INIT_DOXYGEN([The API Reference], [Version $VERSION]) KDE_INIT_DOXYGEN([The API Reference], [Version $VERSION])
dnl ======================================================= dnl =======================================================
dnl FILE: ./tdeiosktool/configure.in.in dnl FILE: ./kiosktool/configure.in.in
dnl ======================================================= dnl =======================================================
AC_CHECK_SETENV AC_CHECK_SETENV
@ -81,7 +81,7 @@ AC_CONFIG_FILES([ Makefile ])
AC_CONFIG_FILES([ doc/Makefile ]) AC_CONFIG_FILES([ doc/Makefile ])
AC_CONFIG_FILES([ doc/da/Makefile ]) AC_CONFIG_FILES([ doc/da/Makefile ])
AC_CONFIG_FILES([ doc/it/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/nl/Makefile ])
AC_CONFIG_FILES([ doc/pt/Makefile ]) AC_CONFIG_FILES([ doc/pt/Makefile ])
AC_CONFIG_FILES([ doc/sv/Makefile ]) AC_CONFIG_FILES([ doc/sv/Makefile ])

@ -58,7 +58,7 @@
<abstract> <abstract>
<para <para
><ulink url="http://extragear.kde.org/apps/tdeiosktool.php" ><ulink url="http://extragear.kde.org/apps/kiosktool.php"
>&kiosktool;</ulink >&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> > 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> </abstract>

@ -72,7 +72,7 @@
<abstract> <abstract>
<para <para
><ulink url="http://extragear.kde.org/apps/tdeiosktool.php" ><ulink url="http://extragear.kde.org/apps/kiosktool.php"
>&kiosktool;</ulink >&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> > è 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> </abstract>

@ -42,7 +42,7 @@
<releaseinfo>1.0</releaseinfo> <releaseinfo>1.0</releaseinfo>
<abstract> <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 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 predefine desktop configurations for groups of users, lock down settings or otherwise
restrict features of the &kde; desktop environment.</para> restrict features of the &kde; desktop environment.</para>

@ -58,7 +58,7 @@
<abstract> <abstract>
<para <para
><ulink url="http://extragear.kde.org/apps/tdeiosktool.php" ><ulink url="http://extragear.kde.org/apps/kiosktool.php"
>&kiosktool;</ulink >&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> > 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> </abstract>

@ -72,7 +72,7 @@
<abstract> <abstract>
<para <para
>O <ulink url="http://extragear.kde.org/apps/tdeiosktool.php" >O <ulink url="http://extragear.kde.org/apps/kiosktool.php"
>&kiosktool;</ulink >&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> > é 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> </abstract>

@ -72,7 +72,7 @@
<abstract> <abstract>
<para <para
><ulink url="http://extragear.kde.org/apps/tdeiosktool.php" ><ulink url="http://extragear.kde.org/apps/kiosktool.php"
>&kiosktool;</ulink >&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> > ä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> </abstract>

@ -48,7 +48,7 @@ METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
./extractxml kiosk_data.xml > kiosk_data.cpp ./extractxml kiosk_data.xml > kiosk_data.cpp
$(XGETTEXT) *.cpp -o $(podir)/tdeiosktool.pot $(XGETTEXT) *.cpp -o $(podir)/kiosktool.pot
rm kiosk_data.cpp rm kiosk_data.cpp
KDE_ICON = kiosktool KDE_ICON = kiosktool
@ -56,7 +56,7 @@ KDE_ICON = kiosktool
xdg_apps_DATA = kiosktool.desktop xdg_apps_DATA = kiosktool.desktop
# this is where the XML-GUI resource file goes # 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 \ 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-da.png caption-empty.png caption-et.png caption-pt.png caption-pt_BR.png \
caption-sv.png caption-sv.png

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before

Width:  |  Height:  |  Size: 912 B

After

Width:  |  Height:  |  Size: 912 B

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

@ -30,7 +30,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <klistview.h> #include <tdelistview.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kprocess.h> #include <kprocess.h>

Before

Width:  |  Height:  |  Size: 528 B

After

Width:  |  Height:  |  Size: 528 B

Before

Width:  |  Height:  |  Size: 1021 B

After

Width:  |  Height:  |  Size: 1021 B

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.
#include <kdesktopfile.h> #include <kdesktopfile.h>
#include <kdialog.h> #include <kdialog.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <klistview.h> #include <tdelistview.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kservice.h> #include <kservice.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -22,7 +22,7 @@
#include <tqdom.h> #include <tqdom.h>
#include <tqfile.h> #include <tqfile.h>
#include <kaction.h> #include <tdeaction.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -25,7 +25,7 @@
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <kapplication.h> #include <kapplication.h>
#include <kaction.h> #include <tdeaction.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>
@ -36,7 +36,7 @@
#include <kmenubar.h> #include <kmenubar.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdaccel.h> #include <tdestdaccel.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurlrequester.h> #include <kurlrequester.h>

@ -22,7 +22,7 @@
#include <tqlistview.h> #include <tqlistview.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kmainwindow.h> #include <tdemainwindow.h>
class MainView; class MainView;
class ProfileSelectionPageUI; class ProfileSelectionPageUI;

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

@ -20,7 +20,7 @@
#include "pageWidget.h" #include "pageWidget.h"
#include <tdeconfig.h> #include <tdeconfig.h>
#include <klistview.h> #include <tdelistview.h>
#include "kioskdata.h" #include "kioskdata.h"
#include "kioskrun.h" #include "kioskrun.h"

@ -19,7 +19,7 @@
#ifndef _PAGEWIDGET_H_ #ifndef _PAGEWIDGET_H_
#define _PAGEWIDGET_H_ #define _PAGEWIDGET_H_
#include <klistview.h> #include <tdelistview.h>
class ComponentAction; class ComponentAction;
class ComponentData; class ComponentData;

@ -30,7 +30,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <klistview.h> #include <tdelistview.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -2,7 +2,7 @@
# Thierry Vignaud <tvignaud@mandrakesoft.com>, 2004-2005 # Thierry Vignaud <tvignaud@mandrakesoft.com>, 2004-2005
msgid "" msgid ""
msgstr "" 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" "POT-Creation-Date: 2005-01-22 01:28+0100\n"
"PO-Revision-Date: 2004-09-20 15:44+0200\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n" "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"

@ -1,6 +1,6 @@
msgid "" msgid ""
msgstr "" 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" "POT-Creation-Date: 2005-01-22 01:28+0100\n"
"PO-Revision-Date: 2004-09-20 15:44+0200\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n" "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"

@ -1,6 +1,6 @@
msgid "" msgid ""
msgstr "" 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" "POT-Creation-Date: 2005-01-22 01:28+0100\n"
"PO-Revision-Date: 2004-12-03 14:52-0500\n" "PO-Revision-Date: 2004-12-03 14:52-0500\n"
"Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n" "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"

@ -537,7 +537,7 @@ msgstr ""
"Bendra\n" "Bendra\n"
"#-#-#-#-# privacy.po (privacy) #-#-#-#-#\n" "#-#-#-#-# privacy.po (privacy) #-#-#-#-#\n"
"Bendras\n" "Bendras\n"
"#-#-#-#-# kfontinst.po (kfontinst) #-#-#-#-#\n" "#-#-#-#-# tdefontinst.po (tdefontinst) #-#-#-#-#\n"
"Pagrindinis\n" "Pagrindinis\n"
"#-#-#-#-# keduca.po (keduca) #-#-#-#-#\n" "#-#-#-#-# keduca.po (keduca) #-#-#-#-#\n"
"Bendra\n" "Bendra\n"
Loading…
Cancel
Save