Browse Source

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

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
de7e5867a6
100 changed files with 144 additions and 147 deletions
  1. 9
    11
      CMakeLists.txt
  2. 5
    5
      ConfigureChecks.cmake
  3. 1
    1
      README
  4. 1
    1
      applnk/compat/battery.desktop
  5. 1
    1
      applnk/compat/bwarning.desktop
  6. 1
    1
      applnk/compat/cwarning.desktop
  7. 1
    1
      applnk/compat/email.desktop
  8. 1
    1
      applnk/compat/kcmkonq.desktop
  9. 1
    1
      applnk/compat/kcmkxmlrpcd.desktop
  10. 1
    1
      applnk/compat/konqhtml.desktop
  11. 1
    1
      applnk/compat/passwords.desktop
  12. 1
    1
      applnk/compat/power.desktop
  13. 1
    1
      applnk/compat/socks.desktop
  14. 1
    1
      applnk/compat/userinfo.desktop
  15. 1
    1
      applnk/compat/virtualdesktops.desktop
  16. 6
    7
      config.h.cmake
  17. 1
    1
      configure.in.in
  18. 1
    1
      doc/faq/panel.docbook
  19. 2
    2
      doc/glossary/index.docbook
  20. 1
    1
      doc/glossary/tdeprintingglossary.docbook
  21. 2
    2
      doc/kcontrol/filemanager/index.docbook
  22. 0
    0
      doc/kcontrol/filemanager/tdefileman1.png
  23. 0
    0
      doc/kcontrol/filemanager/tdefileman2.png
  24. 1
    1
      doc/kcontrol/index.docbook
  25. 1
    1
      doc/kcontrol/proxy/index.docbook
  26. 1
    1
      doc/kicker/index.docbook
  27. 3
    3
      doc/konqueror/browser.docbook
  28. 1
    1
      doc/ksplashml/index.docbook
  29. 1
    1
      doc/kxkb/index.docbook
  30. 1
    1
      doc/tdeioslave/CMakeLists.txt
  31. 0
    0
      doc/tdeioslave/Makefile.am
  32. 5
    5
      doc/tdeioslave/bzip.docbook
  33. 5
    5
      doc/tdeioslave/bzip2.docbook
  34. 0
    0
      doc/tdeioslave/cgi.docbook
  35. 0
    0
      doc/tdeioslave/data.docbook
  36. 0
    0
      doc/tdeioslave/file.docbook
  37. 1
    1
      doc/tdeioslave/finger.docbook
  38. 1
    1
      doc/tdeioslave/fish.docbook
  39. 0
    0
      doc/tdeioslave/floppy.docbook
  40. 0
    0
      doc/tdeioslave/ftp.docbook
  41. 0
    0
      doc/tdeioslave/gopher.docbook
  42. 5
    5
      doc/tdeioslave/gzip.docbook
  43. 0
    0
      doc/tdeioslave/help.docbook
  44. 2
    2
      doc/tdeioslave/http.docbook
  45. 1
    1
      doc/tdeioslave/https.docbook
  46. 1
    1
      doc/tdeioslave/imap.docbook
  47. 1
    1
      doc/tdeioslave/imaps.docbook
  48. 0
    0
      doc/tdeioslave/index.docbook
  49. 0
    0
      doc/tdeioslave/info.docbook
  50. 1
    1
      doc/tdeioslave/lan.docbook
  51. 1
    1
      doc/tdeioslave/ldap.docbook
  52. 0
    0
      doc/tdeioslave/mac.docbook
  53. 1
    1
      doc/tdeioslave/mailto.docbook
  54. 0
    0
      doc/tdeioslave/man.docbook
  55. 0
    0
      doc/tdeioslave/mrml.docbook
  56. 1
    1
      doc/tdeioslave/news.docbook
  57. 0
    0
      doc/tdeioslave/nfs.docbook
  58. 3
    3
      doc/tdeioslave/nntp.docbook
  59. 0
    0
      doc/tdeioslave/pop3.docbook
  60. 0
    0
      doc/tdeioslave/pop3s.docbook
  61. 1
    1
      doc/tdeioslave/print.docbook
  62. 0
    0
      doc/tdeioslave/rlan.docbook
  63. 2
    2
      doc/tdeioslave/rlogin.docbook
  64. 0
    0
      doc/tdeioslave/sftp.docbook
  65. 1
    1
      doc/tdeioslave/smb.docbook
  66. 0
    0
      doc/tdeioslave/smtp.docbook
  67. 0
    0
      doc/tdeioslave/tar.docbook
  68. 0
    0
      doc/tdeioslave/telnet.docbook
  69. 5
    5
      doc/tdeioslave/thumbnail.docbook
  70. 2
    2
      doc/tdeioslave/webdav.docbook
  71. 1
    1
      doc/tdeioslave/webdavs.docbook
  72. 1
    1
      doc/tdeprint/highlights.docbook
  73. 1
    1
      doc/tdeprint/tech-overview.docbook
  74. 1
    1
      doc/userguide/groupware-kontact.docbook
  75. 22
    22
      doc/userguide/tde-for-admins.docbook
  76. 2
    2
      drkonqi/CMakeLists.txt
  77. 1
    1
      drkonqi/debugger.cpp
  78. 1
    1
      drkonqi/krashconf.cpp
  79. 1
    1
      kappfinder/CMakeLists.txt
  80. 1
    1
      kate/app/kateapp.cpp
  81. 2
    2
      kate/app/katedocmanager.cpp
  82. 1
    1
      kate/app/kateexternaltools.cpp
  83. 1
    1
      kate/app/katefilelist.cpp
  84. 2
    2
      kate/app/katefileselector.cpp
  85. 1
    1
      kate/app/katefileselector.h
  86. 1
    1
      kate/app/kategrepdialog.cpp
  87. 1
    1
      kate/app/katemain.cpp
  88. 1
    1
      kate/app/katemainwindow.cpp
  89. 1
    1
      kate/app/katemdi.cpp
  90. 1
    1
      kate/app/katepluginmanager.cpp
  91. 1
    1
      kate/app/kateviewspace.cpp
  92. 2
    2
      kate/app/kwritemain.cpp
  93. 1
    1
      kate/data/CMakeLists.txt
  94. 1
    1
      kate/data/Makefile.am
  95. 2
    2
      kcminit/main.cpp
  96. 1
    1
      kcontrol/TODO
  97. 1
    1
      kcontrol/access/CMakeLists.txt
  98. 1
    1
      kcontrol/access/kaccess.cpp
  99. 1
    1
      kcontrol/access/kcmaccess.cpp
  100. 0
    0
      kcontrol/access/kcmaccess.desktop

+ 9
- 11
CMakeLists.txt View File

@@ -22,7 +22,6 @@ set( VERSION "R14" )
22 22
 
23 23
 include( FindPkgConfig )
24 24
 include( CheckIncludeFile )
25
-include( CheckIncludeFiles )
26 25
 include( CheckCSourceRuns )
27 26
 include( CheckCXXSourceRuns )
28 27
 include( CheckCXXSourceCompiles )
@@ -85,16 +84,15 @@ option( WITH_HAL "Enable HAL support" ${WITH_ALL_OPTIONS} )
85 84
 option( WITH_TDEHWLIB "Enable TDE hardware library support" OFF )
86 85
 option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
87 86
 option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
88
-option( WITH_KDESKTOP_LOCK_BACKTRACE "Enable backtrace in kdesktop_lock exception handler"  ${WITH_ALL_OPTIONS} )
89 87
 
90 88
 ##### options comments ##########################
91 89
 
92
-# WITH_SASL         affects kioslaves(kio_ldap kio_smtp kio_pop3)
93
-# WITH_LDAP         affects kioslaves(kio_ldap)
94
-# WITH_SAMBA        affects kioslaves(kio_samba) kcontrol
95
-# WITH_OPENEXR      affects kioslaves(thumbnail)
90
+# WITH_SASL         affects tdeioslaves(kio_ldap kio_smtp kio_pop3)
91
+# WITH_LDAP         affects tdeioslaves(kio_ldap)
92
+# WITH_SAMBA        affects tdeioslaves(kio_samba) kcontrol
93
+# WITH_OPENEXR      affects tdeioslaves(thumbnail)
96 94
 # WITH_XCOMPOSITE   affects twin kicker(taskmanager) tdm
97
-# WITH_XCURSOR      affects kioslaves(thumbnail), kcontrol(input), kdesktop
95
+# WITH_XCURSOR      affects tdeioslaves(thumbnail), kcontrol(input), kdesktop
98 96
 # WITH_XFIXES       affects twin klipper kicker(taskmanager)
99 97
 # WITH_XDAMAGE      affects <nothing>
100 98
 # WITH_XEXT         affects <nothing>
@@ -113,8 +111,8 @@ option( WITH_KDESKTOP_LOCK_BACKTRACE "Enable backtrace in kdesktop_lock exceptio
113 111
 # WITH_XINERAMA     affects ksplashml
114 112
 # WITH_ARTS         affects libkonq khotkeys
115 113
 # WITH_I8K          affects ksysguard
116
-# WITH_HAL          affects kioslaves(media) ksmserver
117
-# WITH_TDEHWLIB     affects kioslaves(media), replaces WITH_HAL on systems without HAL
114
+# WITH_HAL          affects tdeioslaves(media) ksmserver
115
+# WITH_TDEHWLIB     affects tdeioslaves(media), replaces WITH_HAL on systems without HAL
118 116
 # WITH_LIBRAW1394   affects kcontrol(view1394)
119 117
 # WITH_PAM          affects tdm kdesktop kcheckpass
120 118
 # WITH_SHADOW       affects tdm kcheckpass
@@ -145,7 +143,7 @@ option( BUILD_KCONTROL "Build kcontrol" ${BUILD_ALL} )
145 143
 option( BUILD_TWIN "Build twin" ${BUILD_ALL} )
146 144
 option( BUILD_KATE "Build kate" ${BUILD_ALL} )
147 145
 option( BUILD_KONQUEROR "Build konqueror" ${BUILD_ALL} )
148
-option( BUILD_KIOSLAVES "Build kioslaves" ${BUILD_ALL} )
146
+option( BUILD_KIOSLAVES "Build tdeioslaves" ${BUILD_ALL} )
149 147
 option( BUILD_KICKER "Build kicker" ${BUILD_ALL} )
150 148
 option( BUILD_KDESKTOP "Build kdesktop" ${BUILD_ALL} )
151 149
 option( BUILD_KONSOLE "Build konsole" ${BUILD_ALL} )
@@ -223,7 +221,7 @@ add_subdirectory( kcontrol )
223 221
 tde_conditional_add_subdirectory( BUILD_TWIN twin )
224 222
 tde_conditional_add_subdirectory( BUILD_KATE kate )
225 223
 tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror )
226
-tde_conditional_add_subdirectory( BUILD_KIOSLAVES kioslave )
224
+tde_conditional_add_subdirectory( BUILD_KIOSLAVES tdeioslave )
227 225
 tde_conditional_add_subdirectory( BUILD_KICKER kicker )
228 226
 tde_conditional_add_subdirectory( BUILD_KDESKTOP kdesktop )
229 227
 tde_conditional_add_subdirectory( BUILD_KONSOLE konsole )

+ 5
- 5
ConfigureChecks.cmake View File

@@ -11,13 +11,13 @@
11 11
 
12 12
 tde_setup_architecture_flags( )
13 13
 
14
-# termios.h (tdm, kioslave)
14
+# termios.h (tdm, tdeioslave)
15 15
 if( BUILD_TDM OR BUILD_KIOSLAVES )
16 16
   check_include_file( termios.h HAVE_TERMIOS_H )
17 17
 endif( )
18 18
 
19 19
 
20
-# sys/ioctl.h (kioslave/fish, kcontrol/info)
20
+# sys/ioctl.h (tdeioslave/fish, kcontrol/info)
21 21
 if( BUILD_KIOSLAVES OR BUILD_KCONTROL )
22 22
   check_include_file( sys/ioctl.h HAVE_SYS_IOCTL_H )
23 23
 endif( )
@@ -37,7 +37,7 @@ if( WITH_PAM AND (BUILD_KCHECKPASS OR BUILD_TDM) )
37 37
 endif( )
38 38
 
39 39
 
40
-# hal (ksmserver, kioslaves)
40
+# hal (ksmserver, tdeioslaves)
41 41
 if( WITH_HAL )
42 42
   pkg_search_module( HAL hal )
43 43
   if( NOT HAL_FOUND )
@@ -80,7 +80,7 @@ if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_K
80 80
 endif( )
81 81
 
82 82
 
83
-# xcursor (kioslave, kcontrol)
83
+# xcursor (tdeioslave, kcontrol)
84 84
 if( WITH_XCURSOR )
85 85
   pkg_search_module( XCURSOR xcursor )
86 86
   if( XCURSOR_FOUND )
@@ -259,7 +259,7 @@ if( BUILD_TDM OR BUILD_KSMSERVER )
259 259
 endif( )
260 260
 
261 261
 
262
-# dbus-tqt (tdm, ksmserver, kioslaves(media))
262
+# dbus-tqt (tdm, ksmserver, tdeioslaves(media))
263 263
 if( BUILD_TDM OR BUILD_KSMSERVER OR (BUILD_KIOSLAVES AND WITH_HAL) )
264 264
 
265 265
   if( BUILD_KSMSERVER AND WITH_UPOWER )

+ 1
- 1
README View File

@@ -78,7 +78,7 @@ libraries. Here is an overview of the directories:
78 78
 * kicker
79 79
     The panel at the botton with the K start button and the taskbar etc.
80 80
 
81
-* kioslave
81
+* tdeioslave
82 82
     Infrastructure that helps make every application internet enabled
83 83
     e.g. to directly save a file to ftp://place.org/dir/file.txt
84 84
 

+ 1
- 1
applnk/compat/battery.desktop View File

@@ -69,6 +69,6 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
69 69
 X-TDE-ModuleType=Library
70 70
 X-TDE-Library=laptop
71 71
 X-TDE-FactoryName=battery
72
-Exec=kcmshell laptop
72
+Exec=tdecmshell laptop
73 73
 Icon=laptop_battery
74 74
 Type=Application

+ 1
- 1
applnk/compat/bwarning.desktop View File

@@ -69,6 +69,6 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
69 69
 X-TDE-ModuleType=Library
70 70
 X-TDE-Library=laptop
71 71
 X-TDE-FactoryName=bwarning
72
-Exec=kcmshell laptop
72
+Exec=tdecmshell laptop
73 73
 Icon=laptop_battery
74 74
 Type=Application

+ 1
- 1
applnk/compat/cwarning.desktop View File

@@ -69,6 +69,6 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
69 69
 X-TDE-ModuleType=Library
70 70
 X-TDE-Library=laptop
71 71
 X-TDE-FactoryName=cwarning
72
-Exec=kcmshell laptop
72
+Exec=tdecmshell laptop
73 73
 Icon=laptop_battery
74 74
 Type=Application

+ 1
- 1
applnk/compat/email.desktop View File

@@ -1,7 +1,7 @@
1 1
 [Desktop Entry]
2 2
 Icon=email
3 3
 Type=Application
4
-Exec=kcmshell kcm_useraccount
4
+Exec=tdecmshell kcm_useraccount
5 5
 DocPath=kcontrol/email/index.html
6 6
 X-TDE-ModuleType=Library
7 7
 X-TDE-Library=useraccount

+ 1
- 1
applnk/compat/kcmkonq.desktop View File

@@ -88,4 +88,4 @@ X-TDE-Library=konq
88 88
 X-TDE-FactoryName=browser
89 89
 Type=Application
90 90
 Icon=kfm
91
-Exec=kcmshell filebrowser
91
+Exec=tdecmshell filebrowser

+ 1
- 1
applnk/compat/kcmkxmlrpcd.desktop View File

@@ -75,6 +75,6 @@ Name[zu]=TDE XML RPC Daemon
75 75
 X-TDE-ModuleType=Library
76 76
 X-TDE-Library=kded
77 77
 X-TDE-Factoryname=kded
78
-Exec=kcmshell kcmkded
78
+Exec=tdecmshell kcmkded
79 79
 Icon=kded
80 80
 Type=Application

+ 1
- 1
applnk/compat/konqhtml.desktop View File

@@ -77,7 +77,7 @@ Name[zh_CN]=Konqueror 浏览器
77 77
 Name[zh_TW]=Konqueror 網頁瀏覽器
78 78
 Type=Application
79 79
 Icon=fonts
80
-Exec=kcmshell tdehtml_fonts
80
+Exec=tdecmshell tdehtml_fonts
81 81
 X-TDE-ModuleType=Library
82 82
 X-TDE-Library=konqhtml
83 83
 X-TDE-FactoryName=tdehtml_fonts

+ 1
- 1
applnk/compat/passwords.desktop View File

@@ -1,6 +1,6 @@
1 1
 [Desktop Entry]
2 2
 Type=Application
3
-Exec=kcmshell kcm_useraccount
3
+Exec=tdecmshell kcm_useraccount
4 4
 Icon=password
5 5
 DocPath=kcontrol/passwords/index.html
6 6
 NoDisplay=true

+ 1
- 1
applnk/compat/power.desktop View File

@@ -69,7 +69,7 @@ Name[zu]=Ikhomputha ephathwayo eyisicaba
69 69
 X-TDE-ModuleType=Library
70 70
 X-TDE-Library=laptop
71 71
 X-TDE-FactoryName=power
72
-Exec=kcmshell laptop
72
+Exec=tdecmshell laptop
73 73
 NoDisplay=true
74 74
 Icon=laptop_battery
75 75
 Type=Application

+ 1
- 1
applnk/compat/socks.desktop View File

@@ -17,7 +17,7 @@ Name[ta]=துளைகள்
17 17
 Name[te]=సాక్స్
18 18
 Type=Application
19 19
 Icon=proxy
20
-Exec=kcmshell proxy
20
+Exec=tdecmshell proxy
21 21
 X-TDE-ModuleType=Library
22 22
 X-TDE-Library=kio
23 23
 X-TDE-FactoryName=proxy

+ 1
- 1
applnk/compat/userinfo.desktop View File

@@ -1,6 +1,6 @@
1 1
 [Desktop Entry]
2 2
 Type=Application
3
-Exec=kcmshell kcm_useraccount
3
+Exec=tdecmshell kcm_useraccount
4 4
 Icon=tdmconfig
5 5
 DocPath=kcontrol/userinfo/index.html
6 6
 

+ 1
- 1
applnk/compat/virtualdesktops.desktop View File

@@ -77,7 +77,7 @@ Name[zh_CN]=虚拟桌面
77 77
 Name[zh_TW]=多重桌面
78 78
 Type=Application
79 79
 Icon=desktop
80
-Exec=kcmshell desktop
80
+Exec=tdecmshell desktop
81 81
 X-TDE-ModuleType=Library
82 82
 X-TDE-Library=konq
83 83
 X-TDE-FactoryName=ddesktop

+ 6
- 7
config.h.cmake View File

@@ -30,17 +30,17 @@
30 30
 // libart
31 31
 #cmakedefine HAVE_LIBART 1
32 32
 
33
-// tdm, kioslave
33
+// tdm, tdeioslave
34 34
 #cmakedefine HAVE_TERMIOS_H 1
35 35
 
36
-// kioslave/media
36
+// tdeioslave/media
37 37
 #cmakedefine WITH_HAL 1
38 38
 #ifdef WITH_HAL
39 39
 #define COMPILE_HALBACKEND
40 40
 #define COMPILE_LINUXCDPOLLING
41 41
 #endif
42 42
 
43
-// kioslave/media
43
+// tdeioslave/media
44 44
 #cmakedefine WITH_TDEHWLIB 1
45 45
 #ifdef WITH_TDEHWLIB
46 46
 // forcibly deactivate HAL support and substitute TDE hardware library support
@@ -48,10 +48,10 @@
48 48
 #define COMPILE_TDEHARDWAREBACKEND
49 49
 #endif
50 50
 
51
-// kioslave/fish, kcontrol/info
51
+// tdeioslave/fish, kcontrol/info
52 52
 #cmakedefine HAVE_SYS_IOCTL_H 1
53 53
 
54
-// kioslave/smtp, kioslave/pop3
54
+// tdeioslave/smtp, tdeioslave/pop3
55 55
 #cmakedefine HAVE_LIBSASL2 1
56 56
 
57 57
 // tdm, kcontrol
@@ -71,7 +71,7 @@
71 71
 // kio_smtp, ksysguard
72 72
 #cmakedefine kde_socklen_t @kde_socklen_t@
73 73
 
74
-// kfile_media
74
+// tdefile_media
75 75
 #cmakedefine HAVE_STATVFS
76 76
 
77 77
 // taskmanager
@@ -121,7 +121,6 @@
121 121
 
122 122
 // kdesktop
123 123
 #cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@"
124
-#cmakedefine WITH_KDESKTOP_LOCK_BACKTRACE 1
125 124
 
126 125
 // tdm
127 126
 #cmakedefine XBINDIR "@XBINDIR@"

+ 1
- 1
configure.in.in View File

@@ -239,7 +239,7 @@ KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir)
239 239
 AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
240 240
 AC_SUBST(KDE_BINDIR)
241 241
 
242
-dnl libart is used by tdm, kcontrol and thumbnails code in kioslaves
242
+dnl libart is used by tdm, kcontrol and thumbnails code in tdeioslaves
243 243
 KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
244 244
   AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
245 245
 ])

+ 1
- 1
doc/faq/panel.docbook View File

@@ -45,7 +45,7 @@ select Menus, then inside the TDE Menu grouping, select the TDE Menu button icon
45 45
 User modifications to the &kmenu; are stored in
46 46
 <filename>$<envar>HOME</envar>/.config/menus/applications-kmenuedit.menu</filename>.
47 47
 Try moving this file out of the way and then issuing the
48
-command <userinput><command>kbuildsycoca</command>
48
+command <userinput><command>tdebuildsycoca</command>
49 49
 <option>--noincremental</option></userinput>. This should restore you to the
50 50
 default system menus. If that is the case you'll have to recreate your customized menu.
51 51
 </para>

+ 2
- 2
doc/glossary/index.docbook View File

@@ -48,7 +48,7 @@ Slave</glossseealso>
48 48
 				configuration cache which, for example, guarantees fast access to the menu
49 49
 				entries.</para>
50 50
 				<glossseealso 
51
-otherterm="gloss-kbuildsycoca"><application>KBuildSycoca</application></glossseealso>
51
+otherterm="gloss-tdebuildsycoca"><application>KBuildSycoca</application></glossseealso>
52 52
 			</glossdef>
53 53
 		</glossentry>
54 54
 	</glossdiv>
@@ -80,7 +80,7 @@ otherterm="gloss-kbuildsycoca"><application>KBuildSycoca</application></glosssee
80 80
 
81 81
 	<glossdiv id="glossdiv-applications">
82 82
 		<title>Applications</title>
83
-		<glossentry id="gloss-kbuildsycoca">
83
+		<glossentry id="gloss-tdebuildsycoca">
84 84
 			<glossterm><application>KBuildSycoca</application></glossterm>
85 85
 			<glossdef><para><application>KBuildSycoca</application> is a command line 
86 86
 program and regenerates the

+ 1
- 1
doc/glossary/tdeprintingglossary.docbook View File

@@ -1127,7 +1127,7 @@ now.
1127 1127
                         </glossdef>
1128 1128
                 </glossentry>
1129 1129
 
1130
-                <glossentry id="gloss-printkioslave">
1130
+                <glossentry id="gloss-printtdeioslave">
1131 1131
                         <glossterm>print:/ KIO Slave</glossterm>
1132 1132
                         <glossdef><para>You can use a syntax of "print:/..." to get quick access
1133 1133
 				to TDEPrint resources. Typing "print:/manager" as a Konqueror URL

+ 2
- 2
doc/kcontrol/filemanager/index.docbook View File

@@ -155,7 +155,7 @@ download.</para>
155 155
 <screenshot>
156 156
   <screeninfo>Download Dialog Box</screeninfo>
157 157
   <mediaobject>
158
-  <imageobject><imagedata fileref="kfileman2.png"
158
+  <imageobject><imagedata fileref="tdefileman2.png"
159 159
  format="PNG"/></imageobject>
160 160
   <textobject> <phrase>Download Dialog Box</phrase> </textobject>
161 161
   <caption>
@@ -173,7 +173,7 @@ together under a single dialog box.</para>
173 173
 <screenshot>
174 174
   <screeninfo>Download Dialog Box</screeninfo>
175 175
   <mediaobject>
176
-  <imageobject><imagedata fileref="kfileman1.png"
176
+  <imageobject><imagedata fileref="tdefileman1.png"
177 177
  format="PNG"/></imageobject>
178 178
   <textobject><phrase>Download Dialog Box</phrase></textobject>
179 179
   <caption>

doc/kcontrol/filemanager/kfileman1.png → doc/kcontrol/filemanager/tdefileman1.png View File


doc/kcontrol/filemanager/kfileman2.png → doc/kcontrol/filemanager/tdefileman2.png View File


+ 1
- 1
doc/kcontrol/index.docbook View File

@@ -308,7 +308,7 @@ the control center.
308 308
 <title>Running Individual Modules</title>
309 309
 
310 310
 <para>
311
-You can run individual modules without running kcontrol using the command <command>kcmshell</command> from &konsole;. Type <userinput> <command>kcmshell</command><option> --list</option></userinput> to see a list of the available &kcontrolcenter; modules. You can also access individual &kcontrolcenter; modules through adding the <guilabel>Preferences</guilabel> button to either &kicker; or the &kmenu; through their respective configuration dialogs.
311
+You can run individual modules without running kcontrol using the command <command>tdecmshell</command> from &konsole;. Type <userinput> <command>tdecmshell</command><option> --list</option></userinput> to see a list of the available &kcontrolcenter; modules. You can also access individual &kcontrolcenter; modules through adding the <guilabel>Preferences</guilabel> button to either &kicker; or the &kmenu; through their respective configuration dialogs.
312 312
 </para>
313 313
 
314 314
 </sect1>

+ 1
- 1
doc/kcontrol/proxy/index.docbook View File

@@ -172,7 +172,7 @@ ask for a username or password if it needs to.</para>
172 172
 <para>The other option is <guilabel>Use automatic login</guilabel>.
173 173
 Select this option if you have already set up a login entry for your
174 174
 proxy server in the
175
-<filename>$<envar>TDEDIR</envar>/share/config/kionetrc</filename>
175
+<filename>$<envar>TDEDIR</envar>/share/config/tdeionetrc</filename>
176 176
 file.</para>
177 177
 
178 178
 </sect2>

+ 1
- 1
doc/kicker/index.docbook View File

@@ -2346,7 +2346,7 @@ Why is my <guisubmenu>Settings</guisubmenu> menu not working?
2346 2346
 <answer>
2347 2347
 <para>
2348 2348
 Your menu entries may be mixed up for some reason. Simply run
2349
-<command>kbuildsycoca</command> on a commandline.
2349
+<command>tdebuildsycoca</command> on a commandline.
2350 2350
 </para>
2351 2351
 </answer>
2352 2352
 </qandaentry>

+ 3
- 3
doc/konqueror/browser.docbook View File

@@ -446,15 +446,15 @@ just add a key line
446 446
 <screen><userinput>
447 447
 OverridenPorts=CommaSeparatedListOfAllowedPorts
448 448
 </userinput></screen>
449
-to <filename>$TDEDIR/share/config/kio_httprc
449
+to <filename>$TDEDIR/share/config/tdeio_httprc
450 450
 </filename> or 
451
-<filename>~/.trinity/share/config/kio_httprc</filename>.</para>
451
+<filename>~/.trinity/share/config/tdeio_httprc</filename>.</para>
452 452
 <para>For example
453 453
 <screen><userinput>OverridenPorts=23,15
454 454
 </userinput></screen> 
455 455
 (it should not include any embedded spaces).</para>
456 456
 <para>&konqueror; will reject the following ports (the list is hardcoded in 
457
-<filename>tdelibs/kio/kio/job.cpp</filename>):</para>
457
+<filename>tdelibs/tdeio/tdeio/job.cpp</filename>):</para>
458 458
 <para>
459 459
  1, 7, 9, 11, 13, 15, 17, 19,
460 460
  20, 21, 22, 23, 25, 37, 42, 43,

+ 1
- 1
doc/ksplashml/index.docbook View File

@@ -1084,7 +1084,7 @@ appropriate plugin.</para>
1084 1084
 #include &lt;qwidget.h&gt;
1085 1085
 
1086 1086
 #include &lt;kapplication.h&gt;
1087
-#include &lt;kconfig.h&gt;
1087
+#include &lt;tdeconfig.h&gt;
1088 1088
 #include &lt;kdebug.h&gt;
1089 1089
 #include &lt;kdialogbase.h&gt;
1090 1090
 #include &lt;kgenericfactory.h&gt;

+ 1
- 1
doc/kxkb/index.docbook View File

@@ -83,7 +83,7 @@ list.</para>
83 83
 configuration by selecting <guimenuitem>Configure...</guimenuitem> or
84 84
 by opening <application>Control Center</application> and selecting
85 85
 Localization/Keyboard Layout. Alternatively, you can start it by
86
-typing <command>kcmshell keyboard_layout</command> in a
86
+typing <command>tdecmshell keyboard_layout</command> in a
87 87
 terminal.</para>
88 88
 
89 89
 </sect1>

doc/kioslave/CMakeLists.txt → doc/tdeioslave/CMakeLists.txt View File

@@ -9,4 +9,4 @@
9 9
 #
10 10
 #################################################
11 11
 
12
-tde_create_handbook( DESTINATION kioslave )
12
+tde_create_handbook( DESTINATION tdeioslave )

doc/kioslave/Makefile.am → doc/tdeioslave/Makefile.am View File


doc/kioslave/bzip.docbook → doc/tdeioslave/bzip.docbook View File

@@ -11,19 +11,19 @@
11 11
 used today, having been replaced with bzip2, which offers much better
12 12
 compression.</para>
13 13
 
14
-<para>The bzip kioslave is not directly usable, and is intended for use
15
-as a filter.  For example, the tar kioslave can filter a file through
16
-the bzip kioslave, in order to display the contents of a <literal
14
+<para>The bzip tdeioslave is not directly usable, and is intended for use
15
+as a filter.  For example, the tar tdeioslave can filter a file through
16
+the bzip tdeioslave, in order to display the contents of a <literal
17 17
 role="extension">tar.bz</literal> file directly in a &konqueror;
18 18
 window.</para>
19 19
 
20 20
 <para>If you click on a file compressed with a <literal
21
-role="extension">bz</literal> extension in &konqueror;, this kioslave is
21
+role="extension">bz</literal> extension in &konqueror;, this tdeioslave is
22 22
 used to uncompress it and display it as a normal (uncompressed)
23 23
 file.</para>
24 24
 
25 25
 <para>If you are a developer, and would like to use the bzip filter,
26
-you can find documentation on using kioslaves at <ulink
26
+you can find documentation on using tdeioslaves at <ulink
27 27
 url="http://developer.kde.org">http://developer.kde.org</ulink></para>
28 28
 
29 29
 </article>

doc/kioslave/bzip2.docbook → doc/tdeioslave/bzip2.docbook View File

@@ -9,18 +9,18 @@
9 9
 
10 10
 <para>Bzip2 is a compression program</para>
11 11
 
12
-<para>The bzip2 kioslave is not directly usable, and is intended for use
13
-as a filter.  For example, the tar kioslave can filter a file through
14
-the bzip2 kioslave, in order to display the contents of a <literal
12
+<para>The bzip2 tdeioslave is not directly usable, and is intended for use
13
+as a filter.  For example, the tar tdeioslave can filter a file through
14
+the bzip2 tdeioslave, in order to display the contents of a <literal
15 15
 role="extension">tar.bz2</literal> file directly in a &konqueror;
16 16
 window.</para>
17 17
 
18 18
 <para>If you click on a file compressed with a <literal
19
-role="extension">.bz2</literal> in &konqueror;, this kioslave is used to
19
+role="extension">.bz2</literal> in &konqueror;, this tdeioslave is used to
20 20
 uncompress it and display it as a normal (uncompressed) file.</para>
21 21
 
22 22
 <para>If you are a developer, and would like to use the bzip2 filter,
23
-you can find documentation on using kioslaves at <ulink
23
+you can find documentation on using tdeioslaves at <ulink
24 24
 url="http://developer.kde.org">http://developer.kde.org</ulink></para>
25 25
 
26 26
 <para> See the manual: <ulink url="man:/bzip2">bzip2</ulink>.

doc/kioslave/cgi.docbook → doc/tdeioslave/cgi.docbook View File


doc/kioslave/data.docbook → doc/tdeioslave/data.docbook View File


doc/kioslave/file.docbook → doc/tdeioslave/file.docbook View File


doc/kioslave/finger.docbook → doc/tdeioslave/finger.docbook View File

@@ -24,7 +24,7 @@ you may find that you get no useful answer for most people.</para>
24 24
 hold such information as <acronym>PGP</acronym> keys, the fact they are
25 25
 on vacation, and all sorts of information.</para>
26 26
 
27
-<para>Use the finger kioslave like this:
27
+<para>Use the finger tdeioslave like this:
28 28
 <userinput>finger://<replaceable>username</replaceable>@<replaceable>hostname</replaceable></userinput></para>
29 29
 
30 30
 <para> See the manual: <ulink url="man:/finger">finger</ulink>.

doc/kioslave/fish.docbook → doc/tdeioslave/fish.docbook View File

@@ -14,7 +14,7 @@
14 14
 
15 15
 <para>Allows you to access another computer's files using the SEcure Shell (<acronym>SSH</acronym>) protocol.  The remote computer needs to be running the <acronym>SSH</acronym> daemon, but the remainder of the protocol uses standard commandline tools as discussed below.</para>
16 16
 
17
-<para>You can use the fish kioslave like this:
17
+<para>You can use the fish tdeioslave like this:
18 18
 <userinput>fish://<replaceable>hostname</replaceable></userinput> or <userinput>fish://<replaceable>username</replaceable>@<replaceable>hostname</replaceable></userinput>.</para>
19 19
 
20 20
 <note><para>You need to use double forward slashes.</para></note>

doc/kioslave/floppy.docbook → doc/tdeioslave/floppy.docbook View File


doc/kioslave/ftp.docbook → doc/tdeioslave/ftp.docbook View File


doc/kioslave/gopher.docbook → doc/tdeioslave/gopher.docbook View File


doc/kioslave/gzip.docbook → doc/tdeioslave/gzip.docbook View File

@@ -9,19 +9,19 @@
9 9
 
10 10
 <para><command>gzip</command> is a compression program</para>
11 11
 
12
-<para>The gzip kioslave is not directly usable, and is intended for use
13
-as a filter.  For example, the tar kioslave can filter a file through
14
-the gzip kioslave, in order to display the contents of a <literal
12
+<para>The gzip tdeioslave is not directly usable, and is intended for use
13
+as a filter.  For example, the tar tdeioslave can filter a file through
14
+the gzip tdeioslave, in order to display the contents of a <literal
15 15
 role="extension">tar.gz</literal> file directly in a &konqueror;
16 16
 window.</para>
17 17
 
18 18
 <para>If you click on a file compressed with a <literal
19
-role="extension">gz</literal> extension in &konqueror;, this kioslave is
19
+role="extension">gz</literal> extension in &konqueror;, this tdeioslave is
20 20
 used to uncompress it and display it as a normal (uncompressed)
21 21
 file.</para>
22 22
 
23 23
 <para>If you are a developer, and would like to use the gzip filter, you
24
-can find documentation on using kioslaves at <ulink
24
+can find documentation on using tdeioslaves at <ulink
25 25
 url="http://developer.kde.org">http://developer.kde.org</ulink></para>
26 26
 
27 27
 <para> See the manual: <ulink url="man:/gzip">gzip</ulink>.

doc/kioslave/help.docbook → doc/tdeioslave/help.docbook View File


doc/kioslave/http.docbook → doc/tdeioslave/http.docbook View File

@@ -11,11 +11,11 @@
11 11
 <emphasis>H</emphasis>yper<emphasis>T</emphasis>ext
12 12
 <emphasis>T</emphasis>ransfer <emphasis>P</emphasis>rotocol.</para>
13 13
 
14
-<para>The http kioslave is used by all &tde; applications to handle
14
+<para>The http tdeioslave is used by all &tde; applications to handle
15 15
 connections to http servers, that is, web servers.  The most common
16 16
 usage is to view web pages in the &konqueror; web browser.</para>
17 17
 
18
-<para>You can use the http kioslave in &konqueror; by giving it a
18
+<para>You can use the http tdeioslave in &konqueror; by giving it a
19 19
 <acronym>URL</acronym>.  
20 20
 <userinput>http://<replaceable>www.kde.org</replaceable></userinput>.</para>
21 21
 

doc/kioslave/https.docbook → doc/tdeioslave/https.docbook View File

@@ -8,7 +8,7 @@
8 8
 </articleinfo>
9 9
 <para>
10 10
 HTTPS is 
11
-<ulink url="help:/kioslave/http.html">HTTP</ulink>
11
+<ulink url="help:/tdeioslave/http.html">HTTP</ulink>
12 12
  encapsulated in an SSL/TLS stream.
13 13
 </para>
14 14
 <para>

doc/kioslave/imap.docbook → doc/tdeioslave/imap.docbook View File

@@ -19,7 +19,7 @@ everywhere. Messages can be stored on the server, retrieved from there or
19 19
 moved between folders.</para>
20 20
 
21 21
 <para>This plugin is currently mainly used by KMail, but you can also use it
22
-in any other KDE application that uses kioslave plugins.</para>
22
+in any other KDE application that uses tdeioslave plugins.</para>
23 23
 
24 24
 <para>For example in &konqueror;, simply type
25 25
 <userinput>imap://username@your.mail.server/</userinput> to get your IMAP

doc/kioslave/imaps.docbook → doc/tdeioslave/imaps.docbook View File

@@ -11,7 +11,7 @@
11 11
  
12 12
 </articleinfo>
13 13
 
14
-<para>IMAPS is the <ulink url="help:/kioslave/imap.html">IMAP</ulink> protocol
14
+<para>IMAPS is the <ulink url="help:/tdeioslave/imap.html">IMAP</ulink> protocol
15 15
 encrypted via SSL.</para>
16 16
 
17 17
 </article>

doc/kioslave/index.docbook → doc/tdeioslave/index.docbook View File


doc/kioslave/info.docbook → doc/tdeioslave/info.docbook View File


doc/kioslave/lan.docbook → doc/tdeioslave/lan.docbook View File

@@ -12,7 +12,7 @@ This protocol is intended to provide a kind of <quote>network
12 12
 neighborhood</quote> but only relying on the TCP/IP protocol stack and with 
13 13
 the ability to use other protocols than just <acronym>SMB</acronym>.</para>
14 14
 
15
-<para>The lan kioslave can use &FTP;, &HTTP;, <acronym>SMB</acronym>, 
15
+<para>The lan tdeioslave can use &FTP;, &HTTP;, <acronym>SMB</acronym>, 
16 16
 <acronym>NFS</acronym>, and <acronym>FISH</acronym></para>
17 17
 
18 18
 <para>It must first be configured in &kcontrol;, 

doc/kioslave/ldap.docbook → doc/tdeioslave/ldap.docbook View File

@@ -11,7 +11,7 @@
11 11
 protocol.  It provides access to an X.500 directory, or to a stand-alone
12 12
 <acronym>LDAP</acronym> server.</para>
13 13
 
14
-<para>You can use the ldap kioslave as follows:</para>
14
+<para>You can use the ldap tdeioslave as follows:</para>
15 15
 
16 16
 <para><userinput>ldap://host:port/ou=People,o=where,c=de??sub</userinput>
17 17
 for a subtree-query</para>

doc/kioslave/mac.docbook → doc/tdeioslave/mac.docbook View File


doc/kioslave/mailto.docbook → doc/tdeioslave/mailto.docbook View File

@@ -6,7 +6,7 @@
6 6
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
7 7
 </authorgroup>
8 8
 </articleinfo>
9
-<para>The mailto kioslave is used when you click on a mailto link in an
9
+<para>The mailto tdeioslave is used when you click on a mailto link in an
10 10
 <acronym>HTML</acronym> page.  &konqueror; will open the preferred mail
11 11
 client you have configured, with a composer window.  Any information
12 12
 supplied in the <acronym>URL</acronym> will be filled in for you.</para>

doc/kioslave/man.docbook → doc/tdeioslave/man.docbook View File


doc/kioslave/mrml.docbook → doc/tdeioslave/mrml.docbook View File


doc/kioslave/news.docbook → doc/tdeioslave/news.docbook View File

@@ -8,7 +8,7 @@
8 8
 </articleinfo>
9 9
 
10 10
 
11
-<para>The news kioslave is used when you click on a news link on a web
11
+<para>The news tdeioslave is used when you click on a news link on a web
12 12
 page.  It will open &knode;, and if the group referred to in the news
13 13
 link is available from your server, it will subscribe you to the group, in
14 14
 the first available account you have configured in &knode;</para>

doc/kioslave/nfs.docbook → doc/tdeioslave/nfs.docbook View File


doc/kioslave/nntp.docbook → doc/tdeioslave/nntp.docbook View File

@@ -6,10 +6,10 @@
6 6
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
7 7
 </authorgroup>
8 8
 </articleinfo>
9
-<para>The nntp kioslave accesses <acronym>NNTP</acronym> servers
9
+<para>The nntp tdeioslave accesses <acronym>NNTP</acronym> servers
10 10
 directly.</para>
11 11
 
12
-<para>This kioslave can not be used with servers that do not implement
12
+<para>This tdeioslave can not be used with servers that do not implement
13 13
 the <command>GROUP</command> command, including some versions of the
14 14
 popular <application>INN</application> news server which is often used
15 15
 by <acronym>ISP</acronym>s.  It does work with
@@ -17,7 +17,7 @@ by <acronym>ISP</acronym>s.  It does work with
17 17
 offline cache of news articles on their own hard drive or within their
18 18
 <acronym>LAN</acronym>.</para>
19 19
 
20
-<para>You can use the nntp kioslave by typing
20
+<para>You can use the nntp tdeioslave by typing
21 21
 <userinput>nntp://yourserver/groupname</userinput> into the &konqueror;
22 22
 <acronym>URL</acronym> bar.</para>
23 23
 

doc/kioslave/pop3.docbook → doc/tdeioslave/pop3.docbook View File


doc/kioslave/pop3s.docbook → doc/tdeioslave/pop3s.docbook View File


doc/kioslave/print.docbook → doc/tdeioslave/print.docbook View File

@@ -54,7 +54,7 @@ and a short explanation of what they represent:</para>
54 54
 
55 55
 <varlistentry>
56 56
 <term><userinput>print:/ </userinput> (&ie; the root of 
57
-print-kioslave)</term>
57
+print-tdeioslave)</term>
58 58
 <listitem>
59 59
 <para>  virtual root for browsing your print subsystem.
60 60
         It displays subfolders <quote>Classes</quote>,

doc/kioslave/rlan.docbook → doc/tdeioslave/rlan.docbook View File


doc/kioslave/rlogin.docbook → doc/tdeioslave/rlogin.docbook View File

@@ -9,14 +9,14 @@
9 9
 <para>Using &konqueror; you can start up an <command>rlogin</command>
10 10
 session with a server hosting the rlogin service.</para>
11 11
 
12
-<para>To use this kioslave feature, in the &konqueror;
12
+<para>To use this tdeioslave feature, in the &konqueror;
13 13
 <acronym>URL</acronym> bar, type
14 14
 <userinput>rlogin:/host_to_connect_to</userinput></para>
15 15
 
16 16
 <para>This will initialize &konsole; with an <command>rlogin</command>
17 17
 session, prompting you for your password.</para>
18 18
 
19
-<para>The <command>rlogin</command> kioslave uses the username of the
19
+<para>The <command>rlogin</command> tdeioslave uses the username of the
20 20
 account you are currently using in &tde;.</para>
21 21
 
22 22
 <para>After you have successfully entered your password, you can begin

doc/kioslave/sftp.docbook → doc/tdeioslave/sftp.docbook View File


doc/kioslave/smb.docbook → doc/tdeioslave/smb.docbook View File

@@ -41,7 +41,7 @@ You can set your default user name and password in the &kcontrol; in
41 41
 <menuchoice><guisubmenu>Network</guisubmenu><guimenuitem>Windows
42 42
 Shares</guimenuitem></menuchoice>.  This is especially useful if you are a
43 43
 member of a &Windows; <acronym>NT</acronym> domain. There you can also set your
44
-workgroup name, but in most cases this is not required.  The kioslave will ask for your username and password if a default is not set.
44
+workgroup name, but in most cases this is not required.  The tdeioslave will ask for your username and password if a default is not set.
45 45
 </para>
46 46
 
47 47
 <para>

doc/kioslave/smtp.docbook → doc/tdeioslave/smtp.docbook View File


doc/kioslave/tar.docbook → doc/tdeioslave/tar.docbook View File


doc/kioslave/telnet.docbook → doc/tdeioslave/telnet.docbook View File


doc/kioslave/thumbnail.docbook → doc/tdeioslave/thumbnail.docbook View File

@@ -6,23 +6,23 @@
6 6
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
7 7
 </authorgroup>
8 8
 </articleinfo>
9
-<para>The thumbnail kioslave is used by &tde; for network transparent
9
+<para>The thumbnail tdeioslave is used by &tde; for network transparent
10 10
 and persistent generation of thumbnails.</para>
11 11
 
12
-<para>The thumbnail kioslave uses plugins to generate the actual
12
+<para>The thumbnail tdeioslave uses plugins to generate the actual
13 13
 thumbnails.  You can enable viewing of these thumbnails from the
14 14
 <menuchoice><guimenu>View</guimenu>
15 15
 <guisubmenu>Preview</guisubmenu></menuchoice> submenu, available in
16 16
 &konqueror; in file manager mode.</para>
17 17
 
18
-<para>The thumbnail kioslave is not directly useful to a user, but if
18
+<para>The thumbnail tdeioslave is not directly useful to a user, but if
19 19
 you are a developer, you can use it within your own applications to
20 20
 create file previews.</para>
21 21
 
22 22
 <para>See the documentation in the sources for more information.  You
23 23
 will find these at
24
-<filename>$<envar>TDEDIR</envar>/include/kio/thumbcreator.h</filename> or
24
+<filename>$<envar>TDEDIR</envar>/include/tdeio/thumbcreator.h</filename> or
25 25
 in the source folder <filename
26
-class="directory">tdebase/kioslave/thumbnail</filename></para>
26
+class="directory">tdebase/tdeioslave/thumbnail</filename></para>
27 27
 
28 28
 </article>

doc/kioslave/webdav.docbook → doc/tdeioslave/webdav.docbook View File

@@ -13,7 +13,7 @@
13 13
 <emphasis>A</emphasis>uthoring and <emphasis>V</emphasis>ersioning
14 14
 protocol for the World Wide Web. It allows for easy management of
15 15
 documents and scripts on a <ulink
16
-url="help:/kioslave/webdav.html">http</ulink> server, and has
16
+url="help:/tdeioslave/webdav.html">http</ulink> server, and has
17 17
 additional features designed to simplify version management amongst
18 18
 multiple authors.</para>
19 19
 
@@ -60,6 +60,6 @@ such as the author.</para>
60 60
 <para>To take advantage of these additional capabilities, you will need an
61 61
 application which supports them. No application currently supports them 
62 62
 through
63
-this kioslave.</para>
63
+this tdeioslave.</para>
64 64
 
65 65
 </article>

doc/kioslave/webdavs.docbook → doc/tdeioslave/webdavs.docbook View File

@@ -11,7 +11,7 @@
11 11
 
12 12
 </articleinfo>
13 13
 
14
-<para>WebDAVS is the <ulink url="help:/kioslave/webdav.html">WebDAV</ulink> protocol
14
+<para>WebDAVS is the <ulink url="help:/tdeioslave/webdav.html">WebDAV</ulink> protocol
15 15
 encrypted via SSL.</para>
16 16
 
17 17
 </article>

+ 1
- 1
doc/tdeprint/highlights.docbook View File

@@ -369,7 +369,7 @@ functions that were provided by <application>qtcups</application> and
369 369
 <para>Instead of <command>qtcups</command> you can now use the
370 370
 <command>kprinter</command> command.  And in place of
371 371
 <command>kups</command> you will probably use
372
-<command>kcmshell printers</command> from now on.
372
+<command>tdecmshell printers</command> from now on.
373 373
 </para>
374 374
 
375 375
 <para>The &tdeprint; module for &CUPS; also lets you fully administer

+ 1
- 1
doc/tdeprint/tech-overview.docbook View File

@@ -220,7 +220,7 @@ you switch to other parts of the &kcontrol;</para></listitem>
220 220
 
221 221
 <listitem><para>from a command line (&konsole; or
222 222
 mini-<acronym>CLI</acronym>) type <userinput>
223
-<command>kcmshell</command> <option>printers</option></userinput>.
223
+<command>tdecmshell</command> <option>printers</option></userinput>.
224 224
 This opens just the &tdeprint; part of &kcontrol; to change your settings
225 225
 </para></listitem>
226 226
 </itemizedlist>

+ 1
- 1
doc/userguide/groupware-kontact.docbook View File

@@ -335,7 +335,7 @@ slow data updates.</para>
335 335
 
336 336
 <para>Now we have to tell &kontact; to use <acronym>IMAP</acronym> as the
337 337
 data source for it's various components. From the &kmenu;, choose
338
-<guimenuitem>Run command</guimenuitem>, run <userinput><command>kcmshell
338
+<guimenuitem>Run command</guimenuitem>, run <userinput><command>tdecmshell
339 339
 tderesources</command></userinput>. In the combo box select
340 340
 <guilabel>Contacts</guilabel>, then press the <guibutton>Add...</guibutton>
341 341
 button, and choose <guilabel>Addressbook on IMAP Server via KMail</guilabel>. Then select that new line and

+ 22
- 22
doc/userguide/tde-for-admins.docbook View File

@@ -830,7 +830,7 @@ Running...</computeroutput>. The arguments after <command>tdeinit</command>
830 830
 are the names of additional processes to be started.  The <token>+</token>
831 831
 indicates that <command>tdeinit</command> needs to wait till the process has
832 832
 finished.  <command>tdeinit</command> also starts
833
-<command>dcopserver</command>, <command>klauncher</command> and
833
+<command>dcopserver</command>, <command>tdelauncher</command> and
834 834
 <command>kded</command>.</para>
835 835
 
836 836
 <para>The second of the two lines asks <command>tdeinit</command> to start
@@ -871,11 +871,11 @@ needed</para>
871 871
 </varlistentry>
872 872
 
873 873
 <varlistentry>
874
-<term><command>klauncher</command></term>
874
+<term><command>tdelauncher</command></term>
875 875
 <listitem><para>Program launch (this is <emphasis>not</emphasis> the
876 876
 <keycombo action="simul">&Alt;<keycap>F2</keycap>
877 877
 </keycombo>dialog!)</para>
878
-<para>See <xref linkend="klauncher"/> for more information.</para>
878
+<para>See <xref linkend="tdelauncher"/> for more information.</para>
879 879
 </listitem>
880 880
 </varlistentry>
881 881
 
@@ -916,7 +916,7 @@ to see the actual program name:</para>
916 916
 <computeroutput>
917 917
 waba     23184  0.2  2.1 23428 11124 ?	S    21:41   0:00 tdeinit: Running...
918 918
 waba     23187  0.1  2.1 23200 11124 ?	S    21:41   0:00 tdeinit: dcopserver --nosid
919
-waba     23189  0.2  2.4 25136 12496 ?	S    21:41   0:00 tdeinit: klauncher
919
+waba     23189  0.2  2.4 25136 12496 ?	S    21:41   0:00 tdeinit: tdelauncher
920 920
 waba     23192  0.7  2.8 25596 14772 ?	S    21:41   0:00 tdeinit: kded
921 921
 waba     23203  0.8  3.4 31516 17892 ?	S    21:41   0:00 tdeinit:
922 922
 knotify
@@ -928,7 +928,7 @@ master <command>tdeinit</command> process. The other processes listed are
928 928
 programs started as <acronym>KLM</acronym>s.</para>
929 929
 
930 930
 <para>When <command>tdeinit</command> starts for the first time it will
931
-launch <command>dcopserver</command>, <command>klauncher</command>, and
931
+launch <command>dcopserver</command>, <command>tdelauncher</command>, and
932 932
 <command>kded</command>, as well as any additional programs specified on its
933 933
 command line in the <command>starttde</command> script, normally
934 934
 <command>kcminit</command> and <command>knotify</command>.</para>
@@ -980,7 +980,7 @@ applications or services via the <varname>X-TDE-Init</varname> line:</para>
980 980
 <programlisting>
981 981
 [Desktop Entry]
982 982
 Encoding=UTF-8
983
-Exec=kcmshell energy
983
+Exec=tdecmshell energy
984 984
 Icon=energy_star
985 985
 Type=Application
986 986
 X-TDE-Library=energy
@@ -999,21 +999,21 @@ startup problems.</para>
999 999
 
1000 1000
 </sect2>
1001 1001
 
1002
-<sect2 id="klauncher">
1003
-<title><command>klauncher</command></title>
1002
+<sect2 id="tdelauncher">
1003
+<title><command>tdelauncher</command></title>
1004 1004
 
1005
-<para><command>klauncher</command> is a daemon which is responsible for
1005
+<para><command>tdelauncher</command> is a daemon which is responsible for
1006 1006
 service activation within &tde;. It operates in close connection with the
1007 1007
 <command>tdeinit</command> master process to start new processes. &tde;
1008
-applications communicate with <command>klauncher</command> over &DCOP; in
1008
+applications communicate with <command>tdelauncher</command> over &DCOP; in
1009 1009
 order to start new applications or services.</para>
1010 1010
 
1011 1011
 <para>Best known from the error message: <computeroutput><errortext>
1012 1012
 KLauncher could not be reached via DCOP </errortext></computeroutput> which
1013 1013
 either indicates a serious problem with the <command>dcopserver</command> or
1014
-that <command>klauncher</command> crashed.</para>
1014
+that <command>tdelauncher</command> crashed.</para>
1015 1015
 
1016
-<para><command>klauncher</command> can be restarted by restarting
1016
+<para><command>tdelauncher</command> can be restarted by restarting
1017 1017
 <command>tdeinit</command> from a console window. Make sure that
1018 1018
 $<envar>HOME</envar>, $<envar>DISPLAY</envar> and the various
1019 1019
 $<envar>TDEDIR(S)</envar> are set correctly when doing so!</para>
@@ -1190,7 +1190,7 @@ on a multi-head system.</para>
1190 1190
 <listitem><para>Set this variable to spawn
1191 1191
 <acronym>KIO</acronym>-slaves directly from the application process
1192 1192
 itself. By default <acronym>KIO</acronym>-slaves are spawned using
1193
-<command>klauncher</command>/<command>tdeinit</command>. This option is
1193
+<command>tdelauncher</command>/<command>tdeinit</command>. This option is
1194 1194
 useful if the <acronym>KIO</acronym>-slave should run in the same
1195 1195
 environment as the application. This can be the case with
1196 1196
 <application>Clearcase</application>.</para>
@@ -1323,7 +1323,7 @@ output of <command>top</command> and <command>ps</command>. Use
1323 1323
 <computeroutput>
1324 1324
 bastian  26061  0.0  2.2 24284 11492 ?       S    21:27   0:00 tdeinit: Running...
1325 1325
 bastian  26064  0.0  2.2 24036 11524 ?       S    21:27   0:00 tdeinit: dcopserver
1326
-bastian  26066  0.1  2.5 26056 12988 ?       S    21:27   0:00 tdeinit: klauncher
1326
+bastian  26066  0.1  2.5 26056 12988 ?       S    21:27   0:00 tdeinit: tdelauncher
1327 1327
 bastian  26069  0.4  3.2 27356 16744 ?       S    21:27   0:00 tdeinit: kded
1328 1328
 bastian  26161  0.2  2.7 25344 14096 ?       S    21:27   0:00 tdeinit: ksmserver
1329 1329
 bastian  26179  1.1  3.4 29716 17812 ?       S    21:27   0:00 tdeinit: kicker
@@ -1619,7 +1619,7 @@ class="directory">/opt/trinity/share/config/SuSE/default/</filename></para></lis
1619 1619
 </sect2>
1620 1620
 </sect1>
1621 1621
 
1622
-<sect1 id="kde-menu">
1622
+<sect1 id="tde-menu">
1623 1623
 <title>&tde; Menu</title>
1624 1624
 
1625 1625
 <sect2 id="how-it-works">
@@ -1824,7 +1824,7 @@ class="directory">$<envar>HOME</envar>/.trinity/share/applnk</filename>
1824 1824
 <para><application>KSycoca</application> caches menu structure and
1825 1825
 information about all available applications. You can rebuild the
1826 1826
 database with
1827
-<userinput><command>kbuildsycoca</command></userinput>. The database
1827
+<userinput><command>tdebuildsycoca</command></userinput>. The database
1828 1828
 which is built lives in <filename
1829 1829
 class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/tdesycoca</filename>.
1830 1830
 It is automatically updated by <application>KDED</application>,
@@ -2281,13 +2281,13 @@ as part of the <guilabel>Configure Konqueror</guilabel> dialog in
2281 2281
 &konqueror;</para>
2282 2282
 
2283 2283
 <para>Individual configuration modules can be started with
2284
-<command>kcmshell</command> <replaceable>module</replaceable></para>
2284
+<command>tdecmshell</command> <replaceable>module</replaceable></para>
2285 2285
 
2286 2286
 <para>To start the Proxy module use:</para>
2287 2287
 <itemizedlist>
2288
-<listitem><para><command>kcmshell</command>
2288
+<listitem><para><command>tdecmshell</command>
2289 2289
 <filename>tde-proxy.desktop</filename></para></listitem>
2290
-<listitem><para><command>kcmshell</command> proxy</para></listitem>
2290
+<listitem><para><command>tdecmshell</command> proxy</para></listitem>
2291 2291
 </itemizedlist>
2292 2292
 
2293 2293
 <para><note><para>Not all applications use configuration modules, often the
@@ -2306,14 +2306,14 @@ class="directory">$<envar>TDEDIR</envar>/share/applications/tde</filename>
2306 2306
 and are sorted under the hidden <guimenu>Settings-Modules</guimenu> menu by
2307 2307
 the <filename>kde-settings.menu</filename>, included from
2308 2308
 <filename>kde-essential.menu</filename></para>
2309
-<screen><userinput><command>kbuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> Settings-Modules</userinput></screen>
2309
+<screen><userinput><command>tdebuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> Settings-Modules</userinput></screen>
2310 2310
 </listitem>
2311 2311
 <listitem>
2312 2312
 <para>Application specific modules normally have a <literal role="extension">.desktop</literal> file under
2313 2313
 <filename>$<envar>TDEDIR</envar>/share/applnk/.hidden</filename> which
2314 2314
 corresponds to the hidden .hidden menu, included as a result of
2315 2315
 <markup>&lt;KDELegacyDirs/&gt;</markup></para>
2316
-<screen><userinput><command>kbuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> .hidden</userinput></screen>
2316
+<screen><userinput><command>tdebuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> .hidden</userinput></screen>
2317 2317
 </listitem>
2318 2318
 <listitem><para>In &tde; 3.3 it is possible to edit the Control Center with
2319 2319
 <application>kcontroledit</application>.
@@ -2481,7 +2481,7 @@ konsole-8954
2481 2481
 <para>One &konsole; is running with a <acronym>PID</acronym> of 8954.</para>
2482 2482
 
2483 2483
 <screen><prompt>&percnt; </prompt><userinput><command>dcop</command><option> konsole-8954</option></userinput>
2484
-KBookmarkManager-.../share/apps/kfile/bookmarks.xml
2484
+KBookmarkManager-.../share/apps/tdefile/bookmarks.xml
2485 2485
 KBookmarkManager-.../share/apps/konqueror/bookmarks.xml
2486 2486
 KBookmarkNotifier
2487 2487
 KDebug

+ 2
- 2
drkonqi/CMakeLists.txt View File

@@ -31,7 +31,7 @@ tde_add_executable( drkonqi AUTOMOC
31 31
   SOURCES
32 32
     krashdcopinterface.skel main.cpp debugger.cpp
33 33
     krashconf.cpp drbugreport.cpp backtrace.cpp toplevel.cpp
34
-  LINK kio-shared
34
+  LINK tdeio-shared
35 35
   DESTINATION ${BIN_INSTALL_DIR}
36 36
 )
37 37
 
@@ -41,7 +41,7 @@ if( BUILD_CRASHTEST )
41 41
   tde_add_executable( crashtest AUTOMOC
42 42
     SOURCES
43 43
       crashtest.cpp
44
-    LINK kio-shared
44
+    LINK tdeio-shared
45 45
     DESTINATION ${BIN_INSTALL_DIR}
46 46
   )
47 47
 endif( BUILD_CRASHTEST )

+ 1
- 1
drkonqi/debugger.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <klocale.h>
34 34
 #include <kglobal.h>
35 35
 #include <kglobalsettings.h>
36
-#include <kfiledialog.h>
36
+#include <tdefiledialog.h>
37 37
 #include <kmessagebox.h>
38 38
 #include <kpushbutton.h>
39 39
 #include <kstdguiitem.h>

+ 1
- 1
drkonqi/krashconf.cpp View File

@@ -25,7 +25,7 @@
25 25
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 26
  *****************************************************************/
27 27
 
28
-#include <kconfig.h>
28
+#include <tdeconfig.h>
29 29
 #include <kglobal.h>
30 30
 #include <kaboutdata.h>
31 31
 #include <kcmdlineargs.h>

+ 1
- 1
kappfinder/CMakeLists.txt View File

@@ -33,7 +33,7 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/System RENAME k
33 33
 
34 34
 tde_add_executable( kappfinder AUTOMOC
35 35
   SOURCES main.cpp toplevel.cpp common.cpp
36
-  LINK kio-shared
36
+  LINK tdeio-shared
37 37
   DESTINATION ${BIN_INSTALL_DIR}
38 38
 )
39 39
 

+ 1
- 1
kate/app/kateapp.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <tdeversion.h>
33 33
 #include <kcmdlineargs.h>
34 34
 #include <dcopclient.h>
35
-#include <kconfig.h>
35
+#include <tdeconfig.h>
36 36
 #include <twin.h>
37 37
 #include <ktip.h>
38 38
 #include <kdebug.h>

+ 2
- 2
kate/app/katedocmanager.cpp View File

@@ -34,12 +34,12 @@
34 34
 
35 35
 #include <klocale.h>
36 36
 #include <kdebug.h>
37
-#include <kconfig.h>
37
+#include <tdeconfig.h>
38 38
 #include <klibloader.h>
39 39
 #include <kmdcodec.h>
40 40
 #include <kmessagebox.h>
41 41
 #include <kencodingfiledialog.h>
42
-#include <kio/job.h>
42
+#include <tdeio/job.h>
43 43
 #include <twin.h>
44 44
 
45 45
 #include <tqdatetime.h>

+ 1
- 1
kate/app/kateexternaltools.cpp View File

@@ -38,7 +38,7 @@
38 38
 #include <kiconloader.h>
39 39
 #include <kmessagebox.h>
40 40
 #include <kmimetypechooser.h>
41
-#include <kconfig.h>
41
+#include <tdeconfig.h>
42 42
 #include <krun.h>
43 43
 #include <kicondialog.h>
44 44
 #include <kpopupmenu.h>

+ 1
- 1
kate/app/katefilelist.cpp View File

@@ -39,7 +39,7 @@
39 39
 #include <tqwhatsthis.h>
40 40
 
41 41
 #include <kiconloader.h>
42
-#include <kconfig.h>
42
+#include <tdeconfig.h>
43 43
 #include <klocale.h>
44 44
 #include <kglobalsettings.h>
45 45
 #include <kpassivepopup.h>

+ 2
- 2
kate/app/katefileselector.cpp View File

@@ -53,7 +53,7 @@
53 53
 #include <kurlcompletion.h>
54 54
 #include <kprotocolinfo.h>
55 55
 #include <kdiroperator.h>
56
-#include <kconfig.h>
56
+#include <tdeconfig.h>
57 57
 #include <klocale.h>
58 58
 #include <kcombobox.h>
59 59
 #include <kaction.h>
@@ -66,7 +66,7 @@
66 66
 //END Includes
67 67
 
68 68
 //BEGIN Toolbar
69
- // from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
69
+ // from tdefiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
70 70
 static void silenceQToolBar(TQtMsgType, const char *){}
71 71
 
72 72
 // helper classes to be able to have a toolbar without move handle

+ 1
- 1
kate/app/katefileselector.h View File

@@ -26,7 +26,7 @@
26 26
 #include <kate/document.h>
27 27
 
28 28
 #include <tqvbox.h>
29
-#include <kfile.h>
29
+#include <tdefile.h>
30 30
 #include <kurl.h>
31 31
 #include <ktoolbar.h>
32 32
 #include <tqframe.h>

+ 1
- 1
kate/app/kategrepdialog.cpp View File

@@ -34,7 +34,7 @@
34 34
 #include <kapplication.h>
35 35
 #include <kaccelmanager.h>
36 36
 #include <kbuttonbox.h>
37
-#include <kfiledialog.h>
37
+#include <tdefiledialog.h>
38 38
 #include <kprocess.h>
39 39
 #include <kapplication.h>
40 40
 #include <klocale.h>

+ 1
- 1
kate/app/katemain.cpp View File

@@ -24,7 +24,7 @@
24 24
 #include <kcmdlineargs.h>
25 25
 #include <kaboutdata.h>
26 26
 #include <kglobal.h>
27
-#include <kconfig.h>
27
+#include <tdeconfig.h>
28 28
 #include <kinstance.h>
29 29
 #include <kstartupinfo.h>
30 30
 #include <dcopclient.h>

+ 1
- 1
kate/app/katemainwindow.cpp View File

@@ -53,7 +53,7 @@
53 53
 #include <kdiroperator.h>
54 54
 #include <kdockwidget.h>
55 55
 #include <kedittoolbar.h>
56
-#include <kfiledialog.h>
56
+#include <tdefiledialog.h>
57 57
 #include <kglobalaccel.h>
58 58
 #include <kglobal.h>
59 59
 #include <kglobalsettings.h>

+ 1
- 1
kate/app/katemdi.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <kglobalsettings.h>
30 30
 #include <kapplication.h>
31 31
 #include <klocale.h>
32
-#include <kconfig.h>
32
+#include <tdeconfig.h>
33 33
 #include <kiconloader.h>
34 34
 #include <kpopupmenu.h>
35 35
 #include <kmessagebox.h>

+ 1
- 1
kate/app/katepluginmanager.cpp View File

@@ -26,7 +26,7 @@
26 26
 
27 27
 #include "../interfaces/application.h"
28 28
 
29
-#include <kconfig.h>
29
+#include <tdeconfig.h>
30 30
 #include <tqstringlist.h>
31 31
 #include <kmessagebox.h>
32 32
 #include <kdebug.h>

+ 1
- 1
kate/app/kateviewspace.cpp View File

@@ -30,7 +30,7 @@
30 30
 #include <kiconloader.h>
31 31
 #include <klocale.h>
32 32
 #include <ksqueezedtextlabel.h>
33
-#include <kconfig.h>
33
+#include <tdeconfig.h>
34 34
 #include <kdebug.h>
35 35
 
36 36
 #include <tqwidgetstack.h>

+ 2
- 2
kate/app/kwritemain.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <tdetexteditor/editorchooser.h>
33 33
 #include <tdetexteditor/popupmenuinterface.h>
34 34
 
35
-#include <kio/netaccess.h>
35
+#include <tdeio/netaccess.h>
36 36
 
37 37
 #include <tdeversion.h>
38 38
 #include <dcopclient.h>
@@ -49,7 +49,7 @@
49 49
 #include <kapplication.h>
50 50
 #include <klocale.h>
51 51
 #include <kurl.h>
52
-#include <kconfig.h>
52
+#include <tdeconfig.h>
53 53
 #include <kcmdlineargs.h>
54 54
 #include <kmessagebox.h>
55 55
 #include <kkeydialog.h>

+ 1
- 1
kate/data/CMakeLists.txt View File

@@ -15,5 +15,5 @@ install( FILES kateplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
15 15
 install( FILES kate.desktop kwrite.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
16 16
 install( FILES kateui.rc externaltools tips DESTINATION ${DATA_INSTALL_DIR}/kate )
17 17
 install( FILES kwriteui.rc DESTINATION ${DATA_INSTALL_DIR}/kwrite )
18
-install( FILES kate-2.4.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
18
+install( FILES kate-2.4.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
19 19
 install( FILES katerc DESTINATION ${CONFIG_INSTALL_DIR} )

+ 1
- 1
kate/data/Makefile.am View File

@@ -12,7 +12,7 @@ rckwrite_DATA = kwriteui.rc
12 12
 tipdir = $(kde_datadir)/kate
13 13
 tip_DATA = tips
14 14
 
15
-updatedir = $(kde_datadir)/kconf_update
15
+updatedir = $(kde_datadir)/tdeconf_update
16 16
 update_DATA = kate-2.4.upd
17 17
 
18 18
 kde_conf_DATA = katerc

+ 2
- 2
kcminit/main.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <klibloader.h>
34 34
 #include <kdebug.h>
35 35
 #include <dcopclient.h>
36
-#include <kconfig.h>
36
+#include <tdeconfig.h>
37 37
 
38 38
 #include <X11/Xlib.h>
39 39
 
@@ -185,7 +185,7 @@ KCMInit::KCMInit( TDECmdLineArgs* args )
185 185
   TQByteArray params;
186 186
   TQDataStream stream(params, IO_WriteOnly);
187 187
   stream << name << value;
188
-  kapp->dcopClient()->send("klauncher", "klauncher", "setLaunchEnv(TQCString,TQCString)", params);
188
+  kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
189 189
   setenv( name, value, 1 ); // apply effect also to itself
190 190
 
191 191
   if( startup )

+ 1
- 1
kcontrol/TODO View File

@@ -117,7 +117,7 @@ properly in 800x600 (is it 800x600 or 1024x768?). For a start, someone needs to
117 117
 * Tons of KCMs and applications have options for selecting binaries which they use(frontends etc.). We need to be a little consistent here and adopt a general policy in this issue.
118 118
 If a binary is not in $PATH it is the distributors fault and not KDE. The reason we have a GUI is so people don't have to know about this kinds of internals. The options doesn't mean anything because users use KDE, they're not in run level 3("WTF? cdparanoia? diff? What's that?"). PATH options("Where to search for X") should be removed - it is up to the distributor. Options for selecting what binary to use should be moved out to KConfEdit - they have a use but are very rarely used.
119 119
 
120
-* Rewrite kcmshell to the new TDECModuleProxy and fix bugs. Move it to tdelibs.
120
+* Rewrite tdecmshell to the new TDECModuleProxy and fix bugs. Move it to tdelibs.
121 121
 
122 122
 --------------------------------------------------------------------------
123 123
 

+ 1
- 1
kcontrol/access/CMakeLists.txt View File

@@ -31,7 +31,7 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kaccess )
31 31
 
32 32
 tde_add_kpart( kcm_access AUTOMOC
33 33
   SOURCES kcmaccess.cpp
34
-  LINK kio-shared
34
+  LINK tdeio-shared
35 35
   DESTINATION ${PLUGIN_INSTALL_DIR}
36 36
 )
37 37
 

+ 1
- 1
kcontrol/access/kaccess.cpp View File

@@ -14,7 +14,7 @@
14 14
 #include <kdebug.h>
15 15
 #include <kaudioplayer.h>
16 16
 #include <knotifyclient.h>
17
-#include <kconfig.h>
17
+#include <tdeconfig.h>
18 18
 #include <kglobal.h>
19 19
 #include <klocale.h>
20 20
 #include <netwm.h>

+ 1
- 1
kcontrol/access/kcmaccess.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <kcombobox.h>
27 27
 #include <kstandarddirs.h>
28 28
 #include <kcolorbutton.h>
29
-#include <kfiledialog.h>
29
+#include <tdefiledialog.h>
30 30
 #include <kapplication.h>
31 31
 #include <kaboutdata.h>
32 32
 #include <kshortcut.h>

+ 0
- 0
kcontrol/access/kcmaccess.desktop View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save