Browse Source

Initial TDE conversion

tags/r14.0.0
Slávek Banko 5 years ago
parent
commit
338a4464b5
66 changed files with 521 additions and 521 deletions
  1. 4
    4
      ChangeLog
  2. 6
    6
      Setup
  3. 133
    133
      acinclude.m4
  4. 7
    7
      configure.in
  5. 5
    5
      configure.in.in
  6. 3
    3
      extras/hibernate.desktop
  7. 2
    2
      extras/multimedia/juk.desktop
  8. 2
    2
      extras/multimedia/kaffeine.desktop
  9. 3
    3
      extras/multimedia/kdetv.desktop
  10. 2
    2
      extras/multimedia/kscd.desktop
  11. 2
    2
      extras/multimedia/noatun.desktop
  12. 2
    2
      extras/shutdown/cancelshutdown.desktop
  13. 2
    2
      extras/shutdown/fsck.desktop
  14. 2
    2
      extras/system/adsl-stop.desktop
  15. 2
    2
      extras/system/kdeeject.desktop
  16. 2
    2
      extras/system/kppp.desktop
  17. 2
    2
      kshutdown-mdk.spec
  18. 3
    3
      kshutdown-suse.spec
  19. 4
    4
      kshutdown.kdevelop
  20. 3
    3
      kshutdown.spec
  21. 3
    3
      kshutdown/Makefile.am
  22. 10
    10
      kshutdown/actions.cpp
  23. 3
    3
      kshutdown/actions.h
  24. 2
    2
      kshutdown/appobserver.cpp
  25. 2
    2
      kshutdown/configuration.h
  26. 3
    3
      kshutdown/confirmation.cpp
  27. 10
    10
      kshutdown/extras.cpp
  28. 3
    3
      kshutdown/extras.h
  29. 8
    8
      kshutdown/kshutdown.desktop
  30. 5
    5
      kshutdown/links.cpp
  31. 6
    6
      kshutdown/mactioneditdialog.cpp
  32. 17
    17
      kshutdown/main.cpp
  33. 12
    12
      kshutdown/miscutils.cpp
  34. 4
    4
      kshutdown/miscutils.h
  35. 35
    35
      kshutdown/mmainwindow.cpp
  36. 14
    14
      kshutdown/mmainwindow.h
  37. 3
    3
      kshutdown/mmessagedialog.cpp
  38. 21
    21
      kshutdown/msettingsdialog.cpp
  39. 8
    8
      kshutdown/msettingsdialog.h
  40. 2
    2
      kshutdown/mstatstab.cpp
  41. 8
    8
      kshutdown/msystemtray.cpp
  42. 1
    1
      kshutdown/mtip.cpp
  43. 4
    4
      kshutdown/progressbar.cpp
  44. 10
    10
      kshutdown/systemconfig.cpp
  45. 6
    6
      kshutdown/systemconfig.h
  46. 1
    1
      kshutdownlockout/Makefile.am
  47. 2
    2
      kshutdownlockout/kshutdownlockout.desktop
  48. 23
    23
      kshutdownlockout/lockout.cpp
  49. 2
    2
      kshutdownlockout/lockout.h
  50. 7
    7
      po/ar.po
  51. 7
    7
      po/bg.po
  52. 7
    7
      po/cs.po
  53. 7
    7
      po/de.po
  54. 6
    6
      po/el.po
  55. 6
    6
      po/es.po
  56. 4
    4
      po/fr.po
  57. 5
    5
      po/hu.po
  58. 6
    6
      po/it.po
  59. 6
    6
      po/nl.po
  60. 6
    6
      po/pl.po
  61. 6
    6
      po/pt_BR.po
  62. 4
    4
      po/ru.po
  63. 6
    6
      po/sk.po
  64. 6
    6
      po/sv.po
  65. 7
    7
      po/tr.po
  66. 6
    6
      po/zh_CN.po

+ 4
- 4
ChangeLog View File

@@ -107,7 +107,7 @@
107 107
 - Removed the Authors tab from the About dialog
108 108
 - Setup: Fast compilation is now enabled by default (--enable-final)
109 109
 - Updated documentation
110
-- Setup: "kdesu" instead of "su" (works on both Fedora and Kubuntu)
110
+- Setup: "tdesu" instead of "su" (works on both Fedora and Kubuntu)
111 111
 
112 112
 2005/10/18  0.7.1 Beta
113 113
 - NEW: Ability to execute a specified action when selected application exit
@@ -119,13 +119,13 @@
119 119
 - Updated Handbook
120 120
 - Removed obsolete FAQ
121 121
 - Removed "locolor" icon
122
-- RPM .spec: Removed "kdebase" dependency
122
+- RPM .spec: Removed "tdebase" dependency
123 123
 - Removed deprecated Wizard and Scheduler functions
124
-- NEW: "Shut Down" and "Reboot" commands are now disabled if KDM is not running.
124
+- NEW: "Shut Down" and "Reboot" commands are now disabled if TDM is not running.
125 125
   To enable these commands go to "Settings" -> "Configure KShutDown" -> "Actions",
126 126
   and set methods to "/sbin/...", "poweroff" or "reboot".
127 127
 - NEW: Balloon popup messages based on the "kdialog" program
128
-- QListView* -> KListView*
128
+- QListView* -> TDEListView*
129 129
 - Improved and fixed KDE Kiosk support
130 130
 - FIXED: System tray icon hidding option
131 131
 - FIXED: Confirmation message box position

+ 6
- 6
Setup View File

@@ -13,7 +13,7 @@ META_VERSION="`cat VERSION`"
13 13
 #fi
14 14
 
15 15
 # installation dirs
16
-DEFAULT_DIR=`kde-config --prefix`
16
+DEFAULT_DIR=`tde-config --prefix`
17 17
 if [ -z "$DEFAULT_DIR" ]; then
18 18
 	DEFAULT_DIR="/usr"
19 19
 fi
@@ -47,7 +47,7 @@ I18N_COMP_FAILED="Compilation failed!"
47 47
 I18N_CONF_FAILED="Configuration failed!"
48 48
 I18N_COMP_START="Compiling..."
49 49
 I18N_MINU="       This may take a few minutes."
50
-I18N_MISSING_DEPEN1="Make sure you have installed the 'kdelibs-devel' package"
50
+I18N_MISSING_DEPEN1="Make sure you have installed the 'tdelibs-devel' package"
51 51
 I18N_MISSING_DEPEN2="       which is required to compile any KDE application."
52 52
 I18N_ENTER_DIR="Enter a new prefix"
53 53
 I18N_SETUP="Setup"
@@ -73,7 +73,7 @@ if [[ ("$LANG" == "pl_PL.UTF-8") || ("$LANG" == "pl_PL") || ("$LANG" == "pl") ]]
73 73
 	I18N_CONF_FAILED="Konfiguracja nie powiodla sie!"
74 74
 	I18N_COMP_START="Kompilowanie..."
75 75
 	I18N_MINU="       To moze potrwac kilka minut."
76
-	I18N_MISSING_DEPEN1="Upewnij sie, ze masz zainstalowana paczke 'kdelibs-devel',"
76
+	I18N_MISSING_DEPEN1="Upewnij sie, ze masz zainstalowana paczke 'tdelibs-devel',"
77 77
 	I18N_MISSING_DEPEN2="            ktora jest wymagana do kompilacji jakiejkolwiek aplikacji KDE."
78 78
 	I18N_ENTER_DIR="Wprowadz nowy prefix"
79 79
 	I18N_SETUP="Instalator"
@@ -100,7 +100,7 @@ if [[ ("$LANG" == "it_IT.UTF-8") || ("$LANG" == "it_IT") || ("$LANG" == "it") ]]
100 100
 	I18N_CONF_FAILED="Configurazione fallita!"
101 101
 	I18N_COMP_START="Compilazione..."
102 102
 	I18N_MINU="       Per questo potrebbero volerci alcuni minuti."
103
-	I18N_MISSING_DEPEN1="Assicurati di aver installato il pacchetto 'kdelibs-devel'"
103
+	I18N_MISSING_DEPEN1="Assicurati di aver installato il pacchetto 'tdelibs-devel'"
104 104
 	I18N_MISSING_DEPEN2="       che è necessario per compilare ogni applicazione KDE."
105 105
 	I18N_ENTER_DIR="Inserisci una nuova destinazione"
106 106
 	I18N_SETUP="Installazione"
@@ -157,7 +157,7 @@ ks_show_menu()
157 157
 	echo
158 158
 	echo
159 159
 	echo -e "    ${KEY_C}${I18N_TITLE_SETUP}${DEF_C}"
160
-	echo -e "    [${KEY_C}i${DEF_C}] $I18N_INSTALL (./configure --prefix=${INSTALL_DIR}, make, kdesu -c \"make install\")"
160
+	echo -e "    [${KEY_C}i${DEF_C}] $I18N_INSTALL (./configure --prefix=${INSTALL_DIR}, make, tdesu -c \"make install\")"
161 161
 	echo -e "    [${KEY_C}p${DEF_C}] $I18N_CHANGE_DIR"
162 162
 	if [ -n "$FAST_COMPILATION" ]; then
163 163
 		echo -e "    [${KEY_C}f${DEF_C}] $I18N_DISABLE_FAST";
@@ -207,7 +207,7 @@ while [ 1 ]; do
207 207
 						ks_kill "$I18N_INST_FAILED"
208 208
 					fi
209 209
 				else
210
-					if kdesu -c "make install"; then
210
+					if tdesu -c "make install"; then
211 211
 						ks_show_finish_info
212 212
 						ks_quit
213 213
 					else

+ 133
- 133
acinclude.m4 View File

@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
23 23
 dnl Please do not modify this file unless you expect your modifications to be
24 24
 dnl carried into every other module in the repository. 
25 25
 dnl
26
-dnl Single-module modifications are best placed in configure.in for kdelibs
27
-dnl and kdebase or configure.in.in if present.
26
+dnl Single-module modifications are best placed in configure.in for tdelibs
27
+dnl and tdebase or configure.in.in if present.
28 28
 
29 29
 # KDE_PATH_X_DIRECT
30 30
 dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,41 @@ ac_x_libraries=],
103 103
 [LIBS="$ac_save_LIBS"
104 104
 # First see if replacing the include by lib works.
105 105
 # Check X11 before X11Rn because it is often a symlink to the current release.
106
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
107
-    /usr/X11/lib${kdelibsuff}           \
108
-    /usr/X11R6/lib${kdelibsuff}         \
109
-    /usr/X11R5/lib${kdelibsuff}         \
110
-    /usr/X11R4/lib${kdelibsuff}         \
106
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
107
+    /usr/X11/lib${tdelibsuff}           \
108
+    /usr/X11R6/lib${tdelibsuff}         \
109
+    /usr/X11R5/lib${tdelibsuff}         \
110
+    /usr/X11R4/lib${tdelibsuff}         \
111 111
                                         \
112
-    /usr/lib${kdelibsuff}/X11           \
113
-    /usr/lib${kdelibsuff}/X11R6         \
114
-    /usr/lib${kdelibsuff}/X11R5         \
115
-    /usr/lib${kdelibsuff}/X11R4         \
112
+    /usr/lib${tdelibsuff}/X11           \
113
+    /usr/lib${tdelibsuff}/X11R6         \
114
+    /usr/lib${tdelibsuff}/X11R5         \
115
+    /usr/lib${tdelibsuff}/X11R4         \
116 116
                                         \
117
-    /usr/local/X11/lib${kdelibsuff}     \
118
-    /usr/local/X11R6/lib${kdelibsuff}   \
119
-    /usr/local/X11R5/lib${kdelibsuff}   \
120
-    /usr/local/X11R4/lib${kdelibsuff}   \
117
+    /usr/local/X11/lib${tdelibsuff}     \
118
+    /usr/local/X11R6/lib${tdelibsuff}   \
119
+    /usr/local/X11R5/lib${tdelibsuff}   \
120
+    /usr/local/X11R4/lib${tdelibsuff}   \
121 121
                                         \
122
-    /usr/local/lib${kdelibsuff}/X11     \
123
-    /usr/local/lib${kdelibsuff}/X11R6   \
124
-    /usr/local/lib${kdelibsuff}/X11R5   \
125
-    /usr/local/lib${kdelibsuff}/X11R4   \
122
+    /usr/local/lib${tdelibsuff}/X11     \
123
+    /usr/local/lib${tdelibsuff}/X11R6   \
124
+    /usr/local/lib${tdelibsuff}/X11R5   \
125
+    /usr/local/lib${tdelibsuff}/X11R4   \
126 126
                                         \
127
-    /usr/X386/lib${kdelibsuff}          \
128
-    /usr/x386/lib${kdelibsuff}          \
129
-    /usr/XFree86/lib${kdelibsuff}/X11   \
127
+    /usr/X386/lib${tdelibsuff}          \
128
+    /usr/x386/lib${tdelibsuff}          \
129
+    /usr/XFree86/lib${tdelibsuff}/X11   \
130 130
                                         \
131
-    /usr/lib${kdelibsuff}               \
132
-    /usr/local/lib${kdelibsuff}         \
133
-    /usr/unsupported/lib${kdelibsuff}   \
134
-    /usr/athena/lib${kdelibsuff}        \
135
-    /usr/local/x11r5/lib${kdelibsuff}   \
136
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
137
-    /lib/usr/lib${kdelibsuff}/X11       \
131
+    /usr/lib${tdelibsuff}               \
132
+    /usr/local/lib${tdelibsuff}         \
133
+    /usr/unsupported/lib${tdelibsuff}   \
134
+    /usr/athena/lib${tdelibsuff}        \
135
+    /usr/local/x11r5/lib${tdelibsuff}   \
136
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
137
+    /lib/usr/lib${tdelibsuff}/X11       \
138 138
                                         \
139
-    /usr/openwin/lib${kdelibsuff}       \
140
-    /usr/openwin/share/lib${kdelibsuff} \
139
+    /usr/openwin/lib${tdelibsuff}       \
140
+    /usr/openwin/share/lib${tdelibsuff} \
141 141
     ; \
142 142
 do
143 143
 dnl Don't even attempt the hair of trying to link an X program!
@@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
371 371
   fi
372 372
 
373 373
 AC_MSG_CHECKING([for KDE libraries installed])
374
-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'
374
+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'
375 375
 
376 376
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
377 377
   AC_MSG_RESULT(yes)
378 378
 else
379 379
   AC_MSG_ERROR([your system fails at linking a small KDE application!
380 380
 Check, if your compiler is installed correctly and if you have used the
381
-same compiler to compile Qt and kdelibs as you did use now.
381
+same compiler to compile Qt and tdelibs as you did use now.
382 382
 For more details about this problem, look at the end of config.log.])
383 383
 fi
384 384
 
385
-if eval `KDEDIR= ./conftest 2>&5`; then
385
+if eval `TDEDIR= ./conftest 2>&5`; then
386 386
   kde_result=done
387 387
 else
388 388
   kde_result=problems
389 389
 fi
390 390
 
391
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
391
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
392 392
 kde_have_all_paths=yes
393 393
 
394 394
 KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
547 547
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
548 548
 [
549 549
     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"
550
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
551
-    if test -n "$KDEDIRS"; then
550
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
551
+    if test -n "$TDEDIRS"; then
552 552
        kde_save_IFS=$IFS
553 553
        IFS=:
554
-       for dir in $KDEDIRS; do
554
+       for dir in $TDEDIRS; do
555 555
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
556 556
        done
557 557
        IFS=$kde_save_IFS
@@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
602 602
         fi
603 603
 
604 604
         if test -n "$kde32ornewer"; then
605
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
605
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
606 606
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
607 607
         fi
608 608
         if test -n "$kde33ornewer"; then
609
-            KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
609
+            KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
610 610
             AC_SUBST(MAKEKDEWIDGETS)
611 611
         fi
612 612
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
613 613
 
614 614
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
615 615
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
616
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
616
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
617 617
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
618 618
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
619 619
 		KDE_XSL_STYLESHEET=""
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
710 710
 AC_SUBST(kde_servicesdir)
711 711
 AC_SUBST(kde_servicetypesdir)
712 712
 AC_SUBST(kde_moduledir)
713
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
713
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
714 714
 AC_SUBST(kde_styledir)
715 715
 AC_SUBST(kde_widgetdir)
716 716
 if test "$kde_qtver" = 1; then
@@ -937,7 +937,7 @@ mips-sgi-irix6*)
937 937
     ac_x_includes="."
938 938
   fi
939 939
   if test -z "$ac_x_libraries"; then
940
-    ac_x_libraries="/usr/lib${kdelibsuff}"
940
+    ac_x_libraries="/usr/lib${tdelibsuff}"
941 941
   fi
942 942
 esac
943 943
 #from now on we use our own again
@@ -1418,7 +1418,7 @@ qt_includes=""
1418 1418
 AC_ARG_WITH(qt-dir,
1419 1419
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
1420 1420
     [  ac_qt_includes="$withval"/include
1421
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
1421
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
1422 1422
        ac_qt_bindir="$withval"/bin
1423 1423
     ])
1424 1424
 
@@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
1459 1459
 
1460 1460
 qt_libdirs=""
1461 1461
 for dir in $kde_qt_dirs; do
1462
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
1462
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
1463 1463
 done
1464 1464
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1465 1465
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
1644 1644
 AC_MSG_RESULT([$kde_cv_uic_plugins])
1645 1645
 if test "$kde_cv_uic_plugins" != yes; then
1646 1646
 	AC_MSG_ERROR([
1647
-you need to install kdelibs first.
1647
+you need to install tdelibs first.
1648 1648
 
1649
-If you did install kdelibs, then the Qt version that is picked up by
1650
-this configure is not the same version you used to compile kdelibs. 
1651
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
1649
+If you did install tdelibs, then the Qt version that is picked up by
1650
+this configure is not the same version you used to compile tdelibs. 
1651
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the 
1652 1652
 _same Qt version_, compiled with the _same compiler_ and the same Qt
1653 1653
 configuration settings.
1654 1654
 ])
@@ -1785,16 +1785,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
1785 1785
 
1786 1786
 if test "$kde_qtver" = 1; then
1787 1787
   kde_check_header="ksock.h"
1788
-  kde_check_lib="libkdecore.la"
1788
+  kde_check_lib="libtdecore.la"
1789 1789
 else
1790 1790
   kde_check_header="ksharedptr.h"
1791
-  kde_check_lib="libkio.la"
1791
+  kde_check_lib="libtdeio.la"
1792 1792
 fi
1793 1793
 
1794 1794
 if test -z "$1"; then
1795 1795
 
1796
-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"
1797
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1796
+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"
1797
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
1798 1798
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1799 1799
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
1800 1800
 ac_kde_includes="$kde_incdir"
@@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
1805 1805
 So, check this please and use another prefix!])
1806 1806
 fi
1807 1807
 
1808
-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}"
1809
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1808
+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}"
1809
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
1810 1810
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1811 1811
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1812 1812
 ac_kde_libraries="$kde_libdir"
@@ -1824,7 +1824,7 @@ fi
1824 1824
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
1825 1825
 AC_MSG_ERROR([
1826 1826
 I can't find the designer plugins. These are required and should have been installed
1827
-by kdelibs])
1827
+by tdelibs])
1828 1828
 fi
1829 1829
 
1830 1830
 if test -n "$kde_widgetdir"; then
@@ -1839,7 +1839,7 @@ else
1839 1839
     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
1840 1840
 fi
1841 1841
 
1842
-else dnl test -z $1, e.g. from kdelibs
1842
+else dnl test -z $1, e.g. from tdelibs
1843 1843
 
1844 1844
   ac_cv_have_kde="have_kde=no"
1845 1845
 
@@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
1979 1979
 #include <kapp.h>
1980 1980
 
1981 1981
 int main() {
1982
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
1983
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
1984
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
1985
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
1986
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
1987
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
1988
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
1989
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
1990
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
1991
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
1982
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
1983
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
1984
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
1985
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
1986
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
1987
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
1988
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
1989
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
1990
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
1991
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
1992 1992
     printf("kde_wallpaperdir=\\"%s\\"\n",
1993
-	KApplication::kde_wallpaperdir().data());
1994
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
1995
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
1993
+	TDEApplication::kde_wallpaperdir().data());
1994
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
1995
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
1996 1996
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
1997 1997
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
1998 1998
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
2030 2030
  kde_cxxflags_safe="$CXXFLAGS"
2031 2031
 
2032 2032
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
2033
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
2033
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
2034 2034
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
2035 2035
 
2036 2036
  AC_TRY_LINK([
@@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
2064 2064
 
2065 2065
 if test $kde_qtver = 3; then
2066 2066
    case $host in 
2067
-               *cygwin*) lib_kded="-lkdeinit_kded" ;;
2067
+               *cygwin*) lib_kded="-ltdeinit_kded" ;;
2068 2068
                *) lib_kded="" ;;
2069 2069
        esac
2070 2070
    AC_SUBST(LIB_KDED, $lib_kded)
2071
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2072
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2073
-   AC_SUBST(LIB_KIO, "-lkio")
2071
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2072
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2073
+   AC_SUBST(LIB_KIO, "-ltdeio")
2074 2074
    AC_SUBST(LIB_KJS, "-lkjs")
2075 2075
    AC_SUBST(LIB_SMB, "-lsmb")
2076 2076
    AC_SUBST(LIB_KAB, "-lkab")
2077
-   AC_SUBST(LIB_KABC, "-lkabc")
2078
-   AC_SUBST(LIB_KHTML, "-lkhtml")
2079
-   AC_SUBST(LIB_KSPELL, "-lkspell")
2080
-   AC_SUBST(LIB_KPARTS, "-lkparts")
2081
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2082
-   AC_SUBST(LIB_KUTILS, "-lkutils")
2083
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
2084
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
2077
+   AC_SUBST(LIB_KABC, "-ltdeabc")
2078
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2079
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
2080
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2081
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2082
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
2083
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
2084
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
2085 2085
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
2086
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
2087
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
2086
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
2087
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
2088 2088
 # these are for backward compatibility
2089
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
2090
-   AC_SUBST(LIB_KFILE, "-lkio")
2089
+   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
2090
+   AC_SUBST(LIB_KFILE, "-ltdeio")
2091 2091
 elif test $kde_qtver = 2; then
2092
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2093
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2094
-   AC_SUBST(LIB_KIO, "-lkio")
2095
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
2092
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2093
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2094
+   AC_SUBST(LIB_KIO, "-ltdeio")
2095
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2096 2096
    AC_SUBST(LIB_SMB, "-lsmb")
2097
-   AC_SUBST(LIB_KFILE, "-lkfile")
2097
+   AC_SUBST(LIB_KFILE, "-ltdefile")
2098 2098
    AC_SUBST(LIB_KAB, "-lkab")
2099
-   AC_SUBST(LIB_KHTML, "-lkhtml")
2100
-   AC_SUBST(LIB_KSPELL, "-lkspell")
2101
-   AC_SUBST(LIB_KPARTS, "-lkparts")
2102
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2099
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2100
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
2101
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2102
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2103 2103
 else
2104
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
2105
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
2106
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
2107
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
2108
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
2104
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2105
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2106
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2107
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
2108
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
2109 2109
 fi
2110 2110
 ])
2111 2111
 
@@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
2170 2170
 else
2171 2171
   case "$1" in
2172 2172
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
2173
-		kde_cv_proto_$1="yes - in libkdefakes"
2173
+		kde_cv_proto_$1="yes - in libtdefakes"
2174 2174
 		;;
2175 2175
 	*)
2176 2176
 		kde_cv_proto_$1=unknown
@@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
2489 2489
   AC_MSG_RESULT(yes)
2490 2490
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
2491 2491
 else
2492
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
2492
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
2493 2493
 fi
2494 2494
 ])
2495 2495
 
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
2547 2547
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
2548 2548
 
2549 2549
 dnl if headers _and_ libraries are missing, this is no error, and we
2550
-dnl continue with a warning (the user will get no jpeg support in khtml)
2550
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
2551 2551
 dnl if only one is missing, it means a configuration error, but we still
2552 2552
 dnl only warn
2553 2553
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3447,7 +3447,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
3447 3447
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
3448 3448
 AC_SUBST(KDE_PLUGIN)
3449 3449
 
3450
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
3450
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
3451 3451
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
3452 3452
 AC_SUBST(KDE_CHECK_PLUGIN)
3453 3453
 
@@ -3457,29 +3457,29 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
3457 3457
 
3458 3458
 AC_DEFUN([KDE_CHECK_LIB64],
3459 3459
 [
3460
-    kdelibsuff="$kde_libs_suffix"
3461
-    if test -z "$kdelibsuff"; then
3462
-       kdelibsuff=no
3460
+    tdelibsuff="$kde_libs_suffix"
3461
+    if test -z "$tdelibsuff"; then
3462
+       tdelibsuff=no
3463 3463
     fi
3464 3464
     AC_ARG_ENABLE(libsuffix,
3465 3465
         AC_HELP_STRING([--enable-libsuffix],
3466 3466
             [/lib directory suffix (64,32,none[=default])]),
3467
-            kdelibsuff=$enableval)
3467
+            tdelibsuff=$enableval)
3468 3468
     # TODO: add an auto case that compiles a little C app to check
3469 3469
     # where the glibc is
3470
-    if test "$kdelibsuff" = "no"; then
3471
-       kdelibsuff=
3470
+    if test "$tdelibsuff" = "no"; then
3471
+       tdelibsuff=
3472 3472
     fi
3473
-    if test -z "$kdelibsuff"; then
3473
+    if test -z "$tdelibsuff"; then
3474 3474
         AC_MSG_RESULT([not using lib directory suffix])
3475 3475
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
3476 3476
     else
3477 3477
         if test "$libdir" = '${exec_prefix}/lib'; then
3478
-            libdir="$libdir${kdelibsuff}"
3478
+            libdir="$libdir${tdelibsuff}"
3479 3479
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
3480 3480
         fi
3481
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
3482
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
3481
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
3482
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
3483 3483
     fi
3484 3484
 ])
3485 3485
 
@@ -3497,7 +3497,7 @@ AC_CANONICAL_SYSTEM
3497 3497
 AC_ARG_PROGRAM
3498 3498
 AM_INIT_AUTOMAKE($1, $2)
3499 3499
 AM_DISABLE_LIBRARIES
3500
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
3500
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
3501 3501
 AC_CHECK_COMPILERS
3502 3502
 KDE_PROG_LIBTOOL
3503 3503
 AM_KDE_WITH_NLS
@@ -4504,7 +4504,7 @@ fi
4504 4504
 
4505 4505
 PYTHONINC=-I$python_incdir
4506 4506
 
4507
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
4507
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
4508 4508
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
4509 4509
 if test ! -r $python_libdir/libpython$version.so; then
4510 4510
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -4892,14 +4892,14 @@ AC_DEFUN([KDE_CONF_FILES],
4892 4892
   AC_SUBST(CONF_FILES)
4893 4893
 ])dnl
4894 4894
 
4895
-dnl This sets the prefix, for arts and kdelibs
4895
+dnl This sets the prefix, for arts and tdelibs
4896 4896
 dnl Do NOT use in any other module.
4897
-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
4897
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
4898 4898
 AC_DEFUN([KDE_SET_PREFIX_CORE],
4899 4899
 [
4900 4900
   unset CDPATH
4901
-  dnl make $KDEDIR the default for the installation
4902
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
4901
+  dnl make $TDEDIR the default for the installation
4902
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
4903 4903
 
4904 4904
   if test "x$prefix" = "xNONE"; then
4905 4905
     prefix=$ac_default_prefix
@@ -4923,25 +4923,25 @@ AC_DEFUN([KDE_SET_PREFIX],
4923 4923
   unset CDPATH
4924 4924
   dnl We can't give real code to that macro, only a value.
4925 4925
   dnl It only matters for --help, since we set the prefix in this function anyway.
4926
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
4926
+  AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
4927 4927
 
4928 4928
   KDE_SET_DEFAULT_BINDIRS
4929 4929
   if test "x$prefix" = "xNONE"; then
4930
-    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
4931
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
4930
+    dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
4931
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
4932 4932
   else
4933
-    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
4933
+    dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
4934 4934
     kde_save_PATH="$PATH"
4935 4935
     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
4936
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
4936
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
4937 4937
     PATH="$kde_save_PATH"
4938 4938
   fi
4939 4939
 
4940 4940
   kde_libs_prefix=`$KDECONFIG --prefix`
4941 4941
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
4942
-       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
4942
+       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
4943 4943
                     This means it has been moved since you installed it.
4944
-                    This won't work. Please recompile kdelibs for the new prefix.
4944
+                    This won't work. Please recompile tdelibs for the new prefix.
4945 4945
                     ])
4946 4946
   fi
4947 4947
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -4950,7 +4950,7 @@ AC_DEFUN([KDE_SET_PREFIX],
4950 4950
   AC_MSG_CHECKING([where to install])
4951 4951
   if test "x$prefix" = "xNONE"; then
4952 4952
     prefix=$kde_libs_prefix
4953
-    AC_MSG_RESULT([$prefix (as returned by kde-config)])
4953
+    AC_MSG_RESULT([$prefix (as returned by tde-config)])
4954 4954
   else
4955 4955
     dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
4956 4956
     given_prefix=$prefix
@@ -5607,7 +5607,7 @@ ssl_includes=""
5607 5607
 AC_ARG_WITH(ssl-dir,
5608 5608
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
5609 5609
     [  ac_ssl_includes="$withval"/include
5610
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
5610
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
5611 5611
     ])
5612 5612
 
5613 5613
 want_ssl=yes
@@ -5627,7 +5627,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
5627 5627
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
5628 5628
   ac_ssl_includes="$ssl_incdir"
5629 5629
 
5630
-  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"
5630
+  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"
5631 5631
   if test ! "$ac_ssl_libraries" = "NO"; then
5632 5632
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
5633 5633
   fi
@@ -5864,9 +5864,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
5864 5864
 dnl also defines KSTUFF_PKG_ERRORS on error
5865 5865
 AC_DEFUN([KDE_PKG_CHECK_MODULES], [
5866 5866
 
5867
-   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5867
+   PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5868 5868
    if test "$prefix" != "$kde_libs_prefix"; then
5869
-       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5869
+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5870 5870
    fi
5871 5871
    export PKG_CONFIG_PATH
5872 5872
    PKG_CHECK_MODULES($1,$2,$3,$4)

+ 7
- 7
configure.in View File

@@ -67,12 +67,12 @@ dnl =======================================================
67 67
 
68 68
 dnl PACKAGE set before
69 69
 
70
-dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
71
-dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
72
-dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__
70
+dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__
71
+dnl CFLAGS="$NOOPT_CFLAGS" dnl __tdevelop[noopt]__
72
+dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __tdevelop[exc]__
73 73
 
74
-dnl KDE_NEED_FLEX dnl __kdevelop__
75
-dnl AC_PROG_YACC dnl __kdevelop__
74
+dnl KDE_NEED_FLEX dnl __tdevelop__
75
+dnl AC_PROG_YACC dnl __tdevelop__
76 76
 KDE_CREATE_SUBDIRSLIST
77 77
 AC_CONFIG_FILES([ Makefile ])
78 78
 AC_CONFIG_FILES([ doc/Makefile ])
@@ -94,13 +94,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
94 94
   # And if so, warn when they don't match
95 95
   if test "$kde_libs_prefix" != "$given_prefix"; then
96 96
     # And if kde doesn't know about the prefix yet
97
-    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
97
+    echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
98 98
     if test $? -ne 0; then
99 99
       echo ""
100 100
       echo "Warning: you chose to install this package in $given_prefix,"
101 101
       echo "but KDE was found in $kde_libs_prefix."
102 102
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
103
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
103
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
104 104
       echo "Then restart KDE."
105 105
       echo ""
106 106
     fi

+ 5
- 5
configure.in.in View File

@@ -2,9 +2,9 @@
2 2
 
3 3
 AM_INIT_AUTOMAKE(kshutdown,1.0.4)
4 4
 
5
-dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
6
-dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
7
-dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__
5
+dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__
6
+dnl CFLAGS="$NOOPT_CFLAGS" dnl __tdevelop[noopt]__
7
+dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __tdevelop[exc]__
8 8
 
9
-dnl KDE_NEED_FLEX dnl __kdevelop__
10
-dnl AC_PROG_YACC dnl __kdevelop__
9
+dnl KDE_NEED_FLEX dnl __tdevelop__
10
+dnl AC_PROG_YACC dnl __tdevelop__

+ 3
- 3
extras/hibernate.desktop View File

@@ -12,6 +12,6 @@ StartupNotify=true
12 12
 Terminal=false
13 13
 Type=Application
14 14
 X-DCOP-ServiceType=
15
-X-KDE-SubstituteUID=false
16
-X-KDE-Username=
17
-X-Ubuntu-Gettext-Domain=desktop_kdebase
15
+X-TDE-SubstituteUID=false
16
+X-TDE-Username=
17
+X-Ubuntu-Gettext-Domain=desktop_tdebase

+ 2
- 2
extras/multimedia/juk.desktop View File

@@ -15,5 +15,5 @@ StartupNotify=true
15 15
 Terminal=false
16 16
 Type=Application
17 17
 X-DCOP-ServiceType=
18
-X-KDE-SubstituteUID=false
19
-X-KDE-Username=
18
+X-TDE-SubstituteUID=false
19
+X-TDE-Username=

+ 2
- 2
extras/multimedia/kaffeine.desktop View File

@@ -16,5 +16,5 @@ StartupNotify=true
16 16
 Terminal=false
17 17
 Type=Application
18 18
 X-DCOP-ServiceType=
19
-X-KDE-SubstituteUID=false
20
-X-KDE-Username=
19
+X-TDE-SubstituteUID=false
20
+X-TDE-Username=

+ 3
- 3
extras/multimedia/kdetv.desktop View File

@@ -14,6 +14,6 @@ StartupNotify=true
14 14
 Terminal=false
15 15
 Type=Application
16 16
 X-DCOP-ServiceType=
17
-X-KDE-SubstituteUID=false
18
-X-KDE-Username=
19
-X-Ubuntu-Gettext-Domain=desktop_kdebase
17
+X-TDE-SubstituteUID=false
18
+X-TDE-Username=
19
+X-Ubuntu-Gettext-Domain=desktop_tdebase

+ 2
- 2
extras/multimedia/kscd.desktop View File

@@ -16,5 +16,5 @@ StartupNotify=true
16 16
 Terminal=false
17 17
 Type=Application
18 18
 X-DCOP-ServiceType=
19
-X-KDE-SubstituteUID=false
20
-X-KDE-Username=
19
+X-TDE-SubstituteUID=false
20
+X-TDE-Username=

+ 2
- 2
extras/multimedia/noatun.desktop View File

@@ -14,5 +14,5 @@ StartupNotify=true
14 14
 Terminal=false
15 15
 Type=Application
16 16
 X-DCOP-ServiceType=
17
-X-KDE-SubstituteUID=false
18
-X-KDE-Username=
17
+X-TDE-SubstituteUID=false
18
+X-TDE-Username=

+ 2
- 2
extras/shutdown/cancelshutdown.desktop View File

@@ -15,5 +15,5 @@ StartupNotify=true
15 15
 Terminal=false
16 16
 Type=Application
17 17
 X-DCOP-ServiceType=
18
-X-KDE-SubstituteUID=false
19
-X-KDE-Username=
18
+X-TDE-SubstituteUID=false
19
+X-TDE-Username=

+ 2
- 2
extras/shutdown/fsck.desktop View File

@@ -15,5 +15,5 @@ StartupNotify=true
15 15
 Terminal=false
16 16
 Type=Application
17 17
 X-DCOP-ServiceType=
18
-X-KDE-SubstituteUID=false
19
-X-KDE-Username=
18
+X-TDE-SubstituteUID=false
19
+X-TDE-Username=

+ 2
- 2
extras/system/adsl-stop.desktop View File

@@ -16,5 +16,5 @@ Terminal=true
16 16
 TerminalOptions=\s--noclose
17 17
 Type=Application
18 18
 X-DCOP-ServiceType=none
19
-X-KDE-SubstituteUID=false
20
-X-KDE-Username=
19
+X-TDE-SubstituteUID=false
20
+X-TDE-Username=

+ 2
- 2
extras/system/kdeeject.desktop View File

@@ -15,5 +15,5 @@ StartupNotify=true
15 15
 Terminal=false
16 16
 Type=Application
17 17
 X-DCOP-ServiceType=
18
-X-KDE-SubstituteUID=false
19
-X-KDE-Username=
18
+X-TDE-SubstituteUID=false
19
+X-TDE-Username=

+ 2
- 2
extras/system/kppp.desktop View File

@@ -15,5 +15,5 @@ StartupNotify=true
15 15
 Terminal=false
16 16
 Type=Application
17 17
 X-DCOP-ServiceType=
18
-X-KDE-SubstituteUID=false
19
-X-KDE-Username=
18
+X-TDE-SubstituteUID=false
19
+X-TDE-Username=

+ 2
- 2
kshutdown-mdk.spec View File

@@ -11,7 +11,7 @@ Distribution: mdk
11 11
 Prefix: /usr
12 12
 Url: http://kshutdown.sourceforge.net
13 13
 Provides: kshutdown
14
-Requires: kdelibs >= 3.3.0
14
+Requires: tdelibs >= 3.3.0
15 15
 
16 16
 %description
17 17
 KShutDown is an advanced shut down utility for KDE.
@@ -80,7 +80,7 @@ rm -rf $RPM_BUILD_DIR/file.list.%{name}.dirs
80 80
 - updated description
81 81
 
82 82
 * Mon Aug 1 2005 Konrad Twardowski
83
-- removed "kdebase" from "Requires"
83
+- removed "tdebase" from "Requires"
84 84
 
85 85
 * Sat Jun 19 2004 Zdenko Podobný <zdpo@mailbox.sk> 0.1.8-1mdk
86 86
 - initial version

+ 3
- 3
kshutdown-suse.spec View File

@@ -9,8 +9,8 @@ Group: System/Management
9 9
 URL: http://kshutdown.sf.net/
10 10
 Source0: http://mesh.dl.sourceforge.net/sourceforge/kshutdown/kshutdown-%{version}.tar.bz2
11 11
 BuildRoot: %{_tmppath}/kshutdown-%{version}-%{release}-root
12
-Requires: kdelibs3 >= 3.3.0
13
-BuildRequires: kdelibs3-devel kdebase3-devel
12
+Requires: tdelibs3 >= 3.3.0
13
+BuildRequires: tdelibs3-devel tdebase3-devel
14 14
 BuildRequires:	gcc-c++ libstdc++ libstdc++-devel
15 15
 BuildRequires:	autoconf automake libtool
16 16
 
@@ -88,7 +88,7 @@ rm -fr ../file.list.kshutdown
88 88
 - updated description
89 89
 
90 90
 * Mon Aug 1 2005 Konrad Twardowski <kdtonline@poczta.onet.pl>
91
-- removed "kdebase" from "Requires"
91
+- removed "tdebase" from "Requires"
92 92
 
93 93
 * Mon Apr 4 2005 Konrad Twardowski <kdtonline@poczta.onet.pl>
94 94
 - Test RPM

+ 4
- 4
kshutdown.kdevelop View File

@@ -1,5 +1,5 @@
1
-<!DOCTYPE kdevelop>
2
-<kdevelop>
1
+<!DOCTYPE tdevelop>
2
+<tdevelop>
3 3
   <general>
4 4
     <author>Konrad Twardowski</author>
5 5
     <email>kdtonline@poczta.onet.pl</email>
@@ -74,7 +74,7 @@
74 74
     </run>
75 75
     <configurations>
76 76
       <default>
77
-        <configargs>--prefix=`kde-config --prefix` --enable-debug=full</configargs>
77
+        <configargs>--prefix=`tde-config --prefix` --enable-debug=full</configargs>
78 78
         <builddir/>
79 79
         <topsourcedir/>
80 80
         <cppflags/>
@@ -318,4 +318,4 @@
318 318
     <graphicFilter>-f0</graphicFilter>
319 319
     <scaling>-1</scaling>
320 320
   </kdevvisualadvance>
321
-</kdevelop>
321
+</tdevelop>

+ 3
- 3
kshutdown.spec View File

@@ -8,8 +8,8 @@ URL: http://kshutdown.sf.net/
8 8
 Packager: Konrad Twardowski <kdtonline@poczta.onet.pl>
9 9
 Source0: kshutdown-%version.tar.bz2
10 10
 Buildroot: %_tmppath/kshutdown-%version-%release-root
11
-Requires: kdelibs >= 3.3.0
12
-BuildRequires: kdelibs-devel
11
+Requires: tdelibs >= 3.3.0
12
+BuildRequires: tdelibs-devel
13 13
 
14 14
 %description
15 15
 KShutDown is an advanced shut down utility for KDE.
@@ -59,7 +59,7 @@ rm -fr ../file.list.kshutdown
59 59
 - updated description
60 60
 
61 61
 * Mon Aug 1 2005 Konrad Twardowski <kdtonline@poczta.onet.pl>
62
-- removed "kdebase" from "Requires"
62
+- removed "tdebase" from "Requires"
63 63
 
64 64
 * Mon Apr 4 2005 Konrad Twardowski <kdtonline@poczta.onet.pl>
65 65
 - Test RPM

+ 3
- 3
kshutdown/Makefile.am View File

@@ -20,7 +20,7 @@ kshutdown_SOURCES = \
20 20
 	progressbar.cpp \
21 21
 	systemconfig.cpp
22 22
 
23
-kshutdown_LDADD = $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIB_KIO) $(LIB_QT) -lDCOP -lkdefx
23
+kshutdown_LDADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIB_KIO) $(LIB_QT) -lDCOP -ltdefx
24 24
 kshutdown_LDFLAGS = $(all_libraries) $(KDE_RPATH)
25 25
 
26 26
 EXTRA_DIST = \
@@ -31,8 +31,8 @@ EXTRA_DIST = \
31 31
 appdir = $(prefix)/share/applications
32 32
 app_DATA = kshutdown.desktop
33 33
 
34
-kconfdir = $(kde_datadir)/kconf_update
35
-kconf_DATA = kshutdown.upd
34
+tdeconfdir = $(kde_datadir)/tdeconf_update
35
+tdeconf_DATA = kshutdown.upd
36 36
 
37 37
 INCLUDES = $(all_includes)
38 38
 METASOURCES = AUTO

+ 10
- 10
kshutdown/actions.cpp View File

@@ -33,8 +33,8 @@
33 33
 #include <kdebug.h>
34 34
 #include <kiconloader.h>
35 35
 #include <kimageeffect.h>
36
-#include <klocale.h>
37
-#include <kmessagebox.h>
36
+#include <tdelocale.h>
37
+#include <tdemessagebox.h>
38 38
 
39 39
 Action *Action::_instance = 0;
40 40
 
@@ -56,7 +56,7 @@ TQString Action::actionToConfigGroup(const Type action) const
56 56
 
57 57
 // TODO: 2.0: GDM support
58 58
 // TODO: 2.0: force application exit (without asking for data save)
59
-bool Action::endSession(const KApplication::ShutdownType type, const Type action)
59
+bool Action::endSession(const TDEApplication::ShutdownType type, const Type action)
60 60
 {
61 61
 	_totalExit = false;
62 62
 
@@ -73,9 +73,9 @@ bool Action::endSession(const KApplication::ShutdownType type, const Type action
73 73
 	_totalExit = true;
74 74
 	if (
75 75
 		!kapp->requestShutDown(
76
-			KApplication::ShutdownConfirmNo,
76
+			TDEApplication::ShutdownConfirmNo,
77 77
 			type,
78
-			KApplication::ShutdownModeForceNow
78
+			TDEApplication::ShutdownModeForceNow
79 79
 		)
80 80
 	)
81 81
 	{
@@ -123,7 +123,7 @@ bool Action::exec(const Type action, const bool stopTimer)
123 123
 			MiscUtils::runCommandBeforeAction("Shut Down");
124 124
 
125 125
 			if (method == Method_KDE)
126
-				return endSession(KApplication::ShutdownTypeHalt, action);
126
+				return endSession(TDEApplication::ShutdownTypeHalt, action);
127 127
 
128 128
 			break;
129 129
 
@@ -135,7 +135,7 @@ bool Action::exec(const Type action, const bool stopTimer)
135 135
 			MiscUtils::runCommandBeforeAction("Reboot");
136 136
 
137 137
 			if (method == Method_KDE)
138
-				return endSession(KApplication::ShutdownTypeReboot, action);
138
+				return endSession(TDEApplication::ShutdownTypeReboot, action);
139 139
 
140 140
 			break;
141 141
 
@@ -150,7 +150,7 @@ bool Action::exec(const Type action, const bool stopTimer)
150 150
 			MiscUtils::runCommandBeforeAction("Logout");
151 151
 
152 152
 			if (method == Method_KDE)
153
-				return endSession(KApplication::ShutdownTypeNone, action);
153
+				return endSession(TDEApplication::ShutdownTypeNone, action);
154 154
 
155 155
 			break;
156 156
 
@@ -268,7 +268,7 @@ TQString Action::getMethod(const Action::Type action, Method &method, TQString &
268 268
 			defaultCommand = TQString::null;
269 269
 	}
270 270
 
271
-	KConfig *conf = kshutdownrc->config();
271
+	TDEConfig *conf = kshutdownrc->config();
272 272
 	if (!conf->hasGroup(group))
273 273
 	{
274 274
 		method = Method_KDE;
@@ -305,7 +305,7 @@ TQString Action::getMethod(const Action::Type action, Method &method, TQString &
305 305
 
306 306
 void Action::setMethod(const TQString &group, const Method method, const TQString &command) const
307 307
 {
308
-	KConfig *conf = kshutdownrc->config();
308
+	TDEConfig *conf = kshutdownrc->config();
309 309
 	conf->setGroup(group);
310 310
 	if (method == Method_UserCommand)
311 311
 		conf->writeEntry("Command", command);

+ 3
- 3
kshutdown/actions.h View File

@@ -20,7 +20,7 @@
20 20
 #ifndef __ACTIONS_H__
21 21
 #define __ACTIONS_H__
22 22
 
23
-#include <kapplication.h>
23
+#include <tdeapplication.h>
24 24
 
25 25
 // default external commands
26 26
 const TQString
@@ -44,7 +44,7 @@ public:
44 44
 	 * Methods. Don't change these values!
45 45
 	 */
46 46
 	enum Method {
47
-		Method_KDE = 0, /**< Standard KDE/KDM method. (default) */
47
+		Method_KDE = 0, /**< Standard KDE/TDM method. (default) */
48 48
 		Method_DefaultCommand = 1, /**< Default external command. (e.g. /sbin/reboot) */
49 49
 		Method_UserCommand = 2 /**< User command. Any command that can be executed by @c KRun::run. */
50 50
 	};
@@ -94,7 +94,7 @@ public:
94 94
 	 * @param action An action to execute
95 95
 	 * @return @c true if successful; otherwise @c false
96 96
 	 */
97
-	bool endSession(const KApplication::ShutdownType type, const Type action);
97
+	bool endSession(const TDEApplication::ShutdownType type, const Type action);
98 98
 
99 99
 	/**
100 100
 	 * Executes an action.

+ 2
- 2
kshutdown/appobserver.cpp View File

@@ -33,8 +33,8 @@
33 33
 
34 34
 #include <kdebug.h>
35 35
 #include <kiconloader.h>
36
-#include <klocale.h>
37
-#include <kmessagebox.h>
36
+#include <tdelocale.h>
37
+#include <tdemessagebox.h>
38 38
 #include <kpushbutton.h>
39 39
 
40 40
 // TODO: 2.0: bigger combo box list

+ 2
- 2
kshutdown/configuration.h View File

@@ -20,7 +20,7 @@
20 20
 #ifndef __CONFIGURATION_H__
21 21
 #define __CONFIGURATION_H__
22 22
 
23
-#include <kconfigskeleton.h>
23
+#include <tdeconfigskeleton.h>
24 24
 
25 25
 #define kshutdownrc Config::getInstance()->getInstance()
26 26
 
@@ -31,7 +31,7 @@
31 31
  * @short A configuration reader/writer.
32 32
  * Use the @c kshutdownrc macro to access these members.
33 33
  */
34
-class Config: public KConfigSkeleton
34
+class Config: public TDEConfigSkeleton
35 35
 {
36 36
 public:
37 37
 	// automation

+ 3
- 3
kshutdown/confirmation.cpp View File

@@ -25,9 +25,9 @@
25 25
 #include <dcopclient.h>
26 26
 #include <kdialogbase.h>
27 27
 #include <kiconloader.h>
28
-#include <klocale.h>
29
-#include <kmessagebox.h>
30
-#include <kwin.h>
28
+#include <tdelocale.h>
29
+#include <tdemessagebox.h>
30
+#include <twin.h>
31 31
 
32 32
 // public
33 33
 

+ 10
- 10
kshutdown/extras.cpp View File

@@ -28,10 +28,10 @@
28 28
 #include <kdebug.h>
29 29
 #include <kdesktopfile.h>
30 30
 #include <kiconloader.h>
31
-#include <klocale.h>
32
-#include <kmessagebox.h>
31
+#include <tdelocale.h>
32
+#include <tdemessagebox.h>
33 33
 #include <kmimetype.h>
34
-#include <kpopupmenu.h>
34
+#include <tdepopupmenu.h>
35 35
 #include <kpushbutton.h>
36 36
 #include <krun.h>
37 37
 #include <kstandarddirs.h>
@@ -107,13 +107,13 @@ Extras::Extras()
107 107
 	: TQObject(ks_main, "Extras"),
108 108
 	_idToFileMap(0) // initialized in getIdToFileMap()
109 109
 {
110
-	_menu = new KPopupMenu(0, "KPopupMenu::_menu");
110
+	_menu = new TDEPopupMenu(0, "TDEPopupMenu::_menu");
111 111
 	connect(_menu, SIGNAL(aboutToShow()), SLOT(slotShowMenu()));
112 112
 	connect(_menu, SIGNAL(activated(int)), SLOT(slotActivated(int)));
113 113
 }
114 114
 
115 115
 // TODO: 2.0: recent items
116
-void Extras::buildMenu(KPopupMenu *parentMenu, const TQString &subdir)
116
+void Extras::buildMenu(TDEPopupMenu *parentMenu, const TQString &subdir)
117 117
 {
118 118
 	int id;
119 119
 	TQDir d(subdir);
@@ -138,11 +138,11 @@ void Extras::buildMenu(KPopupMenu *parentMenu, const TQString &subdir)
138 138
 		// dir
139 139
 		if (fi.isDir())
140 140
 		{
141
-			KPopupMenu *submenu = new KPopupMenu(parentMenu, "KPopupMenu::submenu");
141
+			TDEPopupMenu *submenu = new TDEPopupMenu(parentMenu, "TDEPopupMenu::submenu");
142 142
 			connect(submenu, SIGNAL(activated(int)), SLOT(slotActivated(int)));
143 143
 
144 144
 			KDesktopFile *desktopFile = new KDesktopFile(path + "/.directory", true);
145
-			if (desktopFile->getConfigState() != KConfigBase::NoAccess)
145
+			if (desktopFile->getConfigState() != TDEConfigBase::NoAccess)
146 146
 			{
147 147
 				icon = desktopFile->readIcon();
148 148
 				if (icon.isEmpty())
@@ -191,7 +191,7 @@ void Extras::buildMenu(KPopupMenu *parentMenu, const TQString &subdir)
191 191
 
192 192
 			// application/x-desktop
193 193
 			KDesktopFile *desktopFile = new KDesktopFile(path, true);
194
-			if (desktopFile->getConfigState() != KConfigBase::NoAccess)
194
+			if (desktopFile->getConfigState() != TDEConfigBase::NoAccess)
195 195
 			{
196 196
 				name = desktopFile->readName();
197 197
 				if (name.isEmpty())
@@ -268,7 +268,7 @@ void Extras::slotModify()
268 268
 	);
269 269
 
270 270
 	// launch Konqueror as an item editor
271
-	MiscUtils::runCommand("konqueror \"" + KGlobal::dirs()->saveLocation("data", "kshutdown/extras") + "\"");
271
+	MiscUtils::runCommand("konqueror \"" + TDEGlobal::dirs()->saveLocation("data", "kshutdown/extras") + "\"");
272 272
 }
273 273
 
274 274
 // private slots
@@ -296,7 +296,7 @@ void Extras::slotShowMenu()
296 296
 	setAction(TQString::null, TQString::null);
297 297
 	_menu->clear(); // reset menu
298 298
 	getIdToFileMap()->clear(); // reset map
299
-	TQStringList extrasDirs(KGlobal::dirs()->findDirs("data", "kshutdown/extras"));
299
+	TQStringList extrasDirs(TDEGlobal::dirs()->findDirs("data", "kshutdown/extras"));
300 300
 	TQStringList::ConstIterator
301 301
 		begin = extrasDirs.begin(),
302 302
 		end = extrasDirs.end();

+ 3
- 3
kshutdown/extras.h View File

@@ -23,7 +23,7 @@
23 23
 #include <ntqobject.h>
24 24
 #include <ntqiconset.h>
25 25
 
26
-class KPopupMenu;
26
+class TDEPopupMenu;
27 27
 class KPushButton;
28 28
 
29 29
 #define ks_extras Extras::getInstance()
@@ -80,7 +80,7 @@ public:
80 80
 	void setAction(const TQString &fileToExecute, const TQString &description, TQIconSet *icon = 0);
81 81
 private:
82 82
 	static Extras *_instance;
83
-	KPopupMenu *_menu;
83
+	TDEPopupMenu *_menu;
84 84
 	KPushButton *_button;
85 85
 	TQMap<int, TQString> *_idToFileMap;
86 86
 	TQString
@@ -93,7 +93,7 @@ private:
93 93
 	 * @param parentMenu A parent menu
94 94
 	 * @param subdir A subdirectory
95 95
 	 */
96
-	void buildMenu(KPopupMenu *parentMenu, const TQString &subdir);
96
+	void buildMenu(TDEPopupMenu *parentMenu, const TQString &subdir);
97 97
 
98 98
 	bool execFile() const;
99 99
 	TQMap<int, TQString> *getIdToFileMap();

+ 8
- 8
kshutdown/kshutdown.desktop View File

@@ -3,17 +3,17 @@
3 3
 Name=KShutDown
4 4
 Exec=kshutdown
5 5
 Icon=kshutdown
6
-Comment=A Shut Down Utility for KDE
7
-Comment[cs]=Vypínací utilita pro KDE
8
-Comment[de]=Erweitertes Herunterfahren für KDE
9
-Comment[el]=Ένα εργαλείο τερματισμού για το KDE
10
-Comment[fr]=Utilitaire de gestion d'arrêt pour KDE
11
-Comment[it]=Una utilit�KDE per lo spegnimento del sistema
12
-Comment[pl]=Narzędzie do zamykania systemu dla KDE
6
+Comment=A Shut Down Utility for TDE
7
+Comment[cs]=Vypínací utilita pro TDE
8
+Comment[de]=Erweitertes Herunterfahren für TDE
9
+Comment[el]=Ένα εργαλείο τερματισμού για το TDE
10
+Comment[fr]=Utilitaire de gestion d'arrêt pour TDE
11
+Comment[it]=Una utilit�TDE per lo spegnimento del sistema
12
+Comment[pl]=Narzędzie do zamykania systemu dla TDE
13 13
 GenericName=System Shut Down Utility
14 14
 GenericName[fr]=Gestionnaire d'arrêt du système
15 15
 GenericName[cs]=Časované vypnutí
16 16
 GenericName[pl]=Narzędzie do zamykania systemu
17 17
 DocPath=kshutdown/index.html
18 18
 Type=Application
19
-Categories=KDE;Utility;
19
+Categories=TDE;Utility;

+ 5
- 5
kshutdown/links.cpp View File

@@ -25,12 +25,12 @@
25 25
 #include <ntqfile.h>
26 26
 #include <ntqlabel.h>
27 27
 
28
-#include <kapplication.h>
28
+#include <tdeapplication.h>
29 29
 #include <kdesktopfile.h>
30
-#include <kglobalsettings.h>
30
+#include <tdeglobalsettings.h>
31 31
 #include <kiconloader.h>
32
-#include <klocale.h>
33
-#include <kmessagebox.h>
32
+#include <tdelocale.h>
33
+#include <tdemessagebox.h>
34 34
 #include <kpushbutton.h>
35 35
 #include <kstandarddirs.h>
36 36
 
@@ -127,7 +127,7 @@ TQString Links::getCurrentLocationPath() const
127 127
 	switch (cb_location->currentItem())
128 128
 	{
129 129
 		case 0:
130
-			path = KGlobalSettings::desktopPath() + "/";
130
+			path = TDEGlobalSettings::desktopPath() + "/";
131 131
 			break;
132 132
 		case 1:
133 133
 			path = locateLocal("apps", "") + "/";

+ 6
- 6
kshutdown/mactioneditdialog.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <ntqwhatsthis.h>
33 33
 
34 34
 #include <klineedit.h>
35
-#include <klocale.h>
35
+#include <tdelocale.h>
36 36
 #include <knuminput.h>
37 37
 #include <kpushbutton.h>
38 38
 
@@ -108,8 +108,8 @@ MActionEditDialog::MActionEditDialog(TQWidget *parent, Action::Type action)
108 108
 		MiscUtils::HTML(
109 109
 			i18n("In most cases you need privileges to shut down system (e.g. run /sbin/shutdown)") + "<br>" \
110 110
 			"<ul>" \
111
-				"<li>" + i18n("If you are using <b>KDE</b> and <b>KDM</b> (KDE Display Manager), then set all methods to <i>KDE</i>") + "</li>" \
112
-				"<li>" + i18n("If you are using <b>KDE</b> and display manager different than <b>KDM</b>, then set <i>Turn Off Computer</i> and <i>Restart Computer</i> methods to <i>/sbin/...</i>") + "</li>" \
111
+				"<li>" + i18n("If you are using <b>KDE</b> and <b>TDM</b> (KDE Display Manager), then set all methods to <i>KDE</i>") + "</li>" \
112
+				"<li>" + i18n("If you are using <b>KDE</b> and display manager different than <b>TDM</b>, then set <i>Turn Off Computer</i> and <i>Restart Computer</i> methods to <i>/sbin/...</i>") + "</li>" \
113 113
 			"</ul>" +
114 114
 			i18n("Manuals:") +
115 115
 			"<ul>" \
@@ -139,7 +139,7 @@ MActionEditDialog::MActionEditDialog(TQWidget *parent, Action::Type action)
139 139
 	setMethod(m);
140 140
 
141 141
 	// command before action
142
-	KConfig *conf = kshutdownrc->config();
142
+	TDEConfig *conf = kshutdownrc->config();
143 143
 	conf->setGroup(group);
144 144
 	c_runCommandBeforeAction->setChecked(conf->readBoolEntry("RunCommandBeforeAction", false));
145 145
 	i_commandBeforeAction->setText(conf->readEntry("CommandBeforeAction", ""));
@@ -208,7 +208,7 @@ void MActionEditDialog::slotOKClicked()
208 208
 	ks_actions->setMethod(group, m, c);
209 209
 
210 210
 	// command before action
211
-	KConfig *conf = kshutdownrc->config();
211
+	TDEConfig *conf = kshutdownrc->config();
212 212
 	conf->setGroup(group);
213 213
 	conf->writeEntry("RunCommandBeforeAction", c_runCommandBeforeAction->isChecked());
214 214
 	conf->writeEntry("CommandBeforeAction", i_commandBeforeAction->text());
@@ -219,7 +219,7 @@ void MActionEditDialog::slotTestCommandBeforeAction()
219 219
 {
220 220
 	MiscUtils::runShellCommand(
221 221
 		i_commandBeforeAction->text(),
222
-		KProcess::DontCare,
222
+		TDEProcess::DontCare,
223 223
 		i_commandBeforeActionPause->value()
224 224
 	);
225 225
 }

+ 17
- 17
kshutdown/main.cpp View File

@@ -26,29 +26,29 @@
26 26
 
27 27
 #include <ntqfileinfo.h>
28 28
 
29
-#include <kaboutdata.h>
30
-#include <kcmdlineargs.h>
31
-#include <klocale.h>
32
-#include <kmessagebox.h>
29
+#include <tdeaboutdata.h>
30
+#include <tdecmdlineargs.h>
31
+#include <tdelocale.h>
32
+#include <tdemessagebox.h>
33 33
 #include <kuniqueapplication.h>
34 34
 
35 35
 // 0.1.x, 0.3.x, etc - Unstable, Beta
36 36
 // 0.2.x, 0.4.x, etc - Stable
37 37
 TQString version = "1.0.4";
38 38
 
39
-KAboutData aboutData(
39
+TDEAboutData aboutData(
40 40
 	"kshutdown", // internal name
41 41
 	"KShutDown", // full name
42 42
 	version,
43 43
 	I18N_NOOP("A Shut Down Utility for KDE"), // description
44
-	KAboutData::License_GPL_V2, // license
44
+	TDEAboutData::License_GPL_V2, // license
45 45
 	"(C) 2003-3000 Konrad Twardowski", // copyright
46 46
 	"", // text
47 47
 	"http://kshutdown.sourceforge.net/", // project page
48 48
 	"kdtonline@poczta.onet.pl" // bugs
49 49
 );
50 50
 
51
-static KCmdLineOptions options[] =
51
+static TDECmdLineOptions options[] =
52 52
 {
53 53
 	{ "s", 0, 0 },
54 54
 	{ "shutdown", I18N_NOOP("Turn off computer"), 0 },
@@ -71,7 +71,7 @@ static KCmdLineOptions options[] =
71 71
 	{ "default", I18N_NOOP("Disable test mode"), 0 },
72 72
 	{ "+[time]", I18N_NOOP("Time; Examples: 01:30 - absolute time (HH:MM); " \
73 73
 		"10 - number of minutes to wait from now"), 0 },
74
-	KCmdLineLastOption
74
+	TDECmdLineLastOption
75 75
 };
76 76
 
77 77
 /** @short KShutDown application. */
@@ -109,7 +109,7 @@ private:
109 109
 		timeArgIsValid;
110 110
 	TQString timeArg;
111 111
 	int doExecAction(const Action::Type action);
112
-	int doProcessArgs(const KCmdLineArgs *args);
112
+	int doProcessArgs(const TDECmdLineArgs *args);
113 113
 };
114 114
 
115 115
 // public
@@ -118,7 +118,7 @@ int KShutDownApplication::newInstance()
118 118
 {
119 119
 	// autostart
120 120
 	if (kapp->isRestored()) {
121
-		KConfig *config = kapp->config();
121
+		TDEConfig *config = kapp->config();
122 122
 		config->setGroup("KShutDown");
123 123
 		if (!config->readBoolEntry("Autostart", false)) {
124 124
 			quit();
@@ -140,7 +140,7 @@ int KShutDownApplication::newInstance()
140 140
 	}
141 141
 
142 142
 	// check command line args
143
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
143
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
144 144
 	int retval = doProcessArgs(args);
145 145
 	args->clear();
146 146
 
@@ -198,7 +198,7 @@ int KShutDownApplication::doExecAction(const Action::Type action) {
198 198
 	return Mode_Error;
199 199
 }
200 200
 
201
-int KShutDownApplication::doProcessArgs(const KCmdLineArgs *args) {
201
+int KShutDownApplication::doProcessArgs(const TDECmdLineArgs *args) {
202 202
 	if (!ks_main)
203 203
 		return Mode_Error;
204 204
 
@@ -270,9 +270,9 @@ int KShutDownApplication::doProcessArgs(const KCmdLineArgs *args) {
270 270
 	// standard logout dialog
271 271
 	if (args->isSet("standard")) {
272 272
 		kapp->requestShutDown(
273
-			KApplication::ShutdownConfirmYes,
274
-			KApplication::ShutdownTypeDefault,
275
-			KApplication::ShutdownModeDefault
273
+			TDEApplication::ShutdownConfirmYes,
274
+			TDEApplication::ShutdownTypeDefault,
275
+			TDEApplication::ShutdownModeDefault
276 276
 		);
277 277
 
278 278
 		return Mode_Ok;
@@ -379,8 +379,8 @@ int main(int argc, char **argv)
379 379
 	aboutData.addCredit("SourceForge.net", "", "", "http://www.sourceforge.net/");
380 380
 
381 381
 	// init command line
382
-	KCmdLineArgs::init(argc, argv, &aboutData);
383
-	KCmdLineArgs::addCmdLineOptions(options);
382
+	TDECmdLineArgs::init(argc, argv, &aboutData);
383
+	TDECmdLineArgs::addCmdLineOptions(options);
384 384
 
385 385
 	if (!KUniqueApplication::start())
386 386
 		return 0;

+ 12
- 12
kshutdown/miscutils.cpp View File

@@ -28,23 +28,23 @@
28 28
 #include <ntqtooltip.h>
29 29
 #include <ntqwhatsthis.h>
30 30
 
31
-#include <kaction.h>
31
+#include <tdeaction.h>
32 32
 #include <kdebug.h>
33 33
 #include <kiconloader.h>
34
-#include <klocale.h>
35
-#include <kmessagebox.h>
34
+#include <tdelocale.h>
35
+#include <tdemessagebox.h>
36 36
 #include <knotifyclient.h>
37 37
 #include <kpassivepopup.h>
38 38
 #include <kpushbutton.h>
39 39
 #include <krun.h>
40
-#include <kwindowinfo.h>
40
+#include <twindowinfo.h>
41 41
 
42 42
 // public
43 43
 
44 44
 void MiscUtils::closeCDTray()
45 45
 {
46 46
 	if (kshutdownrc->cdTrayClose)
47
-		runShellCommand(kshutdownrc->cdTrayCloseCommand, KProcess::Block);
47
+		runShellCommand(kshutdownrc->cdTrayCloseCommand, TDEProcess::Block);
48 48
 }
49 49
 
50 50
 void MiscUtils::customMessage(const TQString &text, const TQString &testCommand)
@@ -86,7 +86,7 @@ TQString MiscUtils::formatDateTime(const TQDateTime &dt)
86 86
 
87 87
 	return
88 88
 		dt.toString(
89
-			KGlobal::locale()->use12Clock()
89
+			TDEGlobal::locale()->use12Clock()
90 90
 				? "hh:mm ap, dddd"
91 91
 				: "hh:mm, dddd"
92 92
 		) +
@@ -134,7 +134,7 @@ void MiscUtils::passiveMessage(const TQString &text, TQWidget *parent) {
134 134
 		popup->move(0, 0);
135 135
 }
136 136
 
137
-void MiscUtils::plug(const KAction *action, KPushButton *pushButton) {
137
+void MiscUtils::plug(const TDEAction *action, KPushButton *pushButton) {
138 138
 	pushButton->disconnect(); // disconnect all
139 139
 	pushButton->connect(pushButton, SIGNAL(clicked()), action, SLOT(activate()));
140 140
 	pushButton->setIconSet(action->iconSet());
@@ -158,7 +158,7 @@ bool MiscUtils::runCommand(const TQString &command)
158 158
 
159 159
 void MiscUtils::runCommandBeforeAction(const TQString &configEntry)
160 160
 {
161
-	KConfig *conf = kshutdownrc->config();
161
+	TDEConfig *conf = kshutdownrc->config();
162 162
 
163 163
 	if (!conf->hasGroup(configEntry))
164 164
 		return;
@@ -172,15 +172,15 @@ void MiscUtils::runCommandBeforeAction(const TQString &configEntry)
172 172
 	int pause = conf->readNumEntry("CommandBeforeActionPause", 10);
173 173
 	if ((pause < 0) || (pause > 300))
174 174
 		pause = 10;
175
-	runShellCommand(command, KProcess::DontCare, pause);
175
+	runShellCommand(command, TDEProcess::DontCare, pause);
176 176
 }
177 177
 
178
-bool MiscUtils::runShellCommand(const TQString &command, const KProcess::RunMode mode, const int pause)
178
+bool MiscUtils::runShellCommand(const TQString &command, const TDEProcess::RunMode mode, const int pause)
179 179
 {
180 180
 	if (command.isEmpty())
181 181
 		return false;
182 182
 
183
-	KProcess *p = new KProcess();
183
+	TDEProcess *p = new TDEProcess();
184 184
 	if (!p)
185 185
 	{
186 186
 		showRunErrorMessage(command);
@@ -210,7 +210,7 @@ bool MiscUtils::runShellCommand(const TQString &command, const KProcess::RunMode
210 210
 }
211 211
 
212 212
 void MiscUtils::setAutostart(const bool yes) {
213
-	KConfig *config = kapp->config();
213
+	TDEConfig *config = kapp->config();
214 214
 	config->setGroup("KShutDown");
215 215
 	config->writeEntry("Autostart", yes);
216 216
 }

+ 4
- 4
kshutdown/miscutils.h View File

@@ -24,7 +24,7 @@
24 24
 
25 25
 #include <kprocess.h>
26 26
 
27
-class KAction;
27
+class TDEAction;
28 28
 class KPushButton;
29 29
 
30 30
 /** @short Misc functions. */
@@ -85,7 +85,7 @@ public:
85 85
 
86 86
 	static void passiveMessage(const TQString &text, TQWidget *parent = 0);
87 87
 
88
-	static void plug(const KAction *action, KPushButton *pushButton);
88
+	static void plug(const TDEAction *action, KPushButton *pushButton);
89 89
 
90 90
 	/**
91 91
 	 * Executes a command.
@@ -103,11 +103,11 @@ public:
103 103
 	/**
104 104
 	 * Executes a shell command.
105 105
 	 * @param command A shell command to execute
106
-	 * @param mode A run mode (@c KProcess::DontCare by default)
106
+	 * @param mode A run mode (@c TDEProcess::DontCare by default)
107 107
 	 * @param pause A timeout in seconds (no timeout by default)
108 108
 	 * @return @c true if successfull; otherwise @c false
109 109
 	 */
110
-	static bool runShellCommand(const TQString &command, const KProcess::RunMode mode = KProcess::DontCare, const int pause = -1);
110
+	static bool runShellCommand(const TQString &command, const TDEProcess::RunMode mode = TDEProcess::DontCare, const int pause = -1);
111 111
 
112 112
 	static void setAutostart(const bool yes);
113 113
 

+ 35
- 35
kshutdown/mmainwindow.cpp View File

@@ -41,18 +41,18 @@
41 41
 #include <ntqwhatsthis.h>
42 42
 
43 43
 #include <dcopclient.h>
44
-#include <kaction.h>
44
+#include <tdeaction.h>
45 45
 #include <kdebug.h>
46 46
 #include <kiconloader.h>
47 47
 #include <kglobalaccel.h>
48 48
 #include <kkeydialog.h>
49
-#include <klocale.h>
50
-#include <kmenubar.h>
51
-#include <kmessagebox.h>
49
+#include <tdelocale.h>
50
+#include <tdemenubar.h>
51
+#include <tdemessagebox.h>
52 52
 #include <knotifydialog.h>
53
-#include <kpopupmenu.h>
53
+#include <tdepopupmenu.h>
54 54
 #include <kpushbutton.h>
55
-#include <kwin.h>
55
+#include <twin.h>
56 56
 #include <kdesktopfile.h>
57 57
 #include <kmimetype.h>
58 58
 
@@ -61,7 +61,7 @@ MMainWindow *MMainWindow::_instance = 0;
61 61
 MMainWindow::MMainWindow()
62 62
 	// Iface
63 63
 	: DCOPObject("KShutdownIface"),
64
-	KMainWindow(0, "MMainWindow", WStyle_ContextHelp),
64
+	TDEMainWindow(0, "MMainWindow", WStyle_ContextHelp),
65 65
 	_showMinimizeInfo(true),
66 66
 	_oldSec(-1),
67 67
 	_delayType(DelayType_Now)
@@ -87,7 +87,7 @@ MMainWindow::MMainWindow()
87 87
 	client->registerAs(kapp->name(), false);
88 88
 	client->setDefaultObject(objId()); // KShutdownIface
89 89
 
90
-	KConfig *config = kapp->config();
90
+	TDEConfig *config = kapp->config();
91 91
 	config->setGroup("Extras");
92 92
 	TQString extrasCommand = config->readEntry("Command", TQString::null);
93 93
 	TQString extrasDescription = config->readEntry("Description", TQString::null);
@@ -102,7 +102,7 @@ MMainWindow::MMainWindow()
102 102
 		else {
103 103
 			// application/x-desktop
104 104
 			KDesktopFile *desktopFile = new KDesktopFile(extrasCommand, true);
105
-			if (desktopFile->getConfigState() != KConfigBase::NoAccess)
105
+			if (desktopFile->getConfigState() != TDEConfigBase::NoAccess)
106 106
 				extrasIcon = TQIconSet(SmallIcon(desktopFile->readIcon()));
107 107
 			delete desktopFile;
108 108
 		}
@@ -123,7 +123,7 @@ MMainWindow::MMainWindow()
123 123
 
124 124
 MMainWindow::~MMainWindow()
125 125
 {
126
-	KConfig *config = kapp->config();
126
+	TDEConfig *config = kapp->config();
127 127
 	config->setGroup("Extras");
128 128
 	config->writeEntry("Command", ks_extras->fileToExecute());
129 129
 	config->writeEntry("Description", ks_extras->getActionDescription());
@@ -175,7 +175,7 @@ void MMainWindow::setDelayType(const DelayType value)
175 175
 			_dateTimeEdit->dateEdit()->setEnabled(true);
176 176
 			_dateTimeEdit->timeEdit()->setEnabled(true);
177 177
 			_dateTimeEdit->timeEdit()->setDisplay(
178
-				KGlobal::locale()->use12Clock()
178
+				TDEGlobal::locale()->use12Clock()
179 179
 				? (TQTimeEdit::Hours | TQTimeEdit::Minutes | TQTimeEdit::AMPM)
180 180
 				: (TQTimeEdit::Hours | TQTimeEdit::Minutes)
181 181
 			);
@@ -292,8 +292,8 @@ void MMainWindow::start(const bool confirmation) {
292 292
 
293 293
 	if ((_delayType != DelayType_OnAppExit) && (dt_end < dt_start))
294 294
 	{
295
-		TQString selDT = i18n("Selected date/time: %1").arg("<b>" + KGlobal::locale()->formatDateTime(dt_end, false, true)+ "</b>");
296
-		TQString curDT = i18n("Current date/time: %1").arg("<b>" + KGlobal::locale()->formatDateTime(dt_start, false, true) + "</b>");
295
+		TQString selDT = i18n("Selected date/time: %1").arg("<b>" + TDEGlobal::locale()->formatDateTime(dt_end, false, true)+ "</b>");
296
+		TQString curDT = i18n("Current date/time: %1").arg("<b>" + TDEGlobal::locale()->formatDateTime(dt_start, false, true) + "</b>");
297 297
 
298 298
 		cancel();
299 299
 		KMessageBox::error(
@@ -470,7 +470,7 @@ void MMainWindow::initMainMenu()
470 470
 	KMenuBar *mainMenu = menuBar();
471 471
 
472 472
 	// file
473
-	KPopupMenu *pm_file = new KPopupMenu(this);
473
+	TDEPopupMenu *pm_file = new TDEPopupMenu(this);
474 474
 	_statisticsAction->plug(pm_file);
475 475
 	pm_file->insertSeparator();
476 476
 	if (MiscUtils::isRestricted("tab_stats"))
@@ -481,7 +481,7 @@ void MMainWindow::initMainMenu()
481 481
 	mainMenu->insertItem(i18n("&File"), pm_file);
482 482
 
483 483
 	// actions
484
-	KPopupMenu *pm_actions = new KPopupMenu(this);
484
+	TDEPopupMenu *pm_actions = new TDEPopupMenu(this);
485 485
 	pm_actions->insertTitle(SmallIcon("messagebox_warning"), i18n("No Delay"));
486 486
 	_shutDownAction->plug(pm_actions);
487 487
 	_rebootAction->plug(pm_actions);
@@ -492,7 +492,7 @@ void MMainWindow::initMainMenu()
492 492
 	mainMenu->insertItem(i18n("&Actions"), pm_actions);
493 493
 
494 494
 	// settings
495
-	KPopupMenu *pm_settings = new KPopupMenu(this);
495
+	TDEPopupMenu *pm_settings = new TDEPopupMenu(this);
496 496
 	_checkSystemConfigurationAction->plug(pm_settings);
497 497
 	pm_settings->insertSeparator();
498 498
 	pm_settings->insertItem(SmallIcon("configure_shortcuts"), i18n("Configure Global Shortcuts..."), this, SLOT(slotConfigureGlobalShortcuts()));
@@ -510,66 +510,66 @@ void MMainWindow::initActions()
510 510
 {
511 511
 	// shut down actions
512 512
 
513
-	ac_shutDown = new KActionCollection(this, this);
513
+	ac_shutDown = new TDEActionCollection(this, this);
514 514
 
515
-	_lockScreenAction = new KAction(
515
+	_lockScreenAction = new TDEAction(
516 516
 		ks_actions->getName(Action::LockScreen),
517
-		ks_actions->getIcon(Action::LockScreen), KShortcut(),
517
+		ks_actions->getIcon(Action::LockScreen), TDEShortcut(),
518 518
 		ks_actions, SLOT(slotLockScreen()),
519 519
 		ac_shutDown, "kshutdown_lockscreen"
520 520
 	);
521 521
 
522
-	_logoutAction = new KAction(
522
+	_logoutAction = new TDEAction(
523 523
 		ks_actions->getName(Action::Logout),
524
-		ks_actions->getIcon(Action::Logout), KShortcut(),
524
+		ks_actions->getIcon(Action::Logout), TDEShortcut(),
525 525
 		ks_actions, SLOT(slotLogout()),
526 526
 		ac_shutDown, "kshutdown_logout"
527 527
 	);
528 528
 
529
-	_rebootAction = new KAction(
529
+	_rebootAction = new TDEAction(
530 530
 		ks_actions->getName(Action::Reboot),
531
-		ks_actions->getIcon(Action::Reboot), KShortcut(),
531
+		ks_actions->getIcon(Action::Reboot), TDEShortcut(),
532 532
 		ks_actions, SLOT(slotReboot()),
533 533
 		ac_shutDown, "kshutdown_reboot"
534 534
 	);
535 535
 
536
-	_shutDownAction = new KAction(
536
+	_shutDownAction = new TDEAction(
537 537
 		ks_actions->getName(Action::ShutDown),
538
-		ks_actions->getIcon(Action::ShutDown), KShortcut(),
538
+		ks_actions->getIcon(Action::ShutDown), TDEShortcut(),
539 539
 		ks_actions, SLOT(slotShutDown()),
540 540
 		ac_shutDown, "kshutdown_shutdown"
541 541
 	);
542 542
 
543 543
 	// standard actions
544 544
 
545
-	_cancelAction = new KAction(
545
+	_cancelAction = new TDEAction(
546 546
 		i18n("C&ancel"),
547
-		"cancel", KShortcut(Key_Escape),
547
+		"cancel", TDEShortcut(Key_Escape),
548 548
 		this, SLOT(slotCancel()),
549 549
 		actionCollection(), "kshutdown_cancelaction"
550 550
 	);
551 551
 	_cancelAction->setEnabled(false);
552 552
 
553
-	_checkSystemConfigurationAction = new KAction(
553
+	_checkSystemConfigurationAction = new TDEAction(
554 554
 		i18n("Check &System Configuration"),
555
-		"button_ok", KShortcut(),
555
+		"button_ok", TDEShortcut(),
556 556
 		this, SLOT(slotCheckSystemConfig()),
557 557
 		actionCollection(), "kshutdown_checksystemconfiguration"
558 558
 	);
559 559
 
560 560
 	_configureKShutDownAction = KStdAction::preferences(this, SLOT(slotConfigureKShutDown()), actionCollection());
561 561
 
562
-	_startAction = new KAction(
562
+	_startAction = new TDEAction(
563 563
 		i18n("&Start"),
564
-		"button_ok", KShortcut(Key_Return),
564
+		"button_ok", TDEShortcut(Key_Return),
565 565
 		this, SLOT(slotStart()),
566 566
 		actionCollection(), "kshutdown_startaction"
567 567
 	);
568 568
 	MiscUtils::plug(_startAction, b_startStop);
569 569
 
570
-	_statisticsAction = new KAction(
570
+	_statisticsAction = new TDEAction(
571 571
 		i18n("&Statistics"),
572
-		KShortcut(Key_F2),
572
+		TDEShortcut(Key_F2),
573 573
 		this, SLOT(slotStats()),
574 574
 		actionCollection(), "kshutdown_statistics"
575 575
 	);
@@ -578,7 +578,7 @@ void MMainWindow::initActions()
578 578
 	ac_shutDown->readShortcutSettings();
579 579
 
580 580
 	// init global actions/shortcuts
581
-	_globalAccel = new KGlobalAccel(this);
581
+	_globalAccel = new TDEGlobalAccel(this);
582 582
 	_globalAccel->insert(
583 583
 		"kshutdown_shutdown",
584 584
 		ks_actions->getName(Action::ShutDown),
@@ -735,7 +735,7 @@ void MMainWindow::updateTimeInfo(const int secs)
735 735
 {
736 736
 	setCaptions(
737 737
 		MiscUtils::formatDateTime(secs),
738
-		KGlobal::locale()->formatDateTime(dt_end, true, true)
738
+		TDEGlobal::locale()->formatDateTime(dt_end, true, true)
739 739
 	);
740 740
 
741 741
 	// update progress bar

+ 14
- 14
kshutdown/mmainwindow.h View File

@@ -25,20 +25,20 @@
25 25
 
26 26
 #include <ntqdatetime.h>
27 27
 
28
-#include <kmainwindow.h>
28
+#include <tdemainwindow.h>
29 29
 
30 30
 class AppObserver;
31 31
 
32 32
 class TQDateTimeEdit;
33 33
 class TQLabel;
34 34
 
35
-class KGlobalAccel;
35
+class TDEGlobalAccel;
36 36
 class KPushButton;
37 37
 
38 38
 #define ks_main MMainWindow::getInstance()
39 39
 
40 40
 /** @short The main window. */
41
-class MMainWindow: public KMainWindow, virtual public KShutdownIface
41
+class MMainWindow: public TDEMainWindow, virtual public KShutdownIface
42 42
 {
43 43
 	Q_OBJECT
44 44
 public:
@@ -80,14 +80,14 @@ public:
80 80
 	void start(const bool confirmation = true);
81 81
 
82 82
 	// actions
83
-	inline KAction *cancelAction() const { return _cancelAction; }
84
-	inline KAction *checkSystemConfigurationAction() const { return _checkSystemConfigurationAction; }
85
-	inline KAction *configureKShutDownAction() const { return _configureKShutDownAction; }
86
-	inline KAction *lockScreenAction() const { return _lockScreenAction; }
87
-	inline KAction *logoutAction() const { return _logoutAction; }
88
-	inline KAction *rebootAction() const { return _rebootAction; }
89
-	inline KAction *shutDownAction() const { return _shutDownAction; }
90
-	inline KAction *statisticsAction() const { return _statisticsAction; }
83
+	inline TDEAction *cancelAction() const { return _cancelAction; }
84
+	inline TDEAction *checkSystemConfigurationAction() const { return _checkSystemConfigurationAction; }
85
+	inline TDEAction *configureKShutDownAction() const { return _configureKShutDownAction; }
86
+	inline TDEAction *lockScreenAction() const { return _lockScreenAction; }
87
+	inline TDEAction *logoutAction() const { return _logoutAction; }
88
+	inline TDEAction *rebootAction() const { return _rebootAction; }
89
+	inline TDEAction *shutDownAction() const { return _shutDownAction; }
90
+	inline TDEAction *statisticsAction() const { return _statisticsAction; }
91 91
 
92 92
 	// DCOP:
93 93
 	// general:
@@ -106,7 +106,7 @@ public:
106 106
 private:
107 107
 	bool _showMinimizeInfo;
108 108
 	// actions
109
-	KAction
109
+	TDEAction
110 110
 		*_cancelAction,
111 111
 		*_checkSystemConfigurationAction,
112 112
 		*_configureKShutDownAction,
@@ -116,8 +116,8 @@ private:
116 116
 		*_shutDownAction,
117 117
 		*_startAction,
118 118
 		*_statisticsAction;
119
-	KActionCollection *ac_shutDown;
120
-	KGlobalAccel *_globalAccel;
119
+	TDEActionCollection *ac_shutDown;
120
+	TDEGlobalAccel *_globalAccel;
121 121
 
122 122
 	int _oldSec;
123 123
 	AppObserver *_appObserver;

+ 3
- 3
kshutdown/mmessagedialog.cpp View File

@@ -30,10 +30,10 @@
30 30
 
31 31
 #include <kdebug.h>
32 32
 #include <kiconloader.h>
33
-#include <klocale.h>
34
-#include <kpopupmenu.h>
33
+#include <tdelocale.h>
34
+#include <tdepopupmenu.h>
35 35
 #include <kpushbutton.h>
36
-#include <kwin.h>
36
+#include <twin.h>
37 37
 
38 38
 // public
39 39
 

+ 21
- 21
kshutdown/msettingsdialog.cpp View File

@@ -40,13 +40,13 @@
40 40
 #include <ntqvgroupbox.h>
41 41
 #include <ntqwhatsthis.h>
42 42
 
43
-#include <kconfigdialogmanager.h>
43
+#include <tdeconfigdialogmanager.h>
44 44
 #include <kiconloader.h>
45 45
 #include <klineedit.h>
46
-#include <klistview.h>
47
-#include <klocale.h>
48
-#include <kmessagebox.h>
49
-#include <kpopupmenu.h>
46
+#include <tdelistview.h>
47
+#include <tdelocale.h>
48
+#include <tdemessagebox.h>
49
+#include <tdepopupmenu.h>
50 50
 #include <knuminput.h>
51 51
 #include <kpushbutton.h>
52 52
 #include <kstandarddirs.h>
@@ -77,7 +77,7 @@ MSettingsDialog::MSettingsDialog(TQWidget *parent)
77 77
 	initActionsPage();
78 78
 	initAdvancedPage();
79 79
 
80
-	_configDialogManager = new KConfigDialogManager(this, kshutdownrc);
80
+	_configDialogManager = new TDEConfigDialogManager(this, kshutdownrc);
81 81
 	_configDialogManager->updateWidgets();
82 82
 	connect(_configDialogManager, SIGNAL(widgetModified()), SLOT(slotConfigChanged()));
83 83
 
@@ -85,7 +85,7 @@ MSettingsDialog::MSettingsDialog(TQWidget *parent)
85 85
 	connect(this, SIGNAL(okClicked()), SLOT(slotOKClicked()));
86 86
 
87 87
 	// lock after login
88
-	c_autoLock->setChecked(TQFile::exists(KGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop"));
88
+	c_autoLock->setChecked(TQFile::exists(TDEGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop"));
89 89
 
90 90
 	setInitialSize(configDialogSize("Settings Dialog"));
91 91
 	showPage(_lastPage); // restore last page
@@ -134,7 +134,7 @@ void MSettingsDialog::initActionsPage()
134 134
 
135 135
 	TQVGroupBox *gb_general = new TQVGroupBox(i18n("Actions"), _actionsPage);
136 136
 
137
-	_actions = new KListView(gb_general, "KListView::_actions");
137
+	_actions = new TDEListView(gb_general, "TDEListView::_actions");
138 138
 	_actions->setAllColumnsShowFocus(true);
139 139
 	_actions->setItemMargin(5);
140 140
 	_actions->setMaximumHeight(200);
@@ -144,16 +144,16 @@ void MSettingsDialog::initActionsPage()
144 144
 	_actions->addColumn(i18n("Command before action"));
145 145
 	_actions->header()->setClickEnabled(false);
146 146
 
147
-	_logoutItem = new KListViewItem(_actions, ks_actions->getName(Action::Logout));
147
+	_logoutItem = new TDEListViewItem(_actions, ks_actions->getName(Action::Logout));
148 148
 	_logoutItem->setPixmap(0, ks_actions->getIcon(Action::Logout));
149 149
 
150
-	_lockScreenItem = new KListViewItem(_actions, ks_actions->getName(Action::LockScreen));
150
+	_lockScreenItem = new TDEListViewItem(_actions, ks_actions->getName(Action::LockScreen));
151 151
 	_lockScreenItem->setPixmap(0, ks_actions->getIcon(Action::LockScreen));
152 152
 
153
-	_rebootItem = new KListViewItem(_actions, ks_actions->getName(Action::Reboot));
153
+	_rebootItem = new TDEListViewItem(_actions, ks_actions->getName(Action::Reboot));
154 154
 	_rebootItem->setPixmap(0, ks_actions->getIcon(Action::Reboot));
155 155
 
156
-	_shutDownItem = new KListViewItem(_actions, ks_actions->getName(Action::ShutDown));
156
+	_shutDownItem = new TDEListViewItem(_actions, ks_actions->getName(Action::ShutDown));
157 157
 	_shutDownItem->setPixmap(0, ks_actions->getIcon(Action::ShutDown));
158 158
 
159 159
 	connect(_actions, SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), SLOT(slotEditAction()));
@@ -331,7 +331,7 @@ void MSettingsDialog::initMessagesPage()
331 331
 	l_customMessageCommand->setBuddy(in_customMessageCommand);
332 332
 
333 333
 	KPushButton *b_customMessagePresets = new KPushButton(i18n("Presets"), w_customMessage, "KPushButton::b_customMessagePresets");
334
-	KPopupMenu *pm_customMessagePresets = new KPopupMenu(b_customMessagePresets);
334
+	TDEPopupMenu *pm_customMessagePresets = new TDEPopupMenu(b_customMessagePresets);
335 335
 	pm_customMessagePresets->insertItem("KDialog", this, SLOT(slotSetKDialogCustomMessage()));
336 336
 	pm_customMessagePresets->insertItem("Amor", this, SLOT(slotSetAmorCustomMessage()));
337 337
 	b_customMessagePresets->setPopup(pm_customMessagePresets);
@@ -383,7 +383,7 @@ void MSettingsDialog::initMessagesPage()
383 383
 		b_testCustomMessage, SLOT(setEnabled(bool)));
384 384
 }
385 385
 
386
-Action::Type MSettingsDialog::itemToActionType(const KListViewItem *item) const
386
+Action::Type MSettingsDialog::itemToActionType(const TDEListViewItem *item) const
387 387
 {
388 388
 	if (!item)
389 389
 		return Action::Nothing;
@@ -412,7 +412,7 @@ void MSettingsDialog::updateActions()
412 412
 	_actions->setCurrentItem(_shutDownItem);
413 413
 }
414 414
 
415
-void MSettingsDialog::updateItem(KListViewItem *item)
415
+void MSettingsDialog::updateItem(TDEListViewItem *item)
416 416
 {
417 417
 	Action::Type action = itemToActionType(item);
418 418
 
@@ -435,7 +435,7 @@ void MSettingsDialog::updateItem(KListViewItem *item)
435 435
 	// command before action
436 436
 	if (!group.isNull())
437 437
 	{
438
-		KConfig *conf = kshutdownrc->config();
438
+		TDEConfig *conf = kshutdownrc->config();
439 439
 		conf->setGroup(group);
440 440
 		if (conf->readBoolEntry("RunCommandBeforeAction", false))
441 441
 		{
@@ -473,7 +473,7 @@ void MSettingsDialog::slotCustomMessageTest()
473 473
 
474 474
 void MSettingsDialog::slotEditAction()
475 475
 {
476
-	KListViewItem *item = static_cast<KListViewItem *>(_actions->currentItem());
476
+	TDEListViewItem *item = static_cast<TDEListViewItem *>(_actions->currentItem());
477 477
 
478 478
 	if (!item)
479 479
 		return;
@@ -495,7 +495,7 @@ void MSettingsDialog::slotEnableAllMessages()
495 495
 
496 496
 void MSettingsDialog::slotKDESettings()
497 497
 {
498
-	MiscUtils::runCommand("kcmshell screensaver kcmsmserver kdm");
498
+	MiscUtils::runCommand("tdecmshell screensaver kcmsmserver tdm");
499 499
 }
500 500
 
501 501
 void MSettingsDialog::slotOKClicked()
@@ -509,7 +509,7 @@ void MSettingsDialog::slotOKClicked()
509 509
 	if (c_autoLock->isChecked())
510 510
 	{
511 511
 		Links::createLink(
512
-			KGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop",
512
+			TDEGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop",
513 513
 			"kshutdown --init --lock",
514 514
 			"kshutdown",
515 515
 			"KShutDown",
@@ -518,7 +518,7 @@ void MSettingsDialog::slotOKClicked()
518 518
 	}
519 519
 	else
520 520
 	{
521
-		Links::removeLink(KGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop");
521
+		Links::removeLink(TDEGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop");
522 522
 	}
523 523
 
524 524
 	int id = gb_systemTray->selectedId();
@@ -598,7 +598,7 @@ void MSettingsDialog::slotDefault()
598 598
 		)
599 599
 			return;
600 600
 
601
-		KConfig *conf = kshutdownrc->config();
601
+		TDEConfig *conf = kshutdownrc->config();
602 602
 		conf->deleteGroup("Shut Down");
603 603
 		conf->deleteGroup("Reboot");
604 604
 		conf->deleteGroup("Lock Screen");

+ 8
- 8
kshutdown/msettingsdialog.h View File

@@ -27,11 +27,11 @@
27 27
 class TQCheckBox;
28 28
 class TQHButtonGroup;
29 29
 
30
-class KConfigDialogManager;
30
+class TDEConfigDialogManager;
31 31
 class KIntNumInput;
32 32
 class KLineEdit;
33
-class KListView;
34
-class KListViewItem;
33
+class TDEListView;
34
+class TDEListViewItem;
35 35
 class KPushButton;
36 36
 
37 37
 /** @short A settings dialog. */
@@ -69,11 +69,11 @@ public:
69 69
 private:
70 70
 	static int _lastPage;
71 71
 	static MSettingsDialog *_instance;
72
-	KConfigDialogManager *_configDialogManager;
72
+	TDEConfigDialogManager *_configDialogManager;
73 73
 	KIntNumInput *in_warningMessageDelay;
74 74
 	KLineEdit *in_customMessageCommand;
75
-	KListView *_actions;
76
-	KListViewItem
75
+	TDEListView *_actions;
76
+	TDEListViewItem
77 77
 		*_lockScreenItem,
78 78
 		*_logoutItem,
79 79
 		*_rebootItem,
@@ -101,9 +101,9 @@ private:
101 101
 	void initAdvancedPage();
102 102
 	void initGeneralPage();
103 103
 	void initMessagesPage();
104
-	Action::Type itemToActionType(const KListViewItem *item) const;
104
+	Action::Type itemToActionType(const TDEListViewItem *item) const;
105 105
 	void updateActions();
106
-	void updateItem(KListViewItem *item);
106
+	void updateItem(TDEListViewItem *item);
107 107
 private slots:
108 108
 	void slotCheckSystemConfig();
109 109
 	void slotConfigChanged();

+ 2
- 2
kshutdown/mstatstab.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <ntqwhatsthis.h>
32 32
 
33 33
 #include <kiconloader.h>
34
-#include <klocale.h>
34
+#include <tdelocale.h>
35 35
 #include <kpushbutton.h>
36 36
 
37 37
 // public
@@ -159,7 +159,7 @@ void MStatsTab::slotProcessExit() {
159 159
 	KS_WARNING("sudo")
160 160
 	KS_WARNING("telnet")
161 161
 
162
-	_buf.prepend("<pre style=\"font-family: " + KGlobalSettings::fixedFont().family() + "\"><b>");
162
+	_buf.prepend("<pre style=\"font-family: " + TDEGlobalSettings::fixedFont().family() + "\"><b>");
163 163
 	_buf.append("</b></pre>");
164 164
 
165 165
 	te_output->setText(MiscUtils::HTML(_buf));

+ 8
- 8
kshutdown/msystemtray.cpp View File

@@ -24,14 +24,14 @@
24 24
 
25 25
 #include <ntqtimer.h>
26 26
 
27
-#include <kaction.h>
27
+#include <tdeaction.h>
28 28
 #include <kdebug.h>
29 29
 #include <kiconloader.h>
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 #include <kpixmap.h>
32 32
 #include <kpixmapeffect.h>
33
-#include <kpopupmenu.h>
34
-#include <kwin.h>
33
+#include <tdepopupmenu.h>
34
+#include <twin.h>
35 35
 
36 36
 const double
37 37
 	KS_TRAY_FADE_CHANGE = 0.05f,
@@ -134,7 +134,7 @@ MSystemTray::MSystemTray()
134 134
 	_flashCount(0),
135 135
 	_saveIcon(0)
136 136
 {
137
-	setPixmap(SmallIcon("exit", KIcon::SizeSmallMedium)); // 22x22
137
+	setPixmap(SmallIcon("exit", TDEIcon::SizeSmallMedium)); // 22x22
138 138
 
139 139
 // TODO: 2.0: mouse wheel: decrease/increase end time by 5min. (?)
140 140
 
@@ -147,13 +147,13 @@ MSystemTray::MSystemTray()
147 147
 	connect(_flashTimer, SIGNAL(timeout()), SLOT(slotFlashTimeout()));
148 148
 
149 149
 	// init icons
150
-	KPixmap pm(SmallIcon("exit", KIcon::SizeSmallMedium));
150
+	KPixmap pm(SmallIcon("exit", TDEIcon::SizeSmallMedium));
151 151
 	_flashIcon = new KPixmap(KPixmapEffect::fade(pm, 0.7f, white));
152 152
 
153 153
 	show();
154 154
 
155 155
 	// add some items to the context menu
156
-	KPopupMenu *pm_systemTrayMenu = contextMenu();
156
+	TDEPopupMenu *pm_systemTrayMenu = contextMenu();
157 157
 	pm_systemTrayMenu->setCaption("KShutDown");
158 158
 	// id 0 = title
159 159
 	ks_main->shutDownAction()->plug(pm_systemTrayMenu, 1);
@@ -194,7 +194,7 @@ void MSystemTray::slotFade()
194 194
 			_fadeValue = 0.0f;
195 195
 		}
196 196
 	}
197
-	KPixmap p(SmallIcon("exit", KIcon::SizeSmallMedium));
197
+	KPixmap p(SmallIcon("exit", TDEIcon::SizeSmallMedium));
198 198
 	setPixmap(KPixmapEffect::fade(p, _fadeValue, KS_TRAY_FADE_COLOR));
199 199
 }
200 200
 

+ 1
- 1
kshutdown/mtip.cpp View File

@@ -86,5 +86,5 @@ void MTip::setTipType(const TipType value)
86 86
 
87 87
 TQString MTip::getIconPath(const TQString &name) const
88 88
 {
89
-	return KGlobal::iconLoader()->iconPath(name, KIcon::NoGroup, KIcon::SizeLarge);
89
+	return TDEGlobal::iconLoader()->iconPath(name, TDEIcon::NoGroup, TDEIcon::SizeLarge);
90 90
 }

+ 4
- 4
kshutdown/progressbar.cpp View File

@@ -21,10 +21,10 @@
21 21
 #include <ntqdesktopwidget.h>
22 22
 #include <ntqpainter.h>
23 23
 
24
-#include <kapplication.h>
24
+#include <tdeapplication.h>
25 25
 #include <kdebug.h>
26
-#include <klocale.h>
27
-#include <kpopupmenu.h>
26
+#include <tdelocale.h>
27
+#include <tdepopupmenu.h>
28 28
 
29 29
 #include "configuration.h"
30 30
 #include "progressbar.h"
@@ -94,7 +94,7 @@ void ProgressBar::mousePressEvent(TQMouseEvent *e) {
94 94
 // TODO: 2.0: color configuration
95 95
 // TODO: 2.0: size configuration
96 96
 		// show popup menu
97
-		KPopupMenu *popup = new KPopupMenu(this);
97
+		TDEPopupMenu *popup = new TDEPopupMenu(this);
98 98
 		popup->insertTitle(kapp->miniIcon(), "KShutDown");
99 99
 		popup->insertItem(i18n("Hide"), this, SLOT(hide()));
100 100
 		popup->insertTitle("Position");

+ 10
- 10
kshutdown/systemconfig.cpp View File

@@ -25,10 +25,10 @@
25 25
 #include <ntqfileinfo.h>
26 26
 #include <ntqheader.h>
27 27
 
28
-#include <kapplication.h>
28
+#include <tdeapplication.h>
29 29
 #include <kiconloader.h>
30
-#include <klistview.h>
31
-#include <klocale.h>
30
+#include <tdelistview.h>
31
+#include <tdelocale.h>
32 32
 
33 33
 // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=417301
34 34
 #include <cstdlib>
@@ -77,7 +77,7 @@ SystemConfig::SystemConfig(TQWidget *parent)
77 77
 	),
78 78
 	_problems(0)
79 79
 {
80
-	_messages = new KListView(this, "KListView::_messages");
80
+	_messages = new TDEListView(this, "TDEListView::_messages");
81 81
 	_messages->setAllColumnsShowFocus(true);
82 82
 	_messages->setItemMargin(5);
83 83
 	_messages->setSorting(-1); // no sort
@@ -100,9 +100,9 @@ SystemConfig::SystemConfig(TQWidget *parent)
100 100
 		add(OK, i18n("No problems were found."));
101 101
 }
102 102
 
103
-KListViewItem *SystemConfig::add(const Type type, const TQString &message)
103
+TDEListViewItem *SystemConfig::add(const Type type, const TQString &message)
104 104
 {
105
-	KListViewItem *item = new KListViewItem(_messages);
105
+	TDEListViewItem *item = new TDEListViewItem(_messages);
106 106
 	item->setMultiLinesEnabled(true);
107 107
 	switch (type)
108 108
 	{
@@ -148,7 +148,7 @@ void SystemConfig::checkKDE()
148 148
 	}
149 149
 }
150 150
 
151
-/* TODO: 2.0: KDM configurator
151
+/* TODO: 2.0: TDM configurator
152 152
 From old FAQ:
153 153
 - Do it as root!
154 154
 - Make sure you first create backup of the "/etc/sysconfig/desktop" file
@@ -162,7 +162,7 @@ void SystemConfig::checkKDM()
162 162
 	{
163 163
 // TODO: 2.0: auto configuration
164 164
 		add(Info, i18n("Tip: You can customize Actions to work with GDM.\n(Settings -> Configure KShutDown... -> Actions)"));
165
-		_kdmNotDetected = add(Warning, i18n("KDE Display Manager is not running,\nor the shut down/reboot function is disabled.\n\nClick here to configure KDM."));
165
+		_tdmNotDetected = add(Warning, i18n("KDE Display Manager is not running,\nor the shut down/reboot function is disabled.\n\nClick here to configure TDM."));
166 166
 	}
167 167
 }
168 168
 
@@ -173,9 +173,9 @@ void SystemConfig::slotExecuted(TQListViewItem *item)
173 173
 	if (!item)
174 174
 		return;
175 175
 
176
-	if (item == _kdmNotDetected)
176
+	if (item == _tdmNotDetected)
177 177
 	{
178
-		MiscUtils::runShellCommand("kdesu -c \"kcmshell kdm\" -i \"exit\"");
178
+		MiscUtils::runShellCommand("tdesu -c \"tdecmshell tdm\" -i \"exit\"");
179 179
 
180 180
 		return;
181 181
 	}

+ 6
- 6
kshutdown/systemconfig.h View File

@@ -22,8 +22,8 @@
22 22
 
23 23
 #include <kdialogbase.h>
24 24
 
25
-class KListView;
26
-class KListViewItem;
25
+class TDEListView;
26
+class TDEListViewItem;
27 27
 
28 28
 /** @short A system configuration manager. */
29 29
 class SystemConfig: KDialogBase
@@ -44,12 +44,12 @@ private:
44 44
 	enum Type { Info, OK, Warning };
45 45
 	static int _canShutDown;
46 46
 	int _problems;
47
-	KListView *_messages;
48
-	KListViewItem
49
-		*_kdmNotDetected,
47
+	TDEListView *_messages;
48
+	TDEListViewItem
49
+		*_tdmNotDetected,
50 50
 		*_shutdownAllowItem;
51 51
 	SystemConfig(TQWidget *parent);
52
-	KListViewItem *add(const Type type, const TQString &message);
52
+	TDEListViewItem *add(const Type type, const TQString &message);
53 53
 	void checkFile(const TQString &file);
54 54
 	void checkKDE();
55 55
 	void checkKDM();

+ 1
- 1
kshutdownlockout/Makefile.am View File

@@ -4,7 +4,7 @@ METASOURCES = AUTO
4 4
 kde_module_LTLIBRARIES = kshutdownlockout_panelapplet.la
5 5
 
6 6
 kshutdownlockout_panelapplet_la_SOURCES = lockout.cpp
7
-kshutdownlockout_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_QT) -lDCOP $(all_libraries)
7
+kshutdownlockout_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT) -lDCOP $(all_libraries)
8 8
 kshutdownlockout_panelapplet_la_LIBADD = $(LIB_KSYCOCA)
9 9
 
10 10
 noinst_HEADERS = lockout.h

+ 2
- 2
kshutdownlockout/kshutdownlockout.desktop View File

@@ -43,7 +43,7 @@ Comment[nn]=Panelknappar for skjermlås/utlogging
43 43
 Comment[nso]=Ditobetswa tsa Notlelo/Etswa tsa panel
44 44
 Comment[pa]=ਪੈਨਲ ਲਈ ਤਾਲਾ/ਬਾਹਰੀ ਦਰ ਐਪਲਿਟ
45 45
 Comment[pl]=Przyciski blokowania i wylogowania dla panelu
46
-Comment[pt]=Os botões para trancar o ecrã e sair do KDE para o painel
46
+Comment[pt]=Os botões para trancar o ecrã e sair do TDE para o painel
47 47
 Comment[pt_BR]=Botões de Travar/Sair para o Painel
48 48
 Comment[ro]=Butoane de ieşire şi de blocare ecran, pentru panou
49 49
 Comment[ru]=Кнопки выхода/запирания экрана на панели
@@ -68,4 +68,4 @@ Comment[zh_TW]=在面板上顯示「螢幕鎖定/登出」按鈕
68 68
 Comment[zu]=Izinkinobho Zokukhiya/Ukuphumela ngaphandle zewindi lemininingwane
69 69
 # DUPLICATE: Comment[el]=Κουμπιά κλειδώματος/αποσύνδεσης για τον πίνακα
70 70
 Icon=kshutdown
71
-X-KDE-Library=kshutdownlockout_panelapplet
71
+X-TDE-Library=kshutdownlockout_panelapplet

+ 23
- 23
kshutdownlockout/lockout.cpp View File

@@ -38,13 +38,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
38 38
 #include <ntqtooltip.h>
39 39
 
40 40
 #include <dcopclient.h>
41
-#include <kaction.h>
42
-#include <kapplication.h>
43
-#include <kglobal.h>
41
+#include <tdeaction.h>
42
+#include <tdeapplication.h>
43
+#include <tdeglobal.h>
44 44
 #include <kiconloader.h>
45
-#include <klocale.h>
46
-#include <kmessagebox.h>
47
-#include <kpopupmenu.h>
45
+#include <tdelocale.h>
46
+#include <tdemessagebox.h>
47
+#include <tdepopupmenu.h>
48 48
 #include <kprocess.h>
49 49
 #include <krun.h>
50 50
 
@@ -60,7 +60,7 @@ extern "C"
60 60
 	KDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
61 61
 	{
62 62
 		// share i18n with KShutDown
63
-		KGlobal::locale()->insertCatalogue("kshutdown");
63
+		TDEGlobal::locale()->insertCatalogue("kshutdown");
64 64
 
65 65
 		return new Lockout(configFile, parent);
66 66
 	}
@@ -82,7 +82,7 @@ Lockout::Lockout(const TQString& configFile, TQWidget *parent)
82 82
 
83 83
 	initActions();
84 84
 
85
-	KPopupMenu *pm_actions = new KPopupMenu(this);
85
+	TDEPopupMenu *pm_actions = new TDEPopupMenu(this);
86 86
 	pm_actions->insertTitle(SmallIcon("messagebox_warning"), i18n("No Delay"));
87 87
 	_shutDownAction->plug(pm_actions);
88 88
 	_rebootAction->plug(pm_actions);
@@ -105,7 +105,7 @@ Lockout::Lockout(const TQString& configFile, TQWidget *parent)
105 105
 	layout->addWidget(button);
106 106
 
107 107
 /*	// read configuration
108
-	KConfig *config = this->config();
108
+	TDEConfig *config = this->config();
109 109
 	config->setGroup("kshutdownlockout");
110 110
 	_transparent = config->readBoolEntry("Transparent", true);
111 111
 */
@@ -124,7 +124,7 @@ Lockout::Lockout(const TQString& configFile, TQWidget *parent)
124 124
 
125 125
 Lockout::~Lockout()
126 126
 {
127
-	KGlobal::locale()->removeCatalogue("kshutdown");
127
+	TDEGlobal::locale()->removeCatalogue("kshutdown");
128 128
 }
129 129
 
130 130
 int Lockout::heightForWidth(int/* width*/) const
@@ -143,7 +143,7 @@ void Lockout::callKShutDown(const TQCString &function) {
143 143
 	DCOPClient *client = kapp->dcopClient();
144 144
 	if (!client->isApplicationRegistered("kshutdown")) {
145 145
 		// run KShutDown
146
-		KProcess *p = new KProcess();
146
+		TDEProcess *p = new TDEProcess();
147 147
 		if (!p) {
148 148
 			KMessageBox::error(0, i18n("Could not run KShutDown!"));
149 149
 
@@ -151,7 +151,7 @@ void Lockout::callKShutDown(const TQCString &function) {
151 151
 		}
152 152
 		*p << "kshutdown";
153 153
 		*p << "--init";
154
-		if (!p->start(KProcess::Block))
154
+		if (!p->start(TDEProcess::Block))
155 155
 			KMessageBox::error(0, i18n("Could not run KShutDown!"));
156 156
 		delete p;
157 157
 	}
@@ -159,36 +159,36 @@ void Lockout::callKShutDown(const TQCString &function) {
159 159
 }
160 160
 
161 161
 void Lockout::initActions() {
162
-	KActionCollection *ac_shutDown = new KActionCollection(this, this);
162
+	TDEActionCollection *ac_shutDown = new TDEActionCollection(this, this);
163 163
 
164
-	_lockScreenAction = new KAction(
165
-		i18n("Lock Screen"), "lock", KShortcut(),
164
+	_lockScreenAction = new TDEAction(
165
+		i18n("Lock Screen"), "lock", TDEShortcut(),
166 166
 		this, SLOT(slotLockScreen()),
167 167
 		ac_shutDown, "kshutdown_lockscreen"
168 168
 	);
169 169
 
170
-	_logoutAction = new KAction(
171
-		i18n("End Current Session"), "undo", KShortcut(),
170
+	_logoutAction = new TDEAction(
171
+		i18n("End Current Session"), "undo", TDEShortcut(),
172 172
 		this, SLOT(slotLogout()),
173 173
 		ac_shutDown, "kshutdown_logout"
174 174
 	);
175 175
 
176
-	_rebootAction = new KAction(
177
-		i18n("Restart Computer"), "reload", KShortcut(),
176
+	_rebootAction = new TDEAction(
177
+		i18n("Restart Computer"), "reload", TDEShortcut(),
178 178
 		this, SLOT(slotReboot()),
179 179
 		ac_shutDown, "kshutdown_reboot"
180 180
 	);
181 181
 
182
-	_shutDownAction = new KAction(
183
-		i18n("Turn Off Computer"), "exit", KShortcut(),