From 338a4464b548ff0e80bbe1c30594af2f0518086f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 28 Jul 2013 03:01:18 +0200 Subject: [PATCH] Initial TDE conversion --- ChangeLog | 8 +- Setup | 12 +- acinclude.m4 | 266 +++++++++++----------- configure.in | 14 +- configure.in.in | 10 +- extras/hibernate.desktop | 6 +- extras/multimedia/juk.desktop | 4 +- extras/multimedia/kaffeine.desktop | 4 +- extras/multimedia/kdetv.desktop | 6 +- extras/multimedia/kscd.desktop | 4 +- extras/multimedia/noatun.desktop | 4 +- extras/shutdown/cancelshutdown.desktop | 4 +- extras/shutdown/fsck.desktop | 4 +- extras/system/adsl-stop.desktop | 4 +- extras/system/kdeeject.desktop | 4 +- extras/system/kppp.desktop | 4 +- kshutdown-mdk.spec | 4 +- kshutdown-suse.spec | 6 +- kshutdown.kdevelop | 8 +- kshutdown.spec | 6 +- kshutdown/Makefile.am | 6 +- kshutdown/actions.cpp | 20 +- kshutdown/actions.h | 6 +- kshutdown/appobserver.cpp | 4 +- kshutdown/configuration.h | 4 +- kshutdown/confirmation.cpp | 6 +- kshutdown/extras.cpp | 20 +- kshutdown/extras.h | 6 +- kshutdown/kshutdown.desktop | 16 +- kshutdown/links.cpp | 10 +- kshutdown/mactioneditdialog.cpp | 12 +- kshutdown/main.cpp | 34 +-- kshutdown/miscutils.cpp | 24 +- kshutdown/miscutils.h | 8 +- kshutdown/mmainwindow.cpp | 70 +++--- kshutdown/mmainwindow.h | 28 +-- kshutdown/mmessagedialog.cpp | 6 +- kshutdown/msettingsdialog.cpp | 42 ++-- kshutdown/msettingsdialog.h | 16 +- kshutdown/mstatstab.cpp | 4 +- kshutdown/msystemtray.cpp | 16 +- kshutdown/mtip.cpp | 2 +- kshutdown/progressbar.cpp | 8 +- kshutdown/systemconfig.cpp | 20 +- kshutdown/systemconfig.h | 12 +- kshutdownlockout/Makefile.am | 2 +- kshutdownlockout/kshutdownlockout.desktop | 4 +- kshutdownlockout/lockout.cpp | 46 ++-- kshutdownlockout/lockout.h | 4 +- po/ar.po | 14 +- po/bg.po | 14 +- po/cs.po | 14 +- po/de.po | 14 +- po/el.po | 12 +- po/es.po | 12 +- po/fr.po | 8 +- po/hu.po | 10 +- po/it.po | 12 +- po/nl.po | 12 +- po/pl.po | 12 +- po/pt_BR.po | 12 +- po/ru.po | 8 +- po/sk.po | 12 +- po/sv.po | 12 +- po/tr.po | 14 +- po/zh_CN.po | 12 +- 66 files changed, 521 insertions(+), 521 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4009e5e..0d8cb77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,7 +107,7 @@ - Removed the Authors tab from the About dialog - Setup: Fast compilation is now enabled by default (--enable-final) - Updated documentation -- Setup: "kdesu" instead of "su" (works on both Fedora and Kubuntu) +- Setup: "tdesu" instead of "su" (works on both Fedora and Kubuntu) 2005/10/18 0.7.1 Beta - NEW: Ability to execute a specified action when selected application exit @@ -119,13 +119,13 @@ - Updated Handbook - Removed obsolete FAQ - Removed "locolor" icon -- RPM .spec: Removed "kdebase" dependency +- RPM .spec: Removed "tdebase" dependency - Removed deprecated Wizard and Scheduler functions -- NEW: "Shut Down" and "Reboot" commands are now disabled if KDM is not running. +- NEW: "Shut Down" and "Reboot" commands are now disabled if TDM is not running. To enable these commands go to "Settings" -> "Configure KShutDown" -> "Actions", and set methods to "/sbin/...", "poweroff" or "reboot". - NEW: Balloon popup messages based on the "kdialog" program -- QListView* -> KListView* +- QListView* -> TDEListView* - Improved and fixed KDE Kiosk support - FIXED: System tray icon hidding option - FIXED: Confirmation message box position diff --git a/Setup b/Setup index e6a2ef1..1f03dd5 100755 --- a/Setup +++ b/Setup @@ -13,7 +13,7 @@ META_VERSION="`cat VERSION`" #fi # installation dirs -DEFAULT_DIR=`kde-config --prefix` +DEFAULT_DIR=`tde-config --prefix` if [ -z "$DEFAULT_DIR" ]; then DEFAULT_DIR="/usr" fi @@ -47,7 +47,7 @@ I18N_COMP_FAILED="Compilation failed!" I18N_CONF_FAILED="Configuration failed!" I18N_COMP_START="Compiling..." I18N_MINU=" This may take a few minutes." -I18N_MISSING_DEPEN1="Make sure you have installed the 'kdelibs-devel' package" +I18N_MISSING_DEPEN1="Make sure you have installed the 'tdelibs-devel' package" I18N_MISSING_DEPEN2=" which is required to compile any KDE application." I18N_ENTER_DIR="Enter a new prefix" I18N_SETUP="Setup" @@ -73,7 +73,7 @@ if [[ ("$LANG" == "pl_PL.UTF-8") || ("$LANG" == "pl_PL") || ("$LANG" == "pl") ]] I18N_CONF_FAILED="Konfiguracja nie powiodla sie!" I18N_COMP_START="Kompilowanie..." I18N_MINU=" To moze potrwac kilka minut." - I18N_MISSING_DEPEN1="Upewnij sie, ze masz zainstalowana paczke 'kdelibs-devel'," + I18N_MISSING_DEPEN1="Upewnij sie, ze masz zainstalowana paczke 'tdelibs-devel'," I18N_MISSING_DEPEN2=" ktora jest wymagana do kompilacji jakiejkolwiek aplikacji KDE." I18N_ENTER_DIR="Wprowadz nowy prefix" I18N_SETUP="Instalator" @@ -100,7 +100,7 @@ if [[ ("$LANG" == "it_IT.UTF-8") || ("$LANG" == "it_IT") || ("$LANG" == "it") ]] I18N_CONF_FAILED="Configurazione fallita!" I18N_COMP_START="Compilazione..." I18N_MINU=" Per questo potrebbero volerci alcuni minuti." - I18N_MISSING_DEPEN1="Assicurati di aver installato il pacchetto 'kdelibs-devel'" + I18N_MISSING_DEPEN1="Assicurati di aver installato il pacchetto 'tdelibs-devel'" I18N_MISSING_DEPEN2=" che è necessario per compilare ogni applicazione KDE." I18N_ENTER_DIR="Inserisci una nuova destinazione" I18N_SETUP="Installazione" @@ -157,7 +157,7 @@ ks_show_menu() echo echo echo -e " ${KEY_C}${I18N_TITLE_SETUP}${DEF_C}" - echo -e " [${KEY_C}i${DEF_C}] $I18N_INSTALL (./configure --prefix=${INSTALL_DIR}, make, kdesu -c \"make install\")" + echo -e " [${KEY_C}i${DEF_C}] $I18N_INSTALL (./configure --prefix=${INSTALL_DIR}, make, tdesu -c \"make install\")" echo -e " [${KEY_C}p${DEF_C}] $I18N_CHANGE_DIR" if [ -n "$FAST_COMPILATION" ]; then echo -e " [${KEY_C}f${DEF_C}] $I18N_DISABLE_FAST"; @@ -207,7 +207,7 @@ while [ 1 ]; do ks_kill "$I18N_INST_FAILED" fi else - if kdesu -c "make install"; then + if tdesu -c "make install"; then ks_show_finish_info ks_quit else diff --git a/acinclude.m4 b/acinclude.m4 index ca6efb6..857a5e0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS], fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -602,18 +602,18 @@ 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 - KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) + KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)]) AC_SUBST(MAKEKDEWIDGETS) fi KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1785,16 +1785,16 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + 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 -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext < int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); @@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-lkimproxy") + AC_SUBST(LIB_KABC, "-ltdeabc") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-lkdnssd") - AC_SUBST(LIB_KUNITTEST, "-lkunittest") + AC_SUBST(LIB_KDNSSD, "-ltdednssd") + AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-lkio") - AC_SUBST(LIB_KFILE, "-lkio") + AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_KFILE, "-ltdeio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + AC_SUBST(LIB_KIO, "-ltdeio") + 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, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") - AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + 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, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then @@ -3447,7 +3447,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" AC_SUBST(KDE_PLUGIN) -# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. +# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs. KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" AC_SUBST(KDE_CHECK_PLUGIN) @@ -3457,29 +3457,29 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config AC_DEFUN([KDE_CHECK_LIB64], [ - kdelibsuff="$kde_libs_suffix" - if test -z "$kdelibsuff"; then - kdelibsuff=no + tdelibsuff="$kde_libs_suffix" + if test -z "$tdelibsuff"; then + tdelibsuff=no fi AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none[=default])]), - kdelibsuff=$enableval) + tdelibsuff=$enableval) # TODO: add an auto case that compiles a little C app to check # where the glibc is - if test "$kdelibsuff" = "no"; then - kdelibsuff= + if test "$tdelibsuff" = "no"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3497,7 +3497,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4504,7 +4504,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4892,14 +4892,14 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. -dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde +dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -4923,25 +4923,25 @@ AC_DEFUN([KDE_SET_PREFIX], unset CDPATH dnl We can't give real code to that macro, only a value. dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) + AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -4950,7 +4950,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix @@ -5607,7 +5607,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5627,7 +5627,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5864,9 +5864,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES($1,$2,$3,$4) diff --git a/configure.in b/configure.in index cc63495..be1a14a 100644 --- a/configure.in +++ b/configure.in @@ -67,12 +67,12 @@ dnl ======================================================= dnl PACKAGE set before -dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__ -dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__ -dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__ +dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__ +dnl CFLAGS="$NOOPT_CFLAGS" dnl __tdevelop[noopt]__ +dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __tdevelop[exc]__ -dnl KDE_NEED_FLEX dnl __kdevelop__ -dnl AC_PROG_YACC dnl __kdevelop__ +dnl KDE_NEED_FLEX dnl __tdevelop__ +dnl AC_PROG_YACC dnl __tdevelop__ KDE_CREATE_SUBDIRSLIST AC_CONFIG_FILES([ Makefile ]) AC_CONFIG_FILES([ doc/Makefile ]) @@ -94,13 +94,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/configure.in.in b/configure.in.in index 197c972..81d5d5c 100644 --- a/configure.in.in +++ b/configure.in.in @@ -2,9 +2,9 @@ AM_INIT_AUTOMAKE(kshutdown,1.0.4) -dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__ -dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__ -dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__ +dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__ +dnl CFLAGS="$NOOPT_CFLAGS" dnl __tdevelop[noopt]__ +dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __tdevelop[exc]__ -dnl KDE_NEED_FLEX dnl __kdevelop__ -dnl AC_PROG_YACC dnl __kdevelop__ +dnl KDE_NEED_FLEX dnl __tdevelop__ +dnl AC_PROG_YACC dnl __tdevelop__ diff --git a/extras/hibernate.desktop b/extras/hibernate.desktop index e83a52e..8a2b6f3 100644 --- a/extras/hibernate.desktop +++ b/extras/hibernate.desktop @@ -12,6 +12,6 @@ StartupNotify=true Terminal=false Type=Application X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= -X-Ubuntu-Gettext-Domain=desktop_kdebase +X-TDE-SubstituteUID=false +X-TDE-Username= +X-Ubuntu-Gettext-Domain=desktop_tdebase diff --git a/extras/multimedia/juk.desktop b/extras/multimedia/juk.desktop index 40d2ae9..0e7f35a 100644 --- a/extras/multimedia/juk.desktop +++ b/extras/multimedia/juk.desktop @@ -15,5 +15,5 @@ StartupNotify=true Terminal=false Type=Application X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= +X-TDE-SubstituteUID=false +X-TDE-Username= diff --git a/extras/multimedia/kaffeine.desktop b/extras/multimedia/kaffeine.desktop index fa2ec58..f659895 100644 --- a/extras/multimedia/kaffeine.desktop +++ b/extras/multimedia/kaffeine.desktop @@ -16,5 +16,5 @@ StartupNotify=true Terminal=false Type=Application X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= +X-TDE-SubstituteUID=false +X-TDE-Username= diff --git a/extras/multimedia/kdetv.desktop b/extras/multimedia/kdetv.desktop index 7289364..de610f6 100644 --- a/extras/multimedia/kdetv.desktop +++ b/extras/multimedia/kdetv.desktop @@ -14,6 +14,6 @@ StartupNotify=true Terminal=false Type=Application X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= -X-Ubuntu-Gettext-Domain=desktop_kdebase +X-TDE-SubstituteUID=false +X-TDE-Username= +X-Ubuntu-Gettext-Domain=desktop_tdebase diff --git a/extras/multimedia/kscd.desktop b/extras/multimedia/kscd.desktop index 82c2feb..968b40a 100644 --- a/extras/multimedia/kscd.desktop +++ b/extras/multimedia/kscd.desktop @@ -16,5 +16,5 @@ StartupNotify=true Terminal=false Type=Application X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= +X-TDE-SubstituteUID=false +X-TDE-Username= diff --git a/extras/multimedia/noatun.desktop b/extras/multimedia/noatun.desktop index de47d9c..bffcddf 100644 --- a/extras/multimedia/noatun.desktop +++ b/extras/multimedia/noatun.desktop @@ -14,5 +14,5 @@ StartupNotify=true Terminal=false Type=Application X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= +X-TDE-SubstituteUID=false +X-TDE-Username= diff --git a/extras/shutdown/cancelshutdown.desktop b/extras/shutdown/cancelshutdown.desktop index d631b40..b2e5fa4 100644 --- a/extras/shutdown/cancelshutdown.desktop +++ b/extras/shutdown/cancelshutdown.desktop @@ -15,5 +15,5 @@ StartupNotify=true Terminal=false Type=Application X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= +X-TDE-SubstituteUID=false +X-TDE-Username= diff --git a/extras/shutdown/fsck.desktop b/extras/shutdown/fsck.desktop index 10e455b..7d2075a 100644 --- a/extras/shutdown/fsck.desktop +++ b/extras/shutdown/fsck.desktop @@ -15,5 +15,5 @@ StartupNotify=true Terminal=false Type=Application X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= +X-TDE-SubstituteUID=false +X-TDE-Username= diff --git a/extras/system/adsl-stop.desktop b/extras/system/adsl-stop.desktop index b1dd271..152195c 100644 --- a/extras/system/adsl-stop.desktop +++ b/extras/system/adsl-stop.desktop @@ -16,5 +16,5 @@ Terminal=true TerminalOptions=\s--noclose Type=Application X-DCOP-ServiceType=none -X-KDE-SubstituteUID=false -X-KDE-Username= +X-TDE-SubstituteUID=false +X-TDE-Username= diff --git a/extras/system/kdeeject.desktop b/extras/system/kdeeject.desktop index b20a72b..8f3cbe2 100644 --- a/extras/system/kdeeject.desktop +++ b/extras/system/kdeeject.desktop @@ -15,5 +15,5 @@ StartupNotify=true Terminal=false Type=Application X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= +X-TDE-SubstituteUID=false +X-TDE-Username= diff --git a/extras/system/kppp.desktop b/extras/system/kppp.desktop index dd9cefe..00cbf3d 100644 --- a/extras/system/kppp.desktop +++ b/extras/system/kppp.desktop @@ -15,5 +15,5 @@ StartupNotify=true Terminal=false Type=Application X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= +X-TDE-SubstituteUID=false +X-TDE-Username= diff --git a/kshutdown-mdk.spec b/kshutdown-mdk.spec index 5d0c515..2929d1b 100644 --- a/kshutdown-mdk.spec +++ b/kshutdown-mdk.spec @@ -11,7 +11,7 @@ Distribution: mdk Prefix: /usr Url: http://kshutdown.sourceforge.net Provides: kshutdown -Requires: kdelibs >= 3.3.0 +Requires: tdelibs >= 3.3.0 %description KShutDown is an advanced shut down utility for KDE. @@ -80,7 +80,7 @@ rm -rf $RPM_BUILD_DIR/file.list.%{name}.dirs - updated description * Mon Aug 1 2005 Konrad Twardowski -- removed "kdebase" from "Requires" +- removed "tdebase" from "Requires" * Sat Jun 19 2004 Zdenko Podobný 0.1.8-1mdk - initial version diff --git a/kshutdown-suse.spec b/kshutdown-suse.spec index e5439f5..69280d6 100644 --- a/kshutdown-suse.spec +++ b/kshutdown-suse.spec @@ -9,8 +9,8 @@ Group: System/Management URL: http://kshutdown.sf.net/ Source0: http://mesh.dl.sourceforge.net/sourceforge/kshutdown/kshutdown-%{version}.tar.bz2 BuildRoot: %{_tmppath}/kshutdown-%{version}-%{release}-root -Requires: kdelibs3 >= 3.3.0 -BuildRequires: kdelibs3-devel kdebase3-devel +Requires: tdelibs3 >= 3.3.0 +BuildRequires: tdelibs3-devel tdebase3-devel BuildRequires: gcc-c++ libstdc++ libstdc++-devel BuildRequires: autoconf automake libtool @@ -88,7 +88,7 @@ rm -fr ../file.list.kshutdown - updated description * Mon Aug 1 2005 Konrad Twardowski -- removed "kdebase" from "Requires" +- removed "tdebase" from "Requires" * Mon Apr 4 2005 Konrad Twardowski - Test RPM diff --git a/kshutdown.kdevelop b/kshutdown.kdevelop index f5888db..27e4201 100644 --- a/kshutdown.kdevelop +++ b/kshutdown.kdevelop @@ -1,5 +1,5 @@ - - + + Konrad Twardowski kdtonline@poczta.onet.pl @@ -74,7 +74,7 @@ - --prefix=`kde-config --prefix` --enable-debug=full + --prefix=`tde-config --prefix` --enable-debug=full @@ -318,4 +318,4 @@ -f0 -1 - + diff --git a/kshutdown.spec b/kshutdown.spec index 51d47b8..1815369 100644 --- a/kshutdown.spec +++ b/kshutdown.spec @@ -8,8 +8,8 @@ URL: http://kshutdown.sf.net/ Packager: Konrad Twardowski Source0: kshutdown-%version.tar.bz2 Buildroot: %_tmppath/kshutdown-%version-%release-root -Requires: kdelibs >= 3.3.0 -BuildRequires: kdelibs-devel +Requires: tdelibs >= 3.3.0 +BuildRequires: tdelibs-devel %description KShutDown is an advanced shut down utility for KDE. @@ -59,7 +59,7 @@ rm -fr ../file.list.kshutdown - updated description * Mon Aug 1 2005 Konrad Twardowski -- removed "kdebase" from "Requires" +- removed "tdebase" from "Requires" * Mon Apr 4 2005 Konrad Twardowski - Test RPM diff --git a/kshutdown/Makefile.am b/kshutdown/Makefile.am index d8b8d91..887b70a 100644 --- a/kshutdown/Makefile.am +++ b/kshutdown/Makefile.am @@ -20,7 +20,7 @@ kshutdown_SOURCES = \ progressbar.cpp \ systemconfig.cpp -kshutdown_LDADD = $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIB_KIO) $(LIB_QT) -lDCOP -lkdefx +kshutdown_LDADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIB_KIO) $(LIB_QT) -lDCOP -ltdefx kshutdown_LDFLAGS = $(all_libraries) $(KDE_RPATH) EXTRA_DIST = \ @@ -31,8 +31,8 @@ EXTRA_DIST = \ appdir = $(prefix)/share/applications app_DATA = kshutdown.desktop -kconfdir = $(kde_datadir)/kconf_update -kconf_DATA = kshutdown.upd +tdeconfdir = $(kde_datadir)/tdeconf_update +tdeconf_DATA = kshutdown.upd INCLUDES = $(all_includes) METASOURCES = AUTO diff --git a/kshutdown/actions.cpp b/kshutdown/actions.cpp index 1a987a2..206acd9 100644 --- a/kshutdown/actions.cpp +++ b/kshutdown/actions.cpp @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include Action *Action::_instance = 0; @@ -56,7 +56,7 @@ TQString Action::actionToConfigGroup(const Type action) const // TODO: 2.0: GDM support // TODO: 2.0: force application exit (without asking for data save) -bool Action::endSession(const KApplication::ShutdownType type, const Type action) +bool Action::endSession(const TDEApplication::ShutdownType type, const Type action) { _totalExit = false; @@ -73,9 +73,9 @@ bool Action::endSession(const KApplication::ShutdownType type, const Type action _totalExit = true; if ( !kapp->requestShutDown( - KApplication::ShutdownConfirmNo, + TDEApplication::ShutdownConfirmNo, type, - KApplication::ShutdownModeForceNow + TDEApplication::ShutdownModeForceNow ) ) { @@ -123,7 +123,7 @@ bool Action::exec(const Type action, const bool stopTimer) MiscUtils::runCommandBeforeAction("Shut Down"); if (method == Method_KDE) - return endSession(KApplication::ShutdownTypeHalt, action); + return endSession(TDEApplication::ShutdownTypeHalt, action); break; @@ -135,7 +135,7 @@ bool Action::exec(const Type action, const bool stopTimer) MiscUtils::runCommandBeforeAction("Reboot"); if (method == Method_KDE) - return endSession(KApplication::ShutdownTypeReboot, action); + return endSession(TDEApplication::ShutdownTypeReboot, action); break; @@ -150,7 +150,7 @@ bool Action::exec(const Type action, const bool stopTimer) MiscUtils::runCommandBeforeAction("Logout"); if (method == Method_KDE) - return endSession(KApplication::ShutdownTypeNone, action); + return endSession(TDEApplication::ShutdownTypeNone, action); break; @@ -268,7 +268,7 @@ TQString Action::getMethod(const Action::Type action, Method &method, TQString & defaultCommand = TQString::null; } - KConfig *conf = kshutdownrc->config(); + TDEConfig *conf = kshutdownrc->config(); if (!conf->hasGroup(group)) { method = Method_KDE; @@ -305,7 +305,7 @@ TQString Action::getMethod(const Action::Type action, Method &method, TQString & void Action::setMethod(const TQString &group, const Method method, const TQString &command) const { - KConfig *conf = kshutdownrc->config(); + TDEConfig *conf = kshutdownrc->config(); conf->setGroup(group); if (method == Method_UserCommand) conf->writeEntry("Command", command); diff --git a/kshutdown/actions.h b/kshutdown/actions.h index 55cf717..012f9a5 100644 --- a/kshutdown/actions.h +++ b/kshutdown/actions.h @@ -20,7 +20,7 @@ #ifndef __ACTIONS_H__ #define __ACTIONS_H__ -#include +#include // default external commands const TQString @@ -44,7 +44,7 @@ public: * Methods. Don't change these values! */ enum Method { - Method_KDE = 0, /**< Standard KDE/KDM method. (default) */ + Method_KDE = 0, /**< Standard KDE/TDM method. (default) */ Method_DefaultCommand = 1, /**< Default external command. (e.g. /sbin/reboot) */ Method_UserCommand = 2 /**< User command. Any command that can be executed by @c KRun::run. */ }; @@ -94,7 +94,7 @@ public: * @param action An action to execute * @return @c true if successful; otherwise @c false */ - bool endSession(const KApplication::ShutdownType type, const Type action); + bool endSession(const TDEApplication::ShutdownType type, const Type action); /** * Executes an action. diff --git a/kshutdown/appobserver.cpp b/kshutdown/appobserver.cpp index b83c0bd..6977d97 100644 --- a/kshutdown/appobserver.cpp +++ b/kshutdown/appobserver.cpp @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include #include // TODO: 2.0: bigger combo box list diff --git a/kshutdown/configuration.h b/kshutdown/configuration.h index dd84803..7c0f9fc 100644 --- a/kshutdown/configuration.h +++ b/kshutdown/configuration.h @@ -20,7 +20,7 @@ #ifndef __CONFIGURATION_H__ #define __CONFIGURATION_H__ -#include +#include #define kshutdownrc Config::getInstance()->getInstance() @@ -31,7 +31,7 @@ * @short A configuration reader/writer. * Use the @c kshutdownrc macro to access these members. */ -class Config: public KConfigSkeleton +class Config: public TDEConfigSkeleton { public: // automation diff --git a/kshutdown/confirmation.cpp b/kshutdown/confirmation.cpp index 1084cbb..18bf849 100644 --- a/kshutdown/confirmation.cpp +++ b/kshutdown/confirmation.cpp @@ -25,9 +25,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include // public diff --git a/kshutdown/extras.cpp b/kshutdown/extras.cpp index 599fc6b..1f398de 100644 --- a/kshutdown/extras.cpp +++ b/kshutdown/extras.cpp @@ -28,10 +28,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include @@ -107,13 +107,13 @@ Extras::Extras() : TQObject(ks_main, "Extras"), _idToFileMap(0) // initialized in getIdToFileMap() { - _menu = new KPopupMenu(0, "KPopupMenu::_menu"); + _menu = new TDEPopupMenu(0, "TDEPopupMenu::_menu"); connect(_menu, SIGNAL(aboutToShow()), SLOT(slotShowMenu())); connect(_menu, SIGNAL(activated(int)), SLOT(slotActivated(int))); } // TODO: 2.0: recent items -void Extras::buildMenu(KPopupMenu *parentMenu, const TQString &subdir) +void Extras::buildMenu(TDEPopupMenu *parentMenu, const TQString &subdir) { int id; TQDir d(subdir); @@ -138,11 +138,11 @@ void Extras::buildMenu(KPopupMenu *parentMenu, const TQString &subdir) // dir if (fi.isDir()) { - KPopupMenu *submenu = new KPopupMenu(parentMenu, "KPopupMenu::submenu"); + TDEPopupMenu *submenu = new TDEPopupMenu(parentMenu, "TDEPopupMenu::submenu"); connect(submenu, SIGNAL(activated(int)), SLOT(slotActivated(int))); KDesktopFile *desktopFile = new KDesktopFile(path + "/.directory", true); - if (desktopFile->getConfigState() != KConfigBase::NoAccess) + if (desktopFile->getConfigState() != TDEConfigBase::NoAccess) { icon = desktopFile->readIcon(); if (icon.isEmpty()) @@ -191,7 +191,7 @@ void Extras::buildMenu(KPopupMenu *parentMenu, const TQString &subdir) // application/x-desktop KDesktopFile *desktopFile = new KDesktopFile(path, true); - if (desktopFile->getConfigState() != KConfigBase::NoAccess) + if (desktopFile->getConfigState() != TDEConfigBase::NoAccess) { name = desktopFile->readName(); if (name.isEmpty()) @@ -268,7 +268,7 @@ void Extras::slotModify() ); // launch Konqueror as an item editor - MiscUtils::runCommand("konqueror \"" + KGlobal::dirs()->saveLocation("data", "kshutdown/extras") + "\""); + MiscUtils::runCommand("konqueror \"" + TDEGlobal::dirs()->saveLocation("data", "kshutdown/extras") + "\""); } // private slots @@ -296,7 +296,7 @@ void Extras::slotShowMenu() setAction(TQString::null, TQString::null); _menu->clear(); // reset menu getIdToFileMap()->clear(); // reset map - TQStringList extrasDirs(KGlobal::dirs()->findDirs("data", "kshutdown/extras")); + TQStringList extrasDirs(TDEGlobal::dirs()->findDirs("data", "kshutdown/extras")); TQStringList::ConstIterator begin = extrasDirs.begin(), end = extrasDirs.end(); diff --git a/kshutdown/extras.h b/kshutdown/extras.h index 4aab74c..365b45c 100644 --- a/kshutdown/extras.h +++ b/kshutdown/extras.h @@ -23,7 +23,7 @@ #include #include -class KPopupMenu; +class TDEPopupMenu; class KPushButton; #define ks_extras Extras::getInstance() @@ -80,7 +80,7 @@ public: void setAction(const TQString &fileToExecute, const TQString &description, TQIconSet *icon = 0); private: static Extras *_instance; - KPopupMenu *_menu; + TDEPopupMenu *_menu; KPushButton *_button; TQMap *_idToFileMap; TQString @@ -93,7 +93,7 @@ private: * @param parentMenu A parent menu * @param subdir A subdirectory */ - void buildMenu(KPopupMenu *parentMenu, const TQString &subdir); + void buildMenu(TDEPopupMenu *parentMenu, const TQString &subdir); bool execFile() const; TQMap *getIdToFileMap(); diff --git a/kshutdown/kshutdown.desktop b/kshutdown/kshutdown.desktop index 2a94428..83f3223 100644 --- a/kshutdown/kshutdown.desktop +++ b/kshutdown/kshutdown.desktop @@ -3,17 +3,17 @@ Name=KShutDown Exec=kshutdown Icon=kshutdown -Comment=A Shut Down Utility for KDE -Comment[cs]=Vypínací utilita pro KDE -Comment[de]=Erweitertes Herunterfahren für KDE -Comment[el]=Ένα εργαλείο τερματισμού για το KDE -Comment[fr]=Utilitaire de gestion d'arrêt pour KDE -Comment[it]=Una utilit�KDE per lo spegnimento del sistema -Comment[pl]=Narzędzie do zamykania systemu dla KDE +Comment=A Shut Down Utility for TDE +Comment[cs]=Vypínací utilita pro TDE +Comment[de]=Erweitertes Herunterfahren für TDE +Comment[el]=Ένα εργαλείο τερματισμού για το TDE +Comment[fr]=Utilitaire de gestion d'arrêt pour TDE +Comment[it]=Una utilit�TDE per lo spegnimento del sistema +Comment[pl]=Narzędzie do zamykania systemu dla TDE GenericName=System Shut Down Utility GenericName[fr]=Gestionnaire d'arrêt du système GenericName[cs]=Časované vypnutí GenericName[pl]=Narzędzie do zamykania systemu DocPath=kshutdown/index.html Type=Application -Categories=KDE;Utility; +Categories=TDE;Utility; diff --git a/kshutdown/links.cpp b/kshutdown/links.cpp index 3c28f52..930ee06 100644 --- a/kshutdown/links.cpp +++ b/kshutdown/links.cpp @@ -25,12 +25,12 @@ #include #include -#include +#include #include -#include +#include #include -#include -#include +#include +#include #include #include @@ -127,7 +127,7 @@ TQString Links::getCurrentLocationPath() const switch (cb_location->currentItem()) { case 0: - path = KGlobalSettings::desktopPath() + "/"; + path = TDEGlobalSettings::desktopPath() + "/"; break; case 1: path = locateLocal("apps", "") + "/"; diff --git a/kshutdown/mactioneditdialog.cpp b/kshutdown/mactioneditdialog.cpp index 000fc96..378696b 100644 --- a/kshutdown/mactioneditdialog.cpp +++ b/kshutdown/mactioneditdialog.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include @@ -108,8 +108,8 @@ MActionEditDialog::MActionEditDialog(TQWidget *parent, Action::Type action) MiscUtils::HTML( i18n("In most cases you need privileges to shut down system (e.g. run /sbin/shutdown)") + "
" \ "
    " \ - "
  • " + i18n("If you are using KDE and KDM (KDE Display Manager), then set all methods to KDE") + "
    • " \ - "
  • " + i18n("If you are using KDE and display manager different than KDM, then set Turn Off Computer and Restart Computer methods to /sbin/...") + "
    • " \ + "
  • " + i18n("If you are using KDE and TDM (KDE Display Manager), then set all methods to KDE") + "
    • " \ + "
  • " + i18n("If you are using KDE and display manager different than TDM, then set Turn Off Computer and Restart Computer methods to /sbin/...") + "
    • " \ "
" + i18n("Manuals:") + "
    " \ @@ -139,7 +139,7 @@ MActionEditDialog::MActionEditDialog(TQWidget *parent, Action::Type action) setMethod(m); // command before action - KConfig *conf = kshutdownrc->config(); + TDEConfig *conf = kshutdownrc->config(); conf->setGroup(group); c_runCommandBeforeAction->setChecked(conf->readBoolEntry("RunCommandBeforeAction", false)); i_commandBeforeAction->setText(conf->readEntry("CommandBeforeAction", "")); @@ -208,7 +208,7 @@ void MActionEditDialog::slotOKClicked() ks_actions->setMethod(group, m, c); // command before action - KConfig *conf = kshutdownrc->config(); + TDEConfig *conf = kshutdownrc->config(); conf->setGroup(group); conf->writeEntry("RunCommandBeforeAction", c_runCommandBeforeAction->isChecked()); conf->writeEntry("CommandBeforeAction", i_commandBeforeAction->text()); @@ -219,7 +219,7 @@ void MActionEditDialog::slotTestCommandBeforeAction() { MiscUtils::runShellCommand( i_commandBeforeAction->text(), - KProcess::DontCare, + TDEProcess::DontCare, i_commandBeforeActionPause->value() ); } diff --git a/kshutdown/main.cpp b/kshutdown/main.cpp index 44286d7..3dbb5f2 100644 --- a/kshutdown/main.cpp +++ b/kshutdown/main.cpp @@ -26,29 +26,29 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include // 0.1.x, 0.3.x, etc - Unstable, Beta // 0.2.x, 0.4.x, etc - Stable TQString version = "1.0.4"; -KAboutData aboutData( +TDEAboutData aboutData( "kshutdown", // internal name "KShutDown", // full name version, I18N_NOOP("A Shut Down Utility for KDE"), // description - KAboutData::License_GPL_V2, // license + TDEAboutData::License_GPL_V2, // license "(C) 2003-3000 Konrad Twardowski", // copyright "", // text "http://kshutdown.sourceforge.net/", // project page "kdtonline@poczta.onet.pl" // bugs ); -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "s", 0, 0 }, { "shutdown", I18N_NOOP("Turn off computer"), 0 }, @@ -71,7 +71,7 @@ static KCmdLineOptions options[] = { "default", I18N_NOOP("Disable test mode"), 0 }, { "+[time]", I18N_NOOP("Time; Examples: 01:30 - absolute time (HH:MM); " \ "10 - number of minutes to wait from now"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; /** @short KShutDown application. */ @@ -109,7 +109,7 @@ private: timeArgIsValid; TQString timeArg; int doExecAction(const Action::Type action); - int doProcessArgs(const KCmdLineArgs *args); + int doProcessArgs(const TDECmdLineArgs *args); }; // public @@ -118,7 +118,7 @@ int KShutDownApplication::newInstance() { // autostart if (kapp->isRestored()) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("KShutDown"); if (!config->readBoolEntry("Autostart", false)) { quit(); @@ -140,7 +140,7 @@ int KShutDownApplication::newInstance() } // check command line args - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); int retval = doProcessArgs(args); args->clear(); @@ -198,7 +198,7 @@ int KShutDownApplication::doExecAction(const Action::Type action) { return Mode_Error; } -int KShutDownApplication::doProcessArgs(const KCmdLineArgs *args) { +int KShutDownApplication::doProcessArgs(const TDECmdLineArgs *args) { if (!ks_main) return Mode_Error; @@ -270,9 +270,9 @@ int KShutDownApplication::doProcessArgs(const KCmdLineArgs *args) { // standard logout dialog if (args->isSet("standard")) { kapp->requestShutDown( - KApplication::ShutdownConfirmYes, - KApplication::ShutdownTypeDefault, - KApplication::ShutdownModeDefault + TDEApplication::ShutdownConfirmYes, + TDEApplication::ShutdownTypeDefault, + TDEApplication::ShutdownModeDefault ); return Mode_Ok; @@ -379,8 +379,8 @@ int main(int argc, char **argv) aboutData.addCredit("SourceForge.net", "", "", "http://www.sourceforge.net/"); // init command line - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); if (!KUniqueApplication::start()) return 0; diff --git a/kshutdown/miscutils.cpp b/kshutdown/miscutils.cpp index e2083b1..257e68a 100644 --- a/kshutdown/miscutils.cpp +++ b/kshutdown/miscutils.cpp @@ -28,23 +28,23 @@ #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include // public void MiscUtils::closeCDTray() { if (kshutdownrc->cdTrayClose) - runShellCommand(kshutdownrc->cdTrayCloseCommand, KProcess::Block); + runShellCommand(kshutdownrc->cdTrayCloseCommand, TDEProcess::Block); } void MiscUtils::customMessage(const TQString &text, const TQString &testCommand) @@ -86,7 +86,7 @@ TQString MiscUtils::formatDateTime(const TQDateTime &dt) return dt.toString( - KGlobal::locale()->use12Clock() + TDEGlobal::locale()->use12Clock() ? "hh:mm ap, dddd" : "hh:mm, dddd" ) + @@ -134,7 +134,7 @@ void MiscUtils::passiveMessage(const TQString &text, TQWidget *parent) { popup->move(0, 0); } -void MiscUtils::plug(const KAction *action, KPushButton *pushButton) { +void MiscUtils::plug(const TDEAction *action, KPushButton *pushButton) { pushButton->disconnect(); // disconnect all pushButton->connect(pushButton, SIGNAL(clicked()), action, SLOT(activate())); pushButton->setIconSet(action->iconSet()); @@ -158,7 +158,7 @@ bool MiscUtils::runCommand(const TQString &command) void MiscUtils::runCommandBeforeAction(const TQString &configEntry) { - KConfig *conf = kshutdownrc->config(); + TDEConfig *conf = kshutdownrc->config(); if (!conf->hasGroup(configEntry)) return; @@ -172,15 +172,15 @@ void MiscUtils::runCommandBeforeAction(const TQString &configEntry) int pause = conf->readNumEntry("CommandBeforeActionPause", 10); if ((pause < 0) || (pause > 300)) pause = 10; - runShellCommand(command, KProcess::DontCare, pause); + runShellCommand(command, TDEProcess::DontCare, pause); } -bool MiscUtils::runShellCommand(const TQString &command, const KProcess::RunMode mode, const int pause) +bool MiscUtils::runShellCommand(const TQString &command, const TDEProcess::RunMode mode, const int pause) { if (command.isEmpty()) return false; - KProcess *p = new KProcess(); + TDEProcess *p = new TDEProcess(); if (!p) { showRunErrorMessage(command); @@ -210,7 +210,7 @@ bool MiscUtils::runShellCommand(const TQString &command, const KProcess::RunMode } void MiscUtils::setAutostart(const bool yes) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("KShutDown"); config->writeEntry("Autostart", yes); } diff --git a/kshutdown/miscutils.h b/kshutdown/miscutils.h index 91fb5a0..a02c0f2 100644 --- a/kshutdown/miscutils.h +++ b/kshutdown/miscutils.h @@ -24,7 +24,7 @@ #include -class KAction; +class TDEAction; class KPushButton; /** @short Misc functions. */ @@ -85,7 +85,7 @@ public: static void passiveMessage(const TQString &text, TQWidget *parent = 0); - static void plug(const KAction *action, KPushButton *pushButton); + static void plug(const TDEAction *action, KPushButton *pushButton); /** * Executes a command. @@ -103,11 +103,11 @@ public: /** * Executes a shell command. * @param command A shell command to execute - * @param mode A run mode (@c KProcess::DontCare by default) + * @param mode A run mode (@c TDEProcess::DontCare by default) * @param pause A timeout in seconds (no timeout by default) * @return @c true if successfull; otherwise @c false */ - static bool runShellCommand(const TQString &command, const KProcess::RunMode mode = KProcess::DontCare, const int pause = -1); + static bool runShellCommand(const TQString &command, const TDEProcess::RunMode mode = TDEProcess::DontCare, const int pause = -1); static void setAutostart(const bool yes); diff --git a/kshutdown/mmainwindow.cpp b/kshutdown/mmainwindow.cpp index 150c896..e030eb1 100644 --- a/kshutdown/mmainwindow.cpp +++ b/kshutdown/mmainwindow.cpp @@ -41,18 +41,18 @@ #include #include -#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include -#include +#include #include #include @@ -61,7 +61,7 @@ MMainWindow *MMainWindow::_instance = 0; MMainWindow::MMainWindow() // Iface : DCOPObject("KShutdownIface"), - KMainWindow(0, "MMainWindow", WStyle_ContextHelp), + TDEMainWindow(0, "MMainWindow", WStyle_ContextHelp), _showMinimizeInfo(true), _oldSec(-1), _delayType(DelayType_Now) @@ -87,7 +87,7 @@ MMainWindow::MMainWindow() client->registerAs(kapp->name(), false); client->setDefaultObject(objId()); // KShutdownIface - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Extras"); TQString extrasCommand = config->readEntry("Command", TQString::null); TQString extrasDescription = config->readEntry("Description", TQString::null); @@ -102,7 +102,7 @@ MMainWindow::MMainWindow() else { // application/x-desktop KDesktopFile *desktopFile = new KDesktopFile(extrasCommand, true); - if (desktopFile->getConfigState() != KConfigBase::NoAccess) + if (desktopFile->getConfigState() != TDEConfigBase::NoAccess) extrasIcon = TQIconSet(SmallIcon(desktopFile->readIcon())); delete desktopFile; } @@ -123,7 +123,7 @@ MMainWindow::MMainWindow() MMainWindow::~MMainWindow() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Extras"); config->writeEntry("Command", ks_extras->fileToExecute()); config->writeEntry("Description", ks_extras->getActionDescription()); @@ -175,7 +175,7 @@ void MMainWindow::setDelayType(const DelayType value) _dateTimeEdit->dateEdit()->setEnabled(true); _dateTimeEdit->timeEdit()->setEnabled(true); _dateTimeEdit->timeEdit()->setDisplay( - KGlobal::locale()->use12Clock() + TDEGlobal::locale()->use12Clock() ? (TQTimeEdit::Hours | TQTimeEdit::Minutes | TQTimeEdit::AMPM) : (TQTimeEdit::Hours | TQTimeEdit::Minutes) ); @@ -292,8 +292,8 @@ void MMainWindow::start(const bool confirmation) { if ((_delayType != DelayType_OnAppExit) && (dt_end < dt_start)) { - TQString selDT = i18n("Selected date/time: %1").arg("" + KGlobal::locale()->formatDateTime(dt_end, false, true)+ ""); - TQString curDT = i18n("Current date/time: %1").arg("" + KGlobal::locale()->formatDateTime(dt_start, false, true) + ""); + TQString selDT = i18n("Selected date/time: %1").arg("" + TDEGlobal::locale()->formatDateTime(dt_end, false, true)+ ""); + TQString curDT = i18n("Current date/time: %1").arg("" + TDEGlobal::locale()->formatDateTime(dt_start, false, true) + ""); cancel(); KMessageBox::error( @@ -470,7 +470,7 @@ void MMainWindow::initMainMenu() KMenuBar *mainMenu = menuBar(); // file - KPopupMenu *pm_file = new KPopupMenu(this); + TDEPopupMenu *pm_file = new TDEPopupMenu(this); _statisticsAction->plug(pm_file); pm_file->insertSeparator(); if (MiscUtils::isRestricted("tab_stats")) @@ -481,7 +481,7 @@ void MMainWindow::initMainMenu() mainMenu->insertItem(i18n("&File"), pm_file); // actions - KPopupMenu *pm_actions = new KPopupMenu(this); + TDEPopupMenu *pm_actions = new TDEPopupMenu(this); pm_actions->insertTitle(SmallIcon("messagebox_warning"), i18n("No Delay")); _shutDownAction->plug(pm_actions); _rebootAction->plug(pm_actions); @@ -492,7 +492,7 @@ void MMainWindow::initMainMenu() mainMenu->insertItem(i18n("&Actions"), pm_actions); // settings - KPopupMenu *pm_settings = new KPopupMenu(this); + TDEPopupMenu *pm_settings = new TDEPopupMenu(this); _checkSystemConfigurationAction->plug(pm_settings); pm_settings->insertSeparator(); pm_settings->insertItem(SmallIcon("configure_shortcuts"), i18n("Configure Global Shortcuts..."), this, SLOT(slotConfigureGlobalShortcuts())); @@ -510,66 +510,66 @@ void MMainWindow::initActions() { // shut down actions - ac_shutDown = new KActionCollection(this, this); + ac_shutDown = new TDEActionCollection(this, this); - _lockScreenAction = new KAction( + _lockScreenAction = new TDEAction( ks_actions->getName(Action::LockScreen), - ks_actions->getIcon(Action::LockScreen), KShortcut(), + ks_actions->getIcon(Action::LockScreen), TDEShortcut(), ks_actions, SLOT(slotLockScreen()), ac_shutDown, "kshutdown_lockscreen" ); - _logoutAction = new KAction( + _logoutAction = new TDEAction( ks_actions->getName(Action::Logout), - ks_actions->getIcon(Action::Logout), KShortcut(), + ks_actions->getIcon(Action::Logout), TDEShortcut(), ks_actions, SLOT(slotLogout()), ac_shutDown, "kshutdown_logout" ); - _rebootAction = new KAction( + _rebootAction = new TDEAction( ks_actions->getName(Action::Reboot), - ks_actions->getIcon(Action::Reboot), KShortcut(), + ks_actions->getIcon(Action::Reboot), TDEShortcut(), ks_actions, SLOT(slotReboot()), ac_shutDown, "kshutdown_reboot" ); - _shutDownAction = new KAction( + _shutDownAction = new TDEAction( ks_actions->getName(Action::ShutDown), - ks_actions->getIcon(Action::ShutDown), KShortcut(), + ks_actions->getIcon(Action::ShutDown), TDEShortcut(), ks_actions, SLOT(slotShutDown()), ac_shutDown, "kshutdown_shutdown" ); // standard actions - _cancelAction = new KAction( + _cancelAction = new TDEAction( i18n("C&ancel"), - "cancel", KShortcut(Key_Escape), + "cancel", TDEShortcut(Key_Escape), this, SLOT(slotCancel()), actionCollection(), "kshutdown_cancelaction" ); _cancelAction->setEnabled(false); - _checkSystemConfigurationAction = new KAction( + _checkSystemConfigurationAction = new TDEAction( i18n("Check &System Configuration"), - "button_ok", KShortcut(), + "button_ok", TDEShortcut(), this, SLOT(slotCheckSystemConfig()), actionCollection(), "kshutdown_checksystemconfiguration" ); _configureKShutDownAction = KStdAction::preferences(this, SLOT(slotConfigureKShutDown()), actionCollection()); - _startAction = new KAction( + _startAction = new TDEAction( i18n("&Start"), - "button_ok", KShortcut(Key_Return), + "button_ok", TDEShortcut(Key_Return), this, SLOT(slotStart()), actionCollection(), "kshutdown_startaction" ); MiscUtils::plug(_startAction, b_startStop); - _statisticsAction = new KAction( + _statisticsAction = new TDEAction( i18n("&Statistics"), - KShortcut(Key_F2), + TDEShortcut(Key_F2), this, SLOT(slotStats()), actionCollection(), "kshutdown_statistics" ); @@ -578,7 +578,7 @@ void MMainWindow::initActions() ac_shutDown->readShortcutSettings(); // init global actions/shortcuts - _globalAccel = new KGlobalAccel(this); + _globalAccel = new TDEGlobalAccel(this); _globalAccel->insert( "kshutdown_shutdown", ks_actions->getName(Action::ShutDown), @@ -735,7 +735,7 @@ void MMainWindow::updateTimeInfo(const int secs) { setCaptions( MiscUtils::formatDateTime(secs), - KGlobal::locale()->formatDateTime(dt_end, true, true) + TDEGlobal::locale()->formatDateTime(dt_end, true, true) ); // update progress bar diff --git a/kshutdown/mmainwindow.h b/kshutdown/mmainwindow.h index 0ee8c6b..5c2b0e1 100644 --- a/kshutdown/mmainwindow.h +++ b/kshutdown/mmainwindow.h @@ -25,20 +25,20 @@ #include -#include +#include class AppObserver; class TQDateTimeEdit; class TQLabel; -class KGlobalAccel; +class TDEGlobalAccel; class KPushButton; #define ks_main MMainWindow::getInstance() /** @short The main window. */ -class MMainWindow: public KMainWindow, virtual public KShutdownIface +class MMainWindow: public TDEMainWindow, virtual public KShutdownIface { Q_OBJECT public: @@ -80,14 +80,14 @@ public: void start(const bool confirmation = true); // actions - inline KAction *cancelAction() const { return _cancelAction; } - inline KAction *checkSystemConfigurationAction() const { return _checkSystemConfigurationAction; } - inline KAction *configureKShutDownAction() const { return _configureKShutDownAction; } - inline KAction *lockScreenAction() const { return _lockScreenAction; } - inline KAction *logoutAction() const { return _logoutAction; } - inline KAction *rebootAction() const { return _rebootAction; } - inline KAction *shutDownAction() const { return _shutDownAction; } - inline KAction *statisticsAction() const { return _statisticsAction; } + inline TDEAction *cancelAction() const { return _cancelAction; } + inline TDEAction *checkSystemConfigurationAction() const { return _checkSystemConfigurationAction; } + inline TDEAction *configureKShutDownAction() const { return _configureKShutDownAction; } + inline TDEAction *lockScreenAction() const { return _lockScreenAction; } + inline TDEAction *logoutAction() const { return _logoutAction; } + inline TDEAction *rebootAction() const { return _rebootAction; } + inline TDEAction *shutDownAction() const { return _shutDownAction; } + inline TDEAction *statisticsAction() const { return _statisticsAction; } // DCOP: // general: @@ -106,7 +106,7 @@ public: private: bool _showMinimizeInfo; // actions - KAction + TDEAction *_cancelAction, *_checkSystemConfigurationAction, *_configureKShutDownAction, @@ -116,8 +116,8 @@ private: *_shutDownAction, *_startAction, *_statisticsAction; - KActionCollection *ac_shutDown; - KGlobalAccel *_globalAccel; + TDEActionCollection *ac_shutDown; + TDEGlobalAccel *_globalAccel; int _oldSec; AppObserver *_appObserver; diff --git a/kshutdown/mmessagedialog.cpp b/kshutdown/mmessagedialog.cpp index ff80ea9..e4bd6ec 100644 --- a/kshutdown/mmessagedialog.cpp +++ b/kshutdown/mmessagedialog.cpp @@ -30,10 +30,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include // public diff --git a/kshutdown/msettingsdialog.cpp b/kshutdown/msettingsdialog.cpp index 0503ee7..d80b5d3 100644 --- a/kshutdown/msettingsdialog.cpp +++ b/kshutdown/msettingsdialog.cpp @@ -40,13 +40,13 @@ #include #include -#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -77,7 +77,7 @@ MSettingsDialog::MSettingsDialog(TQWidget *parent) initActionsPage(); initAdvancedPage(); - _configDialogManager = new KConfigDialogManager(this, kshutdownrc); + _configDialogManager = new TDEConfigDialogManager(this, kshutdownrc); _configDialogManager->updateWidgets(); connect(_configDialogManager, SIGNAL(widgetModified()), SLOT(slotConfigChanged())); @@ -85,7 +85,7 @@ MSettingsDialog::MSettingsDialog(TQWidget *parent) connect(this, SIGNAL(okClicked()), SLOT(slotOKClicked())); // lock after login - c_autoLock->setChecked(TQFile::exists(KGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop")); + c_autoLock->setChecked(TQFile::exists(TDEGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop")); setInitialSize(configDialogSize("Settings Dialog")); showPage(_lastPage); // restore last page @@ -134,7 +134,7 @@ void MSettingsDialog::initActionsPage() TQVGroupBox *gb_general = new TQVGroupBox(i18n("Actions"), _actionsPage); - _actions = new KListView(gb_general, "KListView::_actions"); + _actions = new TDEListView(gb_general, "TDEListView::_actions"); _actions->setAllColumnsShowFocus(true); _actions->setItemMargin(5); _actions->setMaximumHeight(200); @@ -144,16 +144,16 @@ void MSettingsDialog::initActionsPage() _actions->addColumn(i18n("Command before action")); _actions->header()->setClickEnabled(false); - _logoutItem = new KListViewItem(_actions, ks_actions->getName(Action::Logout)); + _logoutItem = new TDEListViewItem(_actions, ks_actions->getName(Action::Logout)); _logoutItem->setPixmap(0, ks_actions->getIcon(Action::Logout)); - _lockScreenItem = new KListViewItem(_actions, ks_actions->getName(Action::LockScreen)); + _lockScreenItem = new TDEListViewItem(_actions, ks_actions->getName(Action::LockScreen)); _lockScreenItem->setPixmap(0, ks_actions->getIcon(Action::LockScreen)); - _rebootItem = new KListViewItem(_actions, ks_actions->getName(Action::Reboot)); + _rebootItem = new TDEListViewItem(_actions, ks_actions->getName(Action::Reboot)); _rebootItem->setPixmap(0, ks_actions->getIcon(Action::Reboot)); - _shutDownItem = new KListViewItem(_actions, ks_actions->getName(Action::ShutDown)); + _shutDownItem = new TDEListViewItem(_actions, ks_actions->getName(Action::ShutDown)); _shutDownItem->setPixmap(0, ks_actions->getIcon(Action::ShutDown)); connect(_actions, SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), SLOT(slotEditAction())); @@ -331,7 +331,7 @@ void MSettingsDialog::initMessagesPage() l_customMessageCommand->setBuddy(in_customMessageCommand); KPushButton *b_customMessagePresets = new KPushButton(i18n("Presets"), w_customMessage, "KPushButton::b_customMessagePresets"); - KPopupMenu *pm_customMessagePresets = new KPopupMenu(b_customMessagePresets); + TDEPopupMenu *pm_customMessagePresets = new TDEPopupMenu(b_customMessagePresets); pm_customMessagePresets->insertItem("KDialog", this, SLOT(slotSetKDialogCustomMessage())); pm_customMessagePresets->insertItem("Amor", this, SLOT(slotSetAmorCustomMessage())); b_customMessagePresets->setPopup(pm_customMessagePresets); @@ -383,7 +383,7 @@ void MSettingsDialog::initMessagesPage() b_testCustomMessage, SLOT(setEnabled(bool))); } -Action::Type MSettingsDialog::itemToActionType(const KListViewItem *item) const +Action::Type MSettingsDialog::itemToActionType(const TDEListViewItem *item) const { if (!item) return Action::Nothing; @@ -412,7 +412,7 @@ void MSettingsDialog::updateActions() _actions->setCurrentItem(_shutDownItem); } -void MSettingsDialog::updateItem(KListViewItem *item) +void MSettingsDialog::updateItem(TDEListViewItem *item) { Action::Type action = itemToActionType(item); @@ -435,7 +435,7 @@ void MSettingsDialog::updateItem(KListViewItem *item) // command before action if (!group.isNull()) { - KConfig *conf = kshutdownrc->config(); + TDEConfig *conf = kshutdownrc->config(); conf->setGroup(group); if (conf->readBoolEntry("RunCommandBeforeAction", false)) { @@ -473,7 +473,7 @@ void MSettingsDialog::slotCustomMessageTest() void MSettingsDialog::slotEditAction() { - KListViewItem *item = static_cast(_actions->currentItem()); + TDEListViewItem *item = static_cast(_actions->currentItem()); if (!item) return; @@ -495,7 +495,7 @@ void MSettingsDialog::slotEnableAllMessages() void MSettingsDialog::slotKDESettings() { - MiscUtils::runCommand("kcmshell screensaver kcmsmserver kdm"); + MiscUtils::runCommand("tdecmshell screensaver kcmsmserver tdm"); } void MSettingsDialog::slotOKClicked() @@ -509,7 +509,7 @@ void MSettingsDialog::slotOKClicked() if (c_autoLock->isChecked()) { Links::createLink( - KGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop", + TDEGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop", "kshutdown --init --lock", "kshutdown", "KShutDown", @@ -518,7 +518,7 @@ void MSettingsDialog::slotOKClicked() } else { - Links::removeLink(KGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop"); + Links::removeLink(TDEGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop"); } int id = gb_systemTray->selectedId(); @@ -598,7 +598,7 @@ void MSettingsDialog::slotDefault() ) return; - KConfig *conf = kshutdownrc->config(); + TDEConfig *conf = kshutdownrc->config(); conf->deleteGroup("Shut Down"); conf->deleteGroup("Reboot"); conf->deleteGroup("Lock Screen"); diff --git a/kshutdown/msettingsdialog.h b/kshutdown/msettingsdialog.h index 64d27dc..b49a801 100644 --- a/kshutdown/msettingsdialog.h +++ b/kshutdown/msettingsdialog.h @@ -27,11 +27,11 @@ class TQCheckBox; class TQHButtonGroup; -class KConfigDialogManager; +class TDEConfigDialogManager; class KIntNumInput; class KLineEdit; -class KListView; -class KListViewItem; +class TDEListView; +class TDEListViewItem; class KPushButton; /** @short A settings dialog. */ @@ -69,11 +69,11 @@ public: private: static int _lastPage; static MSettingsDialog *_instance; - KConfigDialogManager *_configDialogManager; + TDEConfigDialogManager *_configDialogManager; KIntNumInput *in_warningMessageDelay; KLineEdit *in_customMessageCommand; - KListView *_actions; - KListViewItem + TDEListView *_actions; + TDEListViewItem *_lockScreenItem, *_logoutItem, *_rebootItem, @@ -101,9 +101,9 @@ private: void initAdvancedPage(); void initGeneralPage(); void initMessagesPage(); - Action::Type itemToActionType(const KListViewItem *item) const; + Action::Type itemToActionType(const TDEListViewItem *item) const; void updateActions(); - void updateItem(KListViewItem *item); + void updateItem(TDEListViewItem *item); private slots: void slotCheckSystemConfig(); void slotConfigChanged(); diff --git a/kshutdown/mstatstab.cpp b/kshutdown/mstatstab.cpp index 7b559b3..635af2d 100644 --- a/kshutdown/mstatstab.cpp +++ b/kshutdown/mstatstab.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include // public @@ -159,7 +159,7 @@ void MStatsTab::slotProcessExit() { KS_WARNING("sudo") KS_WARNING("telnet") - _buf.prepend("
    ");
+	_buf.prepend("
    ");
 	_buf.append("
    ");
 
 	te_output->setText(MiscUtils::HTML(_buf));
diff --git a/kshutdown/msystemtray.cpp b/kshutdown/msystemtray.cpp
index 5731842..e97eb2f 100644
--- a/kshutdown/msystemtray.cpp
+++ b/kshutdown/msystemtray.cpp
@@ -24,14 +24,14 @@
 
 #include 
 
-#include 
+#include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 const double
 	KS_TRAY_FADE_CHANGE = 0.05f,
@@ -134,7 +134,7 @@ MSystemTray::MSystemTray()
 	_flashCount(0),
 	_saveIcon(0)
 {
-	setPixmap(SmallIcon("exit", KIcon::SizeSmallMedium)); // 22x22
+	setPixmap(SmallIcon("exit", TDEIcon::SizeSmallMedium)); // 22x22
 
 // TODO: 2.0: mouse wheel: decrease/increase end time by 5min. (?)
 
@@ -147,13 +147,13 @@ MSystemTray::MSystemTray()
 	connect(_flashTimer, SIGNAL(timeout()), SLOT(slotFlashTimeout()));
 
 	// init icons
-	KPixmap pm(SmallIcon("exit", KIcon::SizeSmallMedium));
+	KPixmap pm(SmallIcon("exit", TDEIcon::SizeSmallMedium));
 	_flashIcon = new KPixmap(KPixmapEffect::fade(pm, 0.7f, white));
 
 	show();
 
 	// add some items to the context menu
-	KPopupMenu *pm_systemTrayMenu = contextMenu();
+	TDEPopupMenu *pm_systemTrayMenu = contextMenu();
 	pm_systemTrayMenu->setCaption("KShutDown");
 	// id 0 = title
 	ks_main->shutDownAction()->plug(pm_systemTrayMenu, 1);
@@ -194,7 +194,7 @@ void MSystemTray::slotFade()
 			_fadeValue = 0.0f;
 		}
 	}
-	KPixmap p(SmallIcon("exit", KIcon::SizeSmallMedium));
+	KPixmap p(SmallIcon("exit", TDEIcon::SizeSmallMedium));
 	setPixmap(KPixmapEffect::fade(p, _fadeValue, KS_TRAY_FADE_COLOR));
 }
 
diff --git a/kshutdown/mtip.cpp b/kshutdown/mtip.cpp
index 0ccfcab..5350b75 100644
--- a/kshutdown/mtip.cpp
+++ b/kshutdown/mtip.cpp
@@ -86,5 +86,5 @@ void MTip::setTipType(const TipType value)
 
 TQString MTip::getIconPath(const TQString &name) const
 {
-	return KGlobal::iconLoader()->iconPath(name, KIcon::NoGroup, KIcon::SizeLarge);
+	return TDEGlobal::iconLoader()->iconPath(name, TDEIcon::NoGroup, TDEIcon::SizeLarge);
 }
diff --git a/kshutdown/progressbar.cpp b/kshutdown/progressbar.cpp
index da2d8b1..c78e331 100644
--- a/kshutdown/progressbar.cpp
+++ b/kshutdown/progressbar.cpp
@@ -21,10 +21,10 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 #include "configuration.h"
 #include "progressbar.h"
@@ -94,7 +94,7 @@ void ProgressBar::mousePressEvent(TQMouseEvent *e) {
 // TODO: 2.0: color configuration
 // TODO: 2.0: size configuration
 		// show popup menu
-		KPopupMenu *popup = new KPopupMenu(this);
+		TDEPopupMenu *popup = new TDEPopupMenu(this);
 		popup->insertTitle(kapp->miniIcon(), "KShutDown");
 		popup->insertItem(i18n("Hide"), this, SLOT(hide()));
 		popup->insertTitle("Position");
diff --git a/kshutdown/systemconfig.cpp b/kshutdown/systemconfig.cpp
index 4a1ff78..dd83173 100644
--- a/kshutdown/systemconfig.cpp
+++ b/kshutdown/systemconfig.cpp
@@ -25,10 +25,10 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=417301
 #include 
@@ -77,7 +77,7 @@ SystemConfig::SystemConfig(TQWidget *parent)
 	),
 	_problems(0)
 {
-	_messages = new KListView(this, "KListView::_messages");
+	_messages = new TDEListView(this, "TDEListView::_messages");
 	_messages->setAllColumnsShowFocus(true);
 	_messages->setItemMargin(5);
 	_messages->setSorting(-1); // no sort
@@ -100,9 +100,9 @@ SystemConfig::SystemConfig(TQWidget *parent)
 		add(OK, i18n("No problems were found."));
 }
 
-KListViewItem *SystemConfig::add(const Type type, const TQString &message)
+TDEListViewItem *SystemConfig::add(const Type type, const TQString &message)
 {
-	KListViewItem *item = new KListViewItem(_messages);
+	TDEListViewItem *item = new TDEListViewItem(_messages);
 	item->setMultiLinesEnabled(true);
 	switch (type)
 	{
@@ -148,7 +148,7 @@ void SystemConfig::checkKDE()
 	}
 }
 
-/* TODO: 2.0: KDM configurator
+/* TODO: 2.0: TDM configurator
 From old FAQ:
 - Do it as root!
 - Make sure you first create backup of the "/etc/sysconfig/desktop" file
@@ -162,7 +162,7 @@ void SystemConfig::checkKDM()
 	{
 // TODO: 2.0: auto configuration
 		add(Info, i18n("Tip: You can customize Actions to work with GDM.\n(Settings -> Configure KShutDown... -> Actions)"));
-		_kdmNotDetected = add(Warning, i18n("KDE Display Manager is not running,\nor the shut down/reboot function is disabled.\n\nClick here to configure KDM."));
+		_tdmNotDetected = add(Warning, i18n("KDE Display Manager is not running,\nor the shut down/reboot function is disabled.\n\nClick here to configure TDM."));
 	}
 }
 
@@ -173,9 +173,9 @@ void SystemConfig::slotExecuted(TQListViewItem *item)
 	if (!item)
 		return;
 
-	if (item == _kdmNotDetected)
+	if (item == _tdmNotDetected)
 	{
-		MiscUtils::runShellCommand("kdesu -c \"kcmshell kdm\" -i \"exit\"");
+		MiscUtils::runShellCommand("tdesu -c \"tdecmshell tdm\" -i \"exit\"");
 
 		return;
 	}
diff --git a/kshutdown/systemconfig.h b/kshutdown/systemconfig.h
index 7f79ab0..216a121 100644
--- a/kshutdown/systemconfig.h
+++ b/kshutdown/systemconfig.h
@@ -22,8 +22,8 @@
 
 #include 
 
-class KListView;
-class KListViewItem;
+class TDEListView;
+class TDEListViewItem;
 
 /** @short A system configuration manager. */
 class SystemConfig: KDialogBase
@@ -44,12 +44,12 @@ private:
 	enum Type { Info, OK, Warning };
 	static int _canShutDown;
 	int _problems;
-	KListView *_messages;
-	KListViewItem
-		*_kdmNotDetected,
+	TDEListView *_messages;
+	TDEListViewItem
+		*_tdmNotDetected,
 		*_shutdownAllowItem;
 	SystemConfig(TQWidget *parent);
-	KListViewItem *add(const Type type, const TQString &message);
+	TDEListViewItem *add(const Type type, const TQString &message);
 	void checkFile(const TQString &file);
 	void checkKDE();
 	void checkKDM();
diff --git a/kshutdownlockout/Makefile.am b/kshutdownlockout/Makefile.am
index de92ce2..b66ac8c 100644
--- a/kshutdownlockout/Makefile.am
+++ b/kshutdownlockout/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kshutdownlockout_panelapplet.la
 
 kshutdownlockout_panelapplet_la_SOURCES = lockout.cpp
-kshutdownlockout_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_QT) -lDCOP $(all_libraries)
+kshutdownlockout_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT) -lDCOP $(all_libraries)
 kshutdownlockout_panelapplet_la_LIBADD = $(LIB_KSYCOCA)
 
 noinst_HEADERS = lockout.h
diff --git a/kshutdownlockout/kshutdownlockout.desktop b/kshutdownlockout/kshutdownlockout.desktop
index 7cdc247..adf9b44 100644
--- a/kshutdownlockout/kshutdownlockout.desktop
+++ b/kshutdownlockout/kshutdownlockout.desktop
@@ -43,7 +43,7 @@ Comment[nn]=Panelknappar for skjermlås/utlogging
 Comment[nso]=Ditobetswa tsa Notlelo/Etswa tsa panel
 Comment[pa]=ਪੈਨਲ ਲਈ ਤਾਲਾ/ਬਾਹਰੀ ਦਰ ਐਪਲਿਟ
 Comment[pl]=Przyciski blokowania i wylogowania dla panelu
-Comment[pt]=Os botões para trancar o ecrã e sair do KDE para o painel
+Comment[pt]=Os botões para trancar o ecrã e sair do TDE para o painel
 Comment[pt_BR]=Botões de Travar/Sair para o Painel
 Comment[ro]=Butoane de ieşire şi de blocare ecran, pentru panou
 Comment[ru]=Кнопки выхода/запирания экрана на панели
@@ -68,4 +68,4 @@ Comment[zh_TW]=在面板上顯示「螢幕鎖定/登出」按鈕
 Comment[zu]=Izinkinobho Zokukhiya/Ukuphumela ngaphandle zewindi lemininingwane
 # DUPLICATE: Comment[el]=Κουμπιά κλειδώματος/αποσύνδεσης για τον πίνακα
 Icon=kshutdown
-X-KDE-Library=kshutdownlockout_panelapplet
+X-TDE-Library=kshutdownlockout_panelapplet
diff --git a/kshutdownlockout/lockout.cpp b/kshutdownlockout/lockout.cpp
index af336ea..201ecd7 100644
--- a/kshutdownlockout/lockout.cpp
+++ b/kshutdownlockout/lockout.cpp
@@ -38,13 +38,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include 
 
 #include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 
@@ -60,7 +60,7 @@ extern "C"
 	KDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
 	{
 		// share i18n with KShutDown
-		KGlobal::locale()->insertCatalogue("kshutdown");
+		TDEGlobal::locale()->insertCatalogue("kshutdown");
 
 		return new Lockout(configFile, parent);
 	}
@@ -82,7 +82,7 @@ Lockout::Lockout(const TQString& configFile, TQWidget *parent)
 
 	initActions();
 
-	KPopupMenu *pm_actions = new KPopupMenu(this);
+	TDEPopupMenu *pm_actions = new TDEPopupMenu(this);
 	pm_actions->insertTitle(SmallIcon("messagebox_warning"), i18n("No Delay"));
 	_shutDownAction->plug(pm_actions);
 	_rebootAction->plug(pm_actions);
@@ -105,7 +105,7 @@ Lockout::Lockout(const TQString& configFile, TQWidget *parent)
 	layout->addWidget(button);
 
 /*	// read configuration
-	KConfig *config = this->config();
+	TDEConfig *config = this->config();
 	config->setGroup("kshutdownlockout");
 	_transparent = config->readBoolEntry("Transparent", true);
 */
@@ -124,7 +124,7 @@ Lockout::Lockout(const TQString& configFile, TQWidget *parent)
 
 Lockout::~Lockout()
 {
-	KGlobal::locale()->removeCatalogue("kshutdown");
+	TDEGlobal::locale()->removeCatalogue("kshutdown");
 }
 
 int Lockout::heightForWidth(int/* width*/) const
@@ -143,7 +143,7 @@ void Lockout::callKShutDown(const TQCString &function) {
 	DCOPClient *client = kapp->dcopClient();
 	if (!client->isApplicationRegistered("kshutdown")) {
 		// run KShutDown
-		KProcess *p = new KProcess();
+		TDEProcess *p = new TDEProcess();
 		if (!p) {
 			KMessageBox::error(0, i18n("Could not run KShutDown!"));
 
@@ -151,7 +151,7 @@ void Lockout::callKShutDown(const TQCString &function) {
 		}
 		*p << "kshutdown";
 		*p << "--init";
-		if (!p->start(KProcess::Block))
+		if (!p->start(TDEProcess::Block))
 			KMessageBox::error(0, i18n("Could not run KShutDown!"));
 		delete p;
 	}
@@ -159,36 +159,36 @@ void Lockout::callKShutDown(const TQCString &function) {
 }
 
 void Lockout::initActions() {
-	KActionCollection *ac_shutDown = new KActionCollection(this, this);
+	TDEActionCollection *ac_shutDown = new TDEActionCollection(this, this);
 
-	_lockScreenAction = new KAction(
-		i18n("Lock Screen"), "lock", KShortcut(),
+	_lockScreenAction = new TDEAction(
+		i18n("Lock Screen"), "lock", TDEShortcut(),
 		this, SLOT(slotLockScreen()),
 		ac_shutDown, "kshutdown_lockscreen"
 	);
 
-	_logoutAction = new KAction(
-		i18n("End Current Session"), "undo", KShortcut(),
+	_logoutAction = new TDEAction(
+		i18n("End Current Session"), "undo", TDEShortcut(),
 		this, SLOT(slotLogout()),
 		ac_shutDown, "kshutdown_logout"
 	);
 
-	_rebootAction = new KAction(
-		i18n("Restart Computer"), "reload", KShortcut(),
+	_rebootAction = new TDEAction(
+		i18n("Restart Computer"), "reload", TDEShortcut(),
 		this, SLOT(slotReboot()),
 		ac_shutDown, "kshutdown_reboot"
 	);
 
-	_shutDownAction = new KAction(
-		i18n("Turn Off Computer"), "exit", KShortcut(),
+	_shutDownAction = new TDEAction(
+		i18n("Turn Off Computer"), "exit", TDEShortcut(),
 		this, SLOT(slotShutDown()),
 		ac_shutDown, "kshutdown_shutdown"
 	);
 
 	// standard actions
 
-	_configureKShutDownAction = new KAction(
-		i18n("&Configure KShutDown..."), "configure", KShortcut(),
+	_configureKShutDownAction = new TDEAction(
+		i18n("&Configure KShutDown..."), "configure", TDEShortcut(),
 		this, SLOT(slotConfigureKShutDown()),
 		ac_shutDown, "options_configure"
 	);
diff --git a/kshutdownlockout/lockout.h b/kshutdownlockout/lockout.h
index 444d489..f7a2718 100644
--- a/kshutdownlockout/lockout.h
+++ b/kshutdownlockout/lockout.h
@@ -3,7 +3,7 @@
 
 #include 
 
-class KAction;
+class TDEAction;
 
 /**
  * @short A KShutDown panel applet.
@@ -36,7 +36,7 @@ public:
 	int widthForHeight(int height) const;
 private:
 	bool _transparent;
-	KAction
+	TDEAction
 		*_configureKShutDownAction,
 		*_lockScreenAction,
 		*_logoutAction,
diff --git a/po/ar.po b/po/ar.po
index e66b0e6..3cf8cc0 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -698,12 +698,12 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
-"KDM غير مشتغل،\n"
+"TDM غير مشتغل،\n"
 "أو وظيفة الإيقاف وإعادة التشغيل معطلة.\n"
 "\n"
-"انقر هنا لإعداد KDM."
+"انقر هنا لإعداد TDM."
 
 #: ../kshutdown/mactioneditdialog.cpp:72
 msgid "Select a method:"
@@ -730,12 +730,12 @@ msgid "In most cases you need privileges to shut down system (e.g. run /sbin/shu
 msgstr "تتطلب في أغلب الحالات صلاحيات خاصة استعمال أمر  /sbin/shutdown قصد إيقافه."
 
 #: ../kshutdown/mactioneditdialog.cpp:113
-msgid "If you are using KDE and KDM (KDE Display Manager), then set all methods to KDE"
-msgstr "إذا كنت تستعمل KDE وKDM، استعمل KDE قي كل الوظائف."
+msgid "If you are using KDE and TDM (KDE Display Manager), then set all methods to KDE"
+msgstr "إذا كنت تستعمل KDE وTDM، استعمل KDE قي كل الوظائف."
 
 #: ../kshutdown/mactioneditdialog.cpp:114
-msgid "If you are using KDE and display manager different than KDM, then set Turn Off Computer and Restart Computer methods to /sbin/..."
-msgstr "إذا كنت تستعمل KDE  ومدير جلسات غير KDM، اكتب /sbin في خانات إغلاق الحاسوب و<أعد تشغيل الحاسوب"
+msgid "If you are using KDE and display manager different than TDM, then set Turn Off Computer and Restart Computer methods to /sbin/..."
+msgstr "إذا كنت تستعمل KDE  ومدير جلسات غير TDM، اكتب /sbin في خانات إغلاق الحاسوب و<أعد تشغيل الحاسوب"
 
 #: ../kshutdown/mactioneditdialog.cpp:116
 msgid "Manuals:"
diff --git a/po/bg.po b/po/bg.po
index b7bf233..3e55321 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -679,12 +679,12 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
-"KDM не работи\n"
+"TDM не работи\n"
 "или опцията \"изключване/рестартиране\" е изключена.\n"
 "\n"
-"Конфигуриране на KDM."
+"Конфигуриране на TDM."
 
 #: ../kshutdown/mactioneditdialog.cpp:72
 msgid "Select a method:"
@@ -716,17 +716,17 @@ msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:113
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
-msgstr "Ако използвате KDE и KDM (KDE Display Manager), тогава настройте всички методи на KDE"
+msgstr "Ако използвате KDE и TDM (KDE Display Manager), тогава настройте всички методи на KDE"
 
 #: ../kshutdown/mactioneditdialog.cpp:114
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
-"Ако използвате KDE и мениджърът не е KDM, тогава настройте методите за Изключване на компютъра и Рестартиране на компютъра на /"
+"Ако използвате KDE и мениджърът не е TDM, тогава настройте методите за Изключване на компютъра и Рестартиране на компютъра на /"
 "sbin/..."
 
 #: ../kshutdown/mactioneditdialog.cpp:116
diff --git a/po/cs.po b/po/cs.po
index 7e95afe..7244dd0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -250,19 +250,19 @@ msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:111
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"Používáte-li KDE a KDM (správce sezení KDE), nastavte všechny "
+"Používáte-li KDE a TDM (správce sezení KDE), nastavte všechny "
 "metody na KDE."
 
 #: ../kshutdown/mactioneditdialog.cpp:112
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
-"Používáte-li KDE a jiného správce sezení než KDM, nastavte "
+"Používáte-li KDE a jiného správce sezení než TDM, nastavte "
 "metody Vypnout počítač a Restartovat počítač na /sbin/...."
 
@@ -758,12 +758,12 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
-"Není spuštěn Správce přihlášení KDE (KDM)\n"
+"Není spuštěn Správce přihlášení KDE (TDM)\n"
 "nebo není povolena funkce vypnout/restartovat.\n"
 "\n"
-"Kliknutím sem můžete KDM nastavit."
+"Kliknutím sem můžete TDM nastavit."
 
 #: ../kshutdown/_translatorinfo.cpp:1 _translatorinfo.cpp:1
 msgid ""
diff --git a/po/de.po b/po/de.po
index 971a84b..9351bdf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -694,12 +694,12 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
-"KDM läuft nicht oder die Herunterfahren/Neustarten-\n"
+"TDM läuft nicht oder die Herunterfahren/Neustarten-\n"
 "Funktion ist deaktiviert.\n"
 "\n"
-"Hier klicken um KDM einzurichten."
+"Hier klicken um TDM einzurichten."
 
 #: ../kshutdown/mactioneditdialog.cpp:72
 msgid "Select a method:"
@@ -731,19 +731,19 @@ msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:113
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"Falls Sie KDE und KDM (KDE Display Manager) benutzen, stellen "
+"Falls Sie KDE und TDM (KDE Display Manager) benutzen, stellen "
 "Sie alle Methoden auf KDE"
 
 #: ../kshutdown/mactioneditdialog.cpp:114
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
-"Falls Sie KDE und einen anderen Displaymanager als KDM "
+"Falls Sie KDE und einen anderen Displaymanager als TDM "
 "verwenden, dann setzen sie die Methoden fürHerunterfahren und "
 "Neustarten auf /sbin/..."
 
diff --git a/po/el.po b/po/el.po
index c37b1cc..5a7046f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -698,12 +698,12 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
 "Ο διαχειριστής συνεδρίας του KDE δεν εκτελείται,\n"
 "ή η ενέργεια κλείσιμο/επανεκκίνηση είναι απενεργοποιημένη.\n"
 "\n"
-"Κάντε κλικ εδώ για να ρυθμίσετε το KDM."
+"Κάντε κλικ εδώ για να ρυθμίσετε το TDM."
 
 #: ../kshutdown/mactioneditdialog.cpp:72
 msgid "Select a method:"
@@ -736,20 +736,20 @@ msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:113
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"Αν χρησιμοποιείτε το KDE και το KDM (Διαχειριστής συνεδρίας "
+"Αν χρησιμοποιείτε το KDE και το TDM (Διαχειριστής συνεδρίας "
 "του KDE), ορίστε όλες τις μεθόδους σε KDE"
 
 #: ../kshutdown/mactioneditdialog.cpp:114
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
 "Αν χρησιμοποιείτε το KDE και διαχειριστή συνεδρίας διαφορετικό του "
-"KDM, ορίστε τις μεθόδους Κλείσιμο υπολογιστή και "
+"TDM, ορίστε τις μεθόδους Κλείσιμο υπολογιστή και "
 "Επανεκκίνηση υπολογιστή σε /sbin/..."
 
 #: ../kshutdown/mactioneditdialog.cpp:116
diff --git a/po/es.po b/po/es.po
index 4e6614c..9b07681 100644
--- a/po/es.po
+++ b/po/es.po
@@ -175,19 +175,19 @@ msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:110
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"Si está usando KDE y KDM (Gestor de Sesiones de KDE), "
+"Si está usando KDE y TDM (Gestor de Sesiones de KDE), "
 "establezca todos los métodos a KDE"
 
 #: ../kshutdown/mactioneditdialog.cpp:111
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
-"Si está usando KDE y un gestor de sesiones diferente a KDM, "
+"Si está usando KDE y un gestor de sesiones diferente a TDM, "
 "establezca los métodos Apagar el equipo y Reiniciar el equipo "
 "a /sbin/..."
 
@@ -695,12 +695,12 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
 "El gestor de sesiones de KDE no está en funcionamiento,\n"
 "o la función de apagar/reiniciar está deshabilitada.\n"
 "\n"
-"Pulse aquí para configurar KDM."
+"Pulse aquí para configurar TDM."
 
 #: ../kshutdown/actions.cpp:66
 msgid "Please wait..."
diff --git a/po/fr.po b/po/fr.po
index b3bc503..b0eac30 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -686,7 +686,7 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:72
@@ -714,12 +714,12 @@ msgid "In most cases you need privileges to shut down system (e.g. run /sbin/shu
 msgstr "Dans la plupart des cas vous devez avoir des privilèges pour pouvoir éteindre le système (e.g. exécuter /sbin/shutdown)"
 
 #: ../kshutdown/mactioneditdialog.cpp:113
-msgid "If you are using KDE and KDM (KDE Display Manager), then set all methods to KDE"
+msgid "If you are using KDE and TDM (KDE Display Manager), then set all methods to KDE"
 msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:114
-msgid "If you are using KDE and display manager different than KDM, then set Turn Off Computer and Restart Computer methods to /sbin/..."
-msgstr "Si vous utilisez KDE et un gestionnaire d'affichage différent de KDM, alors configurez Éteindre l'ordinateur et Redémarrer l'ordinateur pour utiliser /sbin/..."
+msgid "If you are using KDE and display manager different than TDM, then set Turn Off Computer and Restart Computer methods to /sbin/..."
+msgstr "Si vous utilisez KDE et un gestionnaire d'affichage différent de TDM, alors configurez Éteindre l'ordinateur et Redémarrer l'ordinateur pour utiliser /sbin/..."
 
 #: ../kshutdown/mactioneditdialog.cpp:116
 msgid "Manuals:"
diff --git a/po/hu.po b/po/hu.po
index 1bda21a..0ee3a17 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -726,7 +726,7 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:72
@@ -763,19 +763,19 @@ msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:113
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"Ha te KDE és KDM-et (KDE Display Manager) használsz akkor "
+"Ha te KDE és TDM-et (KDE Display Manager) használsz akkor "
 "állitsad be az összes módot a KDE-hez"
 
 #: ../kshutdown/mactioneditdialog.cpp:114
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
-"Ha KDE vagy KDM-től különböző ablakkezelőt használsz be kell állítanod a "
+"Ha KDE vagy TDM-től különböző ablakkezelőt használsz be kell állítanod a "
 "Shut Down és Reboot módot /sbin/...-ben"
 
 #: ../kshutdown/mactioneditdialog.cpp:116
diff --git a/po/it.po b/po/it.po
index 1dc66e3..ee3a95e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -253,19 +253,19 @@ msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:111
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"Se stai usando KDE e KDM (Gestore Display di KDE), "
+"Se stai usando KDE e TDM (Gestore Display di KDE), "
 "allora imposta tutti i metodi a KDE"
 
 #: ../kshutdown/mactioneditdialog.cpp:112
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
-"Se stai usando KDE e gestori di visulizzazione diversi da KDM, "
+"Se stai usando KDE e gestori di visulizzazione diversi da TDM, "
 "allora imposta i metodi Spegni computer e Riavvia computer a "
 "/sbin/..."
 
@@ -761,12 +761,12 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
 "Il Display Manager KDE no è avviato,\n"
 "oppure la funzione arresto/riavvia è stata disabilitata,\n"
 "\n"
-"Clicca qui per configurare KDM"
+"Clicca qui per configurare TDM"
 
 #: ../kshutdown/_translatorinfo.cpp:1 _translatorinfo.cpp:1
 msgid ""
diff --git a/po/nl.po b/po/nl.po
index fce2308..7294c23 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2006-04-22 18:03+0200\n"
 "PO-Revision-Date: 2004-04-21 22:47+0000\n"
 "Last-Translator: Bram Schoenmakers \n"
-"Language-Team: Nederlands \n"
+"Language-Team: Nederlands \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -724,7 +724,7 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:72
@@ -764,21 +764,21 @@ msgstr ""
 #: ../kshutdown/mactioneditdialog.cpp:113
 #, fuzzy
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"Wanneer u gebruik maakt van KDE en KDM (KDE Display Manager), "
+"Wanneer u gebruik maakt van KDE en TDM (KDE Display Manager), "
 "zet dan alle methoden op KDE"
 
 #: ../kshutdown/mactioneditdialog.cpp:114
 #, fuzzy
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
 "Wanneer u gebruik maakt van KDE en een andere display beheerder dan "
-"KDM, zet dan de methoden voor Uitschakelen en Herstarten "
+"TDM, zet dan de methoden voor Uitschakelen en Herstarten "
 "op op /sbin/..."
 
 #: ../kshutdown/mactioneditdialog.cpp:116
diff --git a/po/pl.po b/po/pl.po
index d276360..2acf083 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -251,19 +251,19 @@ msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:111
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"Jeśli używasz KDE i KDM (KDE Display Manager), ustaw wszystkie "
+"Jeśli używasz KDE i TDM (KDE Display Manager), ustaw wszystkie "
 "metody na KDE"
 
 #: ../kshutdown/mactioneditdialog.cpp:112
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
-"Jeśli używasz KDE i menedżera logowania innego niż KDM, ustaw "
+"Jeśli używasz KDE i menedżera logowania innego niż TDM, ustaw "
 "metody poleceń Wyłącz komputer i Uruchom ponownie na /"
 "sbin/..."
 
@@ -760,12 +760,12 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
 "Menedżer logowania KDE nie jest uruchomiony,\n"
 "lub funkcja zamykania/restartu jest wyłączona.\n"
 "\n"
-"Kliknij tutaj, aby skonfigurować KDM."
+"Kliknij tutaj, aby skonfigurować TDM."
 
 #: ../kshutdown/_translatorinfo.cpp:1 _translatorinfo.cpp:1
 msgid ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 19ee13b..f1b5a25 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -686,12 +686,12 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
 "O KDE Display Manager não está executando,\n"
 "ou oa função de desligar/reiniciar está desabilitada.\n"
 "\n"
-"Clique aqui para configurar o KDM."
+"Clique aqui para configurar o TDM."
 
 #: ../kshutdown/mactioneditdialog.cpp:72
 msgid "Select a method:"
@@ -723,20 +723,20 @@ msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:113
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"Se você estiver usando oKDE e o KDM (KDE Display Manager), entăo "
+"Se você estiver usando oKDE e o TDM (KDE Display Manager), entăo "
 "coloque todos os métodos para KDE"
 
 #: ../kshutdown/mactioneditdialog.cpp:114
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
 "Se vocę estiver usando KDE e um display manager diferente que o "
-"KDM, entăo coloque Desligar Computador e Reiniciar o "
+"TDM, entăo coloque Desligar Computador e Reiniciar o "
 "Computador métodos para /sbin/..."
 
 #: ../kshutdown/mactioneditdialog.cpp:116
diff --git a/po/ru.po b/po/ru.po
index 5911e49..e21348a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -725,7 +725,7 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:72
@@ -762,15 +762,15 @@ msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:113
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"Если вы используете KDE и KDM (KDE Display Manager), то "
+"Если вы используете KDE и TDM (KDE Display Manager), то "
 "используйте все методы для  KDE"
 
 #: ../kshutdown/mactioneditdialog.cpp:114
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 7d1323f..b27e22d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -680,12 +680,12 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
 "KDE Display Manager nie je spustený,\n"
 "alebo je vypnutá funkcia vypnutia/reštartu.\n"
 "\n"
-"Kliknite sem pre nastavenie KDM."
+"Kliknite sem pre nastavenie TDM."
 
 #: ../kshutdown/mactioneditdialog.cpp:72
 msgid "Select a method:"
@@ -717,19 +717,19 @@ msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:113
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"Ak používate KDE a KDM (správca sedení KDE), nastavte všetky "
+"Ak používate KDE a TDM (správca sedení KDE), nastavte všetky "
 "metódy na KDE"
 
 #: ../kshutdown/mactioneditdialog.cpp:114
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
-"Ak používate KDE a správcu sedení iný než KDM, nastavte metódy "
+"Ak používate KDE a správcu sedení iný než TDM, nastavte metódy "
 "Vypnúť a Reštartovať na /sbin/..."
 
 #: ../kshutdown/mactioneditdialog.cpp:116
diff --git a/po/sv.po b/po/sv.po
index 6756a96..4129ba9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -697,12 +697,12 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
 "Fönsterhanteraren KDE körs inte eller\n"
 "så är avstängning/omstartsfunktionen avstängd.\n"
 "\n"
-"Klicka här för att konfigurera KDM."
+"Klicka här för att konfigurera TDM."
 
 #: ../kshutdown/mactioneditdialog.cpp:72
 msgid "Select a method:"
@@ -734,19 +734,19 @@ msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:113
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"Om du använder KDE och KDM (KDE Skärmhanterare) så sätt alla "
+"Om du använder KDE och TDM (KDE Skärmhanterare) så sätt alla "
 "metoder till KDE"
 
 #: ../kshutdown/mactioneditdialog.cpp:114
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
-"Om du kör KDE och skärmhanteraren är en annan än KDM så sätt "
+"Om du kör KDE och skärmhanteraren är en annan än TDM så sätt "
 "metoderna för Stäng av datorn och Starta om datorn till /"
 "sbin/..."
 
diff --git a/po/tr.po b/po/tr.po
index 46f4e7c..461745d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -249,19 +249,19 @@ msgstr ""
 
 #: ../kshutdown/mactioneditdialog.cpp:111
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"Eğer KDE ve KDM kullanıyorsanız tüm yöntemleri KDE "
+"Eğer KDE ve TDM kullanıyorsanız tüm yöntemleri KDE "
 "olarak seçin"
 
 #: ../kshutdown/mactioneditdialog.cpp:112
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
-"Eğer KDE kullanıyorsanız ve KDM'dan farklı bir görüntü "
+"Eğer KDE kullanıyorsanız ve TDM'dan farklı bir görüntü "
 "yönetici kullanıyorsanız Bilgisayarı Kapat ve Bilgisayarı Yeniden "
 "Başlat yöntemlerini /sbin/... şeklinde ayarlayın."
 
@@ -756,12 +756,12 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
-"KDM çalışmıyor ya da\n"
+"TDM çalışmıyor ya da\n"
 "bilgisayarı kapat/yeniden başlat işlevleri pasifleştirilmiş.\n"
 "\n"
-"KDM'ı ayarlamak için buraya tıklayın."
+"TDM'ı ayarlamak için buraya tıklayın."
 
 #: ../kshutdown/_translatorinfo.cpp:1 _translatorinfo.cpp:1
 msgid ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4c227da..f012629 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -695,12 +695,12 @@ msgid ""
 "KDE Display Manager is not running,\n"
 "or the shut down/reboot function is disabled.\n"
 "\n"
-"Click here to configure KDM."
+"Click here to configure TDM."
 msgstr ""
 "KDE显示管理器没有运行，\n"
 "或者关闭／重启功能被取消.\n"
 "\n"
-"点击\"这里\"设置KDM"
+"点击\"这里\"设置TDM"
 
 #: ../kshutdown/mactioneditdialog.cpp:72
 msgid "Select a method:"
@@ -730,19 +730,19 @@ msgstr "多数情况下您需要有特权才能关闭系统（例如运行 /sbin
 
 #: ../kshutdown/mactioneditdialog.cpp:113
 msgid ""
-"If you are using KDE and KDM (KDE Display Manager), then set "
+"If you are using KDE and TDM (KDE Display Manager), then set "
 "all methods to KDE"
 msgstr ""
-"如果您正在使用KDE 和 KDM (KDE显示管理器)，设置所有模式为"
+"如果您正在使用KDE 和 TDM (KDE显示管理器)，设置所有模式为"
 "KDE"
 
 #: ../kshutdown/mactioneditdialog.cpp:114
 msgid ""
-"If you are using KDE and display manager different than KDM, "
+"If you are using KDE and display manager different than TDM, "
 "then set Turn Off Computer and Restart Computer methods to /"
 "sbin/..."
 msgstr ""
-"如果您正在使用KDE，显示管理器与KDM不同,则设置关闭计算机 "
+"如果您正在使用KDE，显示管理器与TDM不同,则设置关闭计算机 "
 "和 重启计算机 方式为 /sbin/..."
 
 #: ../kshutdown/mactioneditdialog.cpp:116