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

pull/1/head
Timothy Pearson 12 years ago
parent a9ba12c66e
commit 29c3e44e68

@ -56,7 +56,7 @@
* Release of v0.3
* Fix grave problem of kiosktool terminating
tdeinit/klauncher of the main session. (BR80436)
tdeinit/tdelauncher of the main session. (BR80436)
2004-04-28 Waldo Bastian <bastian@kde.org>

@ -597,7 +597,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$kde32ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$kde33ornewer"; then
@ -1752,7 +1752,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la"
kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@ -2049,7 +2049,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2059,7 +2059,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])

8
aclocal.m4 vendored

@ -609,7 +609,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$kde32ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$kde33ornewer"; then
@ -1764,7 +1764,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la"
kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@ -2061,7 +2061,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2071,7 +2071,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])

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

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

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

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

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

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

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

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

@ -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

@ -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>

@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Exec=kcmshell kcmautostart
Exec=tdecmshell kcmautostart
Icon=autostart
Type=Application

@ -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>

@ -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>

@ -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>

@ -21,7 +21,7 @@
#include <tqlistview.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kmainwindow.h>
class MainView;

@ -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);

@ -19,7 +19,7 @@
#include "pageWidget.h"
#include <kconfig.h>
#include <tdeconfig.h>
#include <klistview.h>
#include "kioskdata.h"

@ -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>

@ -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>

@ -2,7 +2,7 @@
# Thierry Vignaud <tvignaud@mandrakesoft.com>, 2004-2005
msgid ""
msgstr ""
"Project-Id-Version: kdeextragear-3/kiosktool.po\n"
"Project-Id-Version: kdeextragear-3/tdeiosktool.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"

@ -1,6 +1,6 @@
msgid ""
msgstr ""
"Project-Id-Version: ../cy/messages//kdeextragear-3/kiosktool.po\n"
"Project-Id-Version: ../cy/messages//kdeextragear-3/tdeiosktool.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"

@ -1,6 +1,6 @@
msgid ""
msgstr ""
"Project-Id-Version: kdeextragear-3/kiosktool.po\n"
"Project-Id-Version: kdeextragear-3/tdeiosktool.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"

@ -96,7 +96,7 @@ msgstr ""
"Eugenijus Paulauskas\n"
"#-#-#-#-# kommander.po (kommander) #-#-#-#-#\n"
"Donatas Glodenis\n"
"#-#-#-#-# kfilereplace.po (kfilereplace) #-#-#-#-#\n"
"#-#-#-#-# tdefilereplace.po (tdefilereplace) #-#-#-#-#\n"
"Donatas Glodenis\n"
"#-#-#-#-# kcoloredit.po (kcoloredit) #-#-#-#-#\n"
"Eugenijus Paulauskas\n"
@ -126,7 +126,7 @@ msgstr ""
"Donatas Glodenis\n"
"#-#-#-#-# kio_help.po (kio_help) #-#-#-#-#\n"
"Ričardas Čepas, Donatas Glodenis\n"
"#-#-#-#-# kioexec.po (kioexec) #-#-#-#-#\n"
"#-#-#-#-# tdeioexec.po (tdeioexec) #-#-#-#-#\n"
"Ričardas Čepas\n"
"#-#-#-#-# kmcop.po (PACKAGE VERSION) #-#-#-#-#\n"
"Ričardas Čepas\n"
@ -313,7 +313,7 @@ msgstr ""
"eugenijus@agvila.lt\n"
"#-#-#-#-# kommander.po (kommander) #-#-#-#-#\n"
"ziogelis77@takas.lt\n"
"#-#-#-#-# kfilereplace.po (kfilereplace) #-#-#-#-#\n"
"#-#-#-#-# tdefilereplace.po (tdefilereplace) #-#-#-#-#\n"
"ziogelis77@takas.lt\n"
"#-#-#-#-# kcoloredit.po (kcoloredit) #-#-#-#-#\n"
"eugenijus@agvila.lt\n"
@ -343,7 +343,7 @@ msgstr ""
"ziogelis77@takas.lt\n"
"#-#-#-#-# kio_help.po (kio_help) #-#-#-#-#\n"
"rch@richard.eu.org ziogelis77@takas.lt\n"
"#-#-#-#-# kioexec.po (kioexec) #-#-#-#-#\n"
"#-#-#-#-# tdeioexec.po (tdeioexec) #-#-#-#-#\n"
"rch@richard.eu.org\n"
"#-#-#-#-# kmcop.po (PACKAGE VERSION) #-#-#-#-#\n"
"rch@richard.eu.org\n"
@ -507,9 +507,9 @@ msgstr ""
#, fuzzy
msgid "General"
msgstr ""
"#-#-#-#-# kfile_deb.po (PACKAGE VERSION) #-#-#-#-#\n"
"#-#-#-#-# tdefile_deb.po (PACKAGE VERSION) #-#-#-#-#\n"
"Pagrindai\n"
"#-#-#-#-# kfile_rpm.po (PACKAGE VERSION) #-#-#-#-#\n"
"#-#-#-#-# tdefile_rpm.po (PACKAGE VERSION) #-#-#-#-#\n"
"Pagrindai\n"
"#-#-#-#-# kuser.po (kuser) #-#-#-#-#\n"
"Bendrieji\n"
@ -529,7 +529,7 @@ msgstr ""
"Bendra\n"
"#-#-#-#-# kcmsmserver.po (kcmsmserver) #-#-#-#-#\n"
"Bendra\n"
"#-#-#-#-# kfile_font.po (kfile_font) #-#-#-#-#\n"
"#-#-#-#-# tdefile_font.po (tdefile_font) #-#-#-#-#\n"
"Bendra\n"
"#-#-#-#-# khotkeys.po (khotkeys) #-#-#-#-#\n"
"Bendri\n"
@ -541,11 +541,11 @@ msgstr ""
"Pagrindinis\n"
"#-#-#-#-# keduca.po (keduca) #-#-#-#-#\n"
"Bendra\n"
"#-#-#-#-# kfilereplace.po (kfilereplace) #-#-#-#-#\n"
"#-#-#-#-# tdefilereplace.po (tdefilereplace) #-#-#-#-#\n"
"Bendra\n"
"#-#-#-#-# kfile_pdf.po (kfile_pdf) #-#-#-#-#\n"
"#-#-#-#-# tdefile_pdf.po (tdefile_pdf) #-#-#-#-#\n"
"Bendra\n"
"#-#-#-#-# kfile_ps.po (kfile_ps) #-#-#-#-#\n"
"#-#-#-#-# tdefile_ps.po (tdefile_ps) #-#-#-#-#\n"
"Bendra\n"
"#-#-#-#-# kghostview.po (kghostview) #-#-#-#-#\n"
"Bendra\n"
@ -561,7 +561,7 @@ msgstr ""
"Bendra\n"
"#-#-#-#-# ksirc.po (ksirc) #-#-#-#-#\n"
"Bendra\n"
"#-#-#-#-# kfileshare.po (kfileshare) #-#-#-#-#\n"
"#-#-#-#-# tdefileshare.po (tdefileshare) #-#-#-#-#\n"
"Bendra\n"
"#-#-#-#-# kaddressbook.po (kaddressbook) #-#-#-#-#\n"
"Bendra\n"
@ -1631,13 +1631,13 @@ msgstr ""
"Aprašymas\n"
"#-#-#-#-# keduca.po (keduca) #-#-#-#-#\n"
"Aprašymas\n"
"#-#-#-#-# kfile_png.po (kfile_png) #-#-#-#-#\n"
"#-#-#-#-# tdefile_png.po (tdefile_png) #-#-#-#-#\n"
"Aprašymas\n"
"#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"Aprašymas:\n"
"#-#-#-#-# kio.po (kio) #-#-#-#-#\n"
"Aprašymas:\n"
"#-#-#-#-# kfile_ogg.po (kfile_ogg) #-#-#-#-#\n"
"#-#-#-#-# tdefile_ogg.po (tdefile_ogg) #-#-#-#-#\n"
"Aprašymas\n"
"#-#-#-#-# noatun.po (noatun) #-#-#-#-#\n"
"Aprašymas\n"
@ -1743,7 +1743,7 @@ msgstr ""
#, fuzzy, no-c-format
msgid "Group"
msgstr ""
"#-#-#-#-# kfile_rpm.po (PACKAGE VERSION) #-#-#-#-#\n"
"#-#-#-#-# tdefile_rpm.po (PACKAGE VERSION) #-#-#-#-#\n"
"Grupe\n"
"#-#-#-#-# kasbarextension.po (kasbarextension) #-#-#-#-#\n"
"Grupė\n"
@ -1757,7 +1757,7 @@ msgstr ""
"Grupė\n"
"#-#-#-#-# kit.po (kit) #-#-#-#-#\n"
"Grupė\n"
"#-#-#-#-# kfileshare.po (kfileshare) #-#-#-#-#\n"
"#-#-#-#-# tdefileshare.po (tdefileshare) #-#-#-#-#\n"
"Grupė"
#. i18n: file userManagement_ui.ui line 120
@ -1824,7 +1824,7 @@ msgstr ""
#, fuzzy
msgid "&Replace"
msgstr ""
"#-#-#-#-# kfilereplace.po (kfilereplace) #-#-#-#-#\n"
"#-#-#-#-# tdefilereplace.po (tdefilereplace) #-#-#-#-#\n"
"Pa&keisti\n"
"#-#-#-#-# katepart.po (katepart) #-#-#-#-#\n"
"&Pakeisti\n"

Loading…
Cancel
Save