Browse Source

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

pull/2/head
Timothy Pearson 9 years ago
parent
commit
dc6b76cac4
  1. 4
      CMakeLists.txt
  2. 2
      Makefile.am.in
  3. 2
      README
  4. 10
      README.pam
  5. 4
      applnk/compat/konqhtml.desktop
  6. 2
      applnk/tde-system-screensavers.directory
  7. 2
      config.h.cmake
  8. 2
      configure.in.in
  9. 2
      doc/faq/webbrowse.docbook
  10. 6
      doc/glossary/index.docbook
  11. 2
      doc/glossary/tdeprintingglossary.docbook
  12. 2
      doc/kcontrol/filemanager/index.docbook
  13. 2
      doc/kcontrol/kcmcss/index.docbook
  14. 2
      doc/kcontrol/khtml/Makefile.am
  15. 4
      doc/kcontrol/spellchecking/index.docbook
  16. 2
      doc/kcontrol/tdehtml/CMakeLists.txt
  17. 2
      doc/kcontrol/tdehtml/Makefile.am
  18. 2
      doc/kcontrol/tdehtml/index.docbook
  19. 0
      doc/kcontrol/tdehtml/nsplugin.docbook
  20. 2
      doc/konqueror/config.docbook
  21. 4
      doc/userguide/groupware-kontact.docbook
  22. 12
      doc/userguide/tde-for-admins.docbook
  23. 2
      doc/userguide/tde-office.docbook
  24. 2
      drkonqi/Makefile.am
  25. 4
      kappfinder/Makefile.am
  26. 2
      kate/AUTHORS
  27. 10
      kate/ChangeLog
  28. 2
      kate/app/CMakeLists.txt
  29. 2
      kate/app/kateconfigdialog.h
  30. 2
      kate/app/kateconsole.cpp
  31. 4
      kate/app/katedocmanager.cpp
  32. 4
      kate/app/katemainwindow.cpp
  33. 2
      kate/app/katemainwindow.h
  34. 4
      kate/app/katemdi.h
  35. 2
      kate/app/katesavemodifieddialog.cpp
  36. 2
      kate/app/kateviewmanager.cpp
  37. 4
      kate/app/kateviewspacecontainer.cpp
  38. 18
      kate/app/kwritemain.cpp
  39. 6
      kate/app/kwritemain.h
  40. 2
      kate/data/kateui.rc
  41. 2
      kate/data/kwriteui.rc
  42. 2
      kate/interfaces/Makefile.am
  43. 2
      kate/interfaces/plugin.cpp
  44. 2
      kate/interfaces/plugin.h
  45. 2
      kcheckpass/README
  46. 2
      kcheckpass/kcheckpass.c
  47. 2
      kcheckpass/kcheckpass.h
  48. 4
      kcminit/CMakeLists.txt
  49. 2
      kcontrol/arts/CMakeLists.txt
  50. 2
      kcontrol/arts/Makefile.am
  51. 4
      kcontrol/arts/arts.cpp
  52. 4
      kcontrol/background/bgrender.cpp
  53. 4
      kcontrol/componentchooser/componentservices/Makefile.am
  54. 2
      kcontrol/display/CMakeLists.txt
  55. 2
      kcontrol/display/display.desktop
  56. 2
      kcontrol/displayconfig/CMakeLists.txt
  57. 2
      kcontrol/displayconfig/Makefile.am
  58. 2
      kcontrol/displayconfig/displayconfig.h
  59. 8
      kcontrol/dnssd/CMakeLists.txt
  60. 12
      kcontrol/dnssd/Makefile.am
  61. 4
      kcontrol/dnssd/kcm_tdednssd.desktop
  62. 8
      kcontrol/dnssd/kcmdnssd.cpp
  63. 2
      kcontrol/filetypes/Makefile.am
  64. 2
      kcontrol/filetypes/filetypedetails.cpp
  65. 4
      kcontrol/filetypes/filetypesview.cpp
  66. 2
      kcontrol/filetypes/keditfiletype.cpp
  67. 2
      kcontrol/filetypes/typeslistitem.h
  68. 2
      kcontrol/iccconfig/CMakeLists.txt
  69. 2
      kcontrol/iccconfig/Makefile.am
  70. 2
      kcontrol/iccconfig/iccconfig.h
  71. 2
      kcontrol/kcontrol/CMakeLists.txt
  72. 2
      kcontrol/kcontrol/aboutwidget.cpp
  73. 2
      kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
  74. 2
      kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
  75. 4
      kcontrol/kfontinst/viewpart/CMakeLists.txt
  76. 2
      kcontrol/kfontinst/viewpart/FontViewPart.h
  77. 4
      kcontrol/kfontinst/viewpart/FontViewerApp.h
  78. 2
      kcontrol/kfontinst/viewpart/Makefile.am
  79. 2
      kcontrol/kicker/CMakeLists.txt
  80. 2
      kcontrol/kio/CMakeLists.txt
  81. 2
      kcontrol/knotify/knotify.cpp
  82. 2
      kcontrol/konq/CMakeLists.txt
  83. 8
      kcontrol/konqhtml/CMakeLists.txt
  84. 6
      kcontrol/konqhtml/Makefile.am
  85. 16
      kcontrol/konqhtml/appearance.cpp
  86. 10
      kcontrol/konqhtml/htmlopts.cpp
  87. 2
      kcontrol/konqhtml/javaopts.cpp
  88. 2
      kcontrol/konqhtml/jspolicies.h
  89. 12
      kcontrol/konqhtml/main.cpp
  90. 6
      kcontrol/konqhtml/tdehtml_behavior.desktop
  91. 6
      kcontrol/konqhtml/tdehtml_filter.desktop
  92. 6
      kcontrol/konqhtml/tdehtml_fonts.desktop
  93. 6
      kcontrol/konqhtml/tdehtml_java_js.desktop
  94. 2
      kcontrol/kthememanager/kthememanager.cpp
  95. 0
      kcontrol/pics/cr128-app-tdescreensaver.png
  96. 0
      kcontrol/pics/cr16-app-tdescreensaver.png
  97. 0
      kcontrol/pics/cr22-app-tdescreensaver.png
  98. 0
      kcontrol/pics/cr32-app-tdescreensaver.png
  99. 0
      kcontrol/pics/cr48-app-tdescreensaver.png
  100. 0
      kcontrol/pics/cr64-app-tdescreensaver.png
  101. 2
      kcontrol/privacy/kprivacymanager.cpp
  102. 18
      kcontrol/randr/CMakeLists.txt
  103. 26
      kcontrol/randr/Makefile.am
  104. 4
      kcontrol/randr/configdialog.cpp
  105. 10
      kcontrol/randr/main.cpp
  106. 6
      kcontrol/randr/tderandrapp.cpp
  107. 0
      kcontrol/randr/tderandrapp.h
  108. 2
      kcontrol/randr/tderandrbindings.cpp
  109. 0
      kcontrol/randr/tderandrinithack.cpp
  110. 6
      kcontrol/randr/tderandrmodule.cpp
  111. 2
      kcontrol/randr/tderandrmodule.h
  112. 4
      kcontrol/randr/tderandrpassivepopup.cpp
  113. 0
      kcontrol/randr/tderandrpassivepopup.h
  114. 4
      kcontrol/randr/tderandrtray-autostart.desktop
  115. 12
      kcontrol/randr/tderandrtray.cpp
  116. 2
      kcontrol/randr/tderandrtray.desktop
  117. 2
      kcontrol/randr/tderandrtray.h
  118. 2
      kcontrol/screensaver/screensaver.desktop
  119. 4
      kcontrol/screensaver/scrnsave.cpp
  120. 2
      kcontrol/spellchecking/spellchecking.cpp
  121. 2
      kdepasswd/Makefile.am
  122. 4
      kdesktop/CMakeLists.txt
  123. 2
      kdesktop/ConfigureChecks.cmake
  124. 2
      kdesktop/desktop.cc
  125. 2
      kdesktop/kwebdesktop/CMakeLists.txt
  126. 2
      kdesktop/kwebdesktop/Makefile.am
  127. 4
      kdesktop/kwebdesktop/kwebdesktop.cpp
  128. 4
      kdesktop/kwebdesktop/kwebdesktop.h
  129. 2
      kdesktop/lock/Makefile.am
  130. 2
      kdialog/Makefile.am
  131. 2
      kfind/CMakeLists.txt
  132. 2
      kfind/Makefile.am
  133. 2
      kfind/kfindpart.cpp
  134. 4
      kfind/kfindpart.h
  135. 2
      kfind/kftabdlg.cpp
  136. 2
      khelpcenter/CMakeLists.txt
  137. 4
      khelpcenter/Makefile.am
  138. 2
      khelpcenter/fontdialog.cpp
  139. 8
      khelpcenter/htmlsearch/Makefile.am
  140. 2
      khelpcenter/htmlsearch/index.cpp
  141. 2
      khelpcenter/htmlsearch/kcmhtmlsearch.cpp
  142. 4
      khelpcenter/mainwindow.cpp
  143. 2
      khelpcenter/mainwindow.h
  144. 4
      khelpcenter/view.cpp
  145. 2
      khelpcenter/view.h
  146. 2
      kicker/applets/launcher/CMakeLists.txt
  147. 2
      kicker/applets/launcher/quickaddappsmenu.cpp
  148. 2
      kicker/extensions/kasbar/Makefile.am
  149. 4
      kicker/extensions/sidebar/sidebarextension.cpp
  150. 2
      kicker/extensions/sidebar/sidebarextension.h
  151. 2
      kicker/kicker/CMakeLists.txt
  152. 2
      kicker/kicker/core/container_button.cpp
  153. 2
      kicker/kicker/ui/addbutton_mnu.cpp
  154. 2
      kicker/kicker/ui/itemview.cpp
  155. 2
      kicker/kicker/ui/k_new_mnu.cpp
  156. 4
      kicker/kicker/ui/service_mnu.cpp
  157. 2
      kicker/kicker/ui/service_mnu.h
  158. 2
      kicker/libkicker/menuinfo.cpp
  159. 2
      kicker/menuext/prefmenu/prefmenu.cpp
  160. 2
      kicker/menuext/prefmenu/prefmenu.h
  161. 2
      kicker/menuext/tom/tom.cc
  162. 2
      kicker/proxy/Makefile.am
  163. 2
      kioslave/about/Makefile.am
  164. 2
      kioslave/finger/Makefile.am
  165. 2
      kioslave/fish/Makefile.am
  166. 2
      kioslave/mac/Makefile.am
  167. 2
      kioslave/man/CMakeLists.txt
  168. 8
      kioslave/man/Makefile.am
  169. 8
      kioslave/man/kmanpart.h
  170. 2
      kioslave/media/mounthelper/Makefile.am
  171. 2
      kioslave/nfs/Makefile.am
  172. 2
      kioslave/sftp/Makefile.am
  173. 2
      kioslave/tar/Makefile.am
  174. 2
      kioslave/thumbnail/CMakeLists.txt
  175. 2
      kioslave/thumbnail/Makefile.am
  176. 2
      kioslave/thumbnail/htmlcreator.cpp
  177. 2
      kioslave/trash/Makefile.am
  178. 2
      klipper/configdialog.cpp
  179. 2
      klipper/historyurlitem.cpp
  180. 2
      kmenuedit/treeview.cpp
  181. 2
      knetattach/Makefile.am
  182. 2
      knetattach/TODO
  183. 2
      konqueror/CMakeLists.txt
  184. 8
      konqueror/DESIGN
  185. 2
      konqueror/DESIGN_config
  186. 2
      konqueror/Makefile.am
  187. 2
      konqueror/about/CMakeLists.txt
  188. 6
      konqueror/about/konq_aboutpage.cc
  189. 4
      konqueror/about/konq_aboutpage.h
  190. 2
      konqueror/client/kfmclient_3_2_update.sh
  191. 2
      konqueror/iconview/konq_iconview.cc
  192. 2
      konqueror/iconview/konq_iconview.h
  193. 2
      konqueror/keditbookmarks/DESIGN
  194. 2
      konqueror/keditbookmarks/Makefile.am
  195. 4
      konqueror/keditbookmarks/actionsimpl.cpp
  196. 4
      konqueror/keditbookmarks/favicons.h
  197. 8
      konqueror/keditbookmarks/updater.cpp
  198. 4
      konqueror/keditbookmarks/updater.h
  199. 2
      konqueror/konq_browseriface.h
  200. 2
      konqueror/konq_combo.cc
  201. 6
      konqueror/konq_extensionmanager.cc
  202. 2
      konqueror/konq_factory.cc
  203. 2
      konqueror/konq_factory.h
  204. 10
      konqueror/konq_mainwindow.cc
  205. 2
      konqueror/konq_mainwindow.h
  206. 2
      konqueror/konq_misc.h
  207. 2
      konqueror/konq_openurlrequest.h
  208. 2
      konqueror/konq_run.h
  209. 4
      konqueror/konq_view.cc
  210. 2
      konqueror/konq_viewmgr.h
  211. 8
      konqueror/konqueror.kcfg
  212. 12
      konqueror/kttsplugin/CMakeLists.txt
  213. 14
      konqueror/kttsplugin/Makefile.am
  214. 8
      konqueror/kttsplugin/tdehtmlkttsd.cpp
  215. 4
      konqueror/kttsplugin/tdehtmlkttsd.desktop
  216. 2
      konqueror/kttsplugin/tdehtmlkttsd.h
  217. 2
      konqueror/kttsplugin/tdehtmlkttsd.rc
  218. 4
      konqueror/listview/konq_listview.h
  219. 2
      konqueror/listview/konq_listviewwidget.cc
  220. 2
      konqueror/listview/konq_listviewwidget.h
  221. 10
      konqueror/profile_kde_devel.desktop
  222. 8
      konqueror/profile_tabbedbrowsing.desktop
  223. 2
      konqueror/quickprint/TODO
  224. 2
      konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
  225. 2
      konqueror/remoteencodingplugin/kremoteencodingplugin.h
  226. 2
      konqueror/shellcmdplugin/kshellcmdplugin.h
  227. 4
      konqueror/sidebar/CMakeLists.txt
  228. 8
      konqueror/sidebar/konqsidebar.h
  229. 4
      konqueror/sidebar/konqsidebarplugin.h
  230. 4
      konqueror/sidebar/sidebar_widget.h
  231. 6
      konqueror/sidebar/trees/konqsidebar_tree.h
  232. 2
      konqueror/sidebar/web_module/CMakeLists.txt
  233. 2
      konqueror/sidebar/web_module/web_module.cpp
  234. 2
      konqueror/sidebar/web_module/web_module.h
  235. 2
      konsole/konsole/CMakeLists.txt
  236. 2
      konsole/konsole/Makefile.am
  237. 2
      konsole/konsole/konsole.cpp
  238. 4
      konsole/konsole/konsole_part.h
  239. 2
      kpager/Makefile.am
  240. 2
      kpersonalizer/Makefile.am
  241. 2
      kpersonalizer/kcountrypage.cpp
  242. 2
      kreadconfig/Makefile.am
  243. 2
      ksmserver/CMakeLists.txt
  244. 2
      ksmserver/Makefile.am
  245. 2
      ksmserver/shutdown.cpp
  246. 2
      ksplashml/CMakeLists.txt
  247. 2
      ksplashml/Makefile.am
  248. 2
      ksplashml/themeengine/default/Makefile.am
  249. 2
      ksplashml/themeengine/simple/Makefile.am
  250. 2
      ksplashml/themeengine/standard/Makefile.am
  251. 2
      ksplashml/themeengine/unified/Makefile.am
  252. 2
      kstart/Makefile.am
  253. 2
      ksysguard/gui/CMakeLists.txt
  254. 2
      ksysguard/gui/Makefile.am
  255. 2
      ksystraycmd/Makefile.am
  256. 2
      ktip/Makefile.am
  257. 2
      ktip/tips
  258. 2
      libkonq/CMakeLists.txt
  259. 2
      libkonq/kivdirectoryoverlay.cc
  260. 2
      libkonq/konq_dirpart.cc
  261. 4
      libkonq/konq_dirpart.h
  262. 2
      libkonq/konq_events.h
  263. 4
      libkonq/konq_historymgr.h
  264. 2
      libkonq/konq_iconviewwidget.h
  265. 12
      libkonq/konq_popupmenu.cc
  266. 2
      libkonq/konq_popupmenu.h
  267. 6
      migratekde3
  268. 4
      nsplugins/CMakeLists.txt
  269. 4
      nsplugins/Makefile.am
  270. 2
      nsplugins/nspluginloader.cpp
  271. 8
      nsplugins/plugin_part.cpp
  272. 6
      nsplugins/plugin_part.h
  273. 6
      nsplugins/tdehtml_plugins.desktop
  274. 2
      nsplugins/test/Makefile.am
  275. 2
      nsplugins/viewer/CMakeLists.txt
  276. 2
      nsplugins/viewer/nsplugin.h
  277. 4
      r14-xdg-update
  278. 2
      tdeinit/CMakeLists.txt
  279. 2
      tdeinit/displayconfig.cpp
  280. 2
      tdeprint/tdeprint_part/CMakeLists.txt
  281. 2
      tdeprint/tdeprint_part/printpart.cpp
  282. 4
      tdeprint/tdeprint_part/printpart.h
  283. 2
      tdeprint/tdeprintfax/Makefile.am
  284. 0
      tdescreensaver.pamd
  285. 0
      tdescreensaver/AUTHORS
  286. 2
      tdescreensaver/CMakeLists.txt
  287. 4
      tdescreensaver/ChangeLog
  288. 4
      tdescreensaver/KBlankscreen.desktop
  289. 4
      tdescreensaver/KRandom.desktop
  290. 8
      tdescreensaver/Makefile.am
  291. 4
      tdescreensaver/blankscrn.cpp
  292. 2
      tdescreensaver/blankscrn.h
  293. 4
      tdescreensaver/random.cpp
  294. 0
      tdescreensaver/random.h
  295. 2
      tdesu/tdesu/Makefile.am
  296. 4
      tdesu/tdesu/tdesu.cpp
  297. 2
      tdm/kfrontend/CMakeLists.txt
  298. 4
      tdm/kfrontend/Makefile.am
  299. 2
      tdm/kfrontend/kgapp.cpp
  300. 2
      tqt3integration/README
  301. 2
      twin/clients/keramik/Makefile.am
  302. 2
      twin/clients/kwmtheme/cli_installer/Makefile.am
  303. 2
      twin/killer/Makefile.am
  304. 2
      twin/tools/Makefile.am

4
CMakeLists.txt

@ -171,7 +171,7 @@ option( BUILD_KAPPFINDER "Build kappfinder" ${BUILD_ALL} )
option( BUILD_KCHECKPASS "Build kcheckpass" ${BUILD_ALL} )
option( BUILD_KHELPCENTER "Build khelpcenter" ${BUILD_ALL} )
option( BUILD_KHOTKEYS "Build khotkeys" ${BUILD_ALL} )
option( BUILD_KSCREENSAVER "Build kscreensaver" ${BUILD_ALL} )
option( BUILD_KSCREENSAVER "Build tdescreensaver" ${BUILD_ALL} )
option( BUILD_KSTART "Build kstart" ${BUILD_ALL} )
option( BUILD_KSYSTRAYCMD "Build ksystraycmd" ${BUILD_ALL} )
option( BUILD_NSPLUGINS "Build nsplugins" ${BUILD_ALL} )
@ -248,7 +248,7 @@ tde_conditional_add_subdirectory( BUILD_KAPPFINDER kappfinder )
tde_conditional_add_subdirectory( BUILD_KCHECKPASS kcheckpass )
tde_conditional_add_subdirectory( BUILD_KHELPCENTER khelpcenter )
tde_conditional_add_subdirectory( BUILD_KHOTKEYS khotkeys )
tde_conditional_add_subdirectory( BUILD_KSCREENSAVER kscreensaver )
tde_conditional_add_subdirectory( BUILD_KSCREENSAVER tdescreensaver )
tde_conditional_add_subdirectory( BUILD_KSTART kstart )
tde_conditional_add_subdirectory( BUILD_KSYSTRAYCMD ksystraycmd )
tde_conditional_add_subdirectory( BUILD_NSPLUGINS nsplugins )

2
Makefile.am.in

@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = foreign 1.6.1
bin_SCRIPTS = starttde trinity migratekde3 r14-xdg-update
EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd kscreensaver.pamd mkpamserv
EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd tdescreensaver.pamd mkpamserv
dist-hook:
cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin

2
README

@ -106,7 +106,7 @@ libraries. Here is an overview of the directories:
* krichtexteditor
A embeddable rich text editor and a wrapper application for it.
* kscreensaver
* tdescreensaver
The KDE screensaver environment and some basic screensavers. More
of them are in the tdeartwork package.

10
README.pam

@ -1,6 +1,6 @@
KDE can be configured to support the PAM ("Pluggable Authentication
Modules") system for password checking by the display manager tdm and
by the screen saver kscreensaver (for unlocking the display).
by the screen saver tdescreensaver (for unlocking the display).
PAM is a flexible application-transparent configurable user-authentication
system found on FreeBSD, Solaris, and Linux (and maybe other unixes).
@ -27,26 +27,26 @@ By default, PAM is automatically used, if it is found. Use
If PAM is found, KDE usually uses the PAM service "kde". You may
override it for all KDE programs by using --with-pam=<service> and/or
individually by using --with-<prog>-pam=<service>, where <prog> is
one of tdm, kcp and kss (for tdm, kcheckpass and kscreensaver).
one of tdm, kcp and kss (for tdm, kcheckpass and tdescreensaver).
"make install" will attempt to create suitable service definitions; either
by putting files into /etc/pam.d/ or by adding text to /etc/pam.conf. The
services are just copies of the "login" service.
You may want to edit these definitions to meet your needs.
There are also two example service definitions in this directory -
kde.pamd and kscreensaver.pamd - but don't just copy them!
kde.pamd and tdescreensaver.pamd - but don't just copy them!
If the services are misconfigured, you will NOT be able to login via TDM
and/or unlock a locked screen!
If there is ever any doubt about which PAM service a program was
compiled with, it can be determined by examining the PAM-generated
entries in the system log associated with tdm logins or kscreensaver
entries in the system log associated with tdm logins or tdescreensaver
authentication failures.
PAM configuration files have four types of entries for each service:
type used by tdm used by kscreensaver
type used by tdm used by tdescreensaver
---- ----------- --------------------
auth x x
account x

4
applnk/compat/konqhtml.desktop

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

2
applnk/tde-system-screensavers.directory

@ -82,7 +82,7 @@ Name[xh]=Abagcini Bekhusi
Name[zh_CN]=屏幕保护程序
Name[zh_TW]=螢幕保護程式
Name[zu]=Abagcini Besikrini
Icon=kscreensaver
Icon=tdescreensaver
X-TDE-BaseGroup=screensavers
Comment=Screen saver demos

2
config.h.cmake

@ -88,7 +88,7 @@
// kcontrol/energy
#cmakedefine HAVE_DPMS 1
// kdesktop, kcontrol/screensaver, kscreensaver
// kdesktop, kcontrol/screensaver, tdescreensaver
#cmakedefine HAVE_GLXCHOOSEVISUAL 1
// kcontrol/crypto

2
configure.in.in

@ -7,7 +7,7 @@ KDE_PASSWDLIBS
DEF_PAM_SERVICE(tdm, tdm, TDM)
DEF_PAM_SERVICE(kcp, kcheckpass, KCHECKPASS)
DEF_PAM_SERVICE(kss, kscreensaver, KSCREENSAVER)
DEF_PAM_SERVICE(kss, tdescreensaver, KSCREENSAVER)
dnl Checks for header files.
AC_HEADER_DIRENT

2
doc/faq/webbrowse.docbook

@ -206,7 +206,7 @@ text->html in the tree view.</para>
<listitem><para>Click on the
<guilabel>Embedding</guilabel> tab. Make sure that <guilabel>Left Click
Action</guilabel> is set to <guilabel>Show file in embedded
viewer</guilabel>, and that <guilabel>KHTML (khtml)</guilabel> is at the top
viewer</guilabel>, and that <guilabel>KHTML (tdehtml)</guilabel> is at the top
of <guilabel>Services Preference Order</guilabel>.</para></listitem>
</orderedlist>
</para>

6
doc/glossary/index.docbook

@ -33,7 +33,7 @@ Slave</glossseealso>
<glossseealso otherterm="gloss-kde">&tde;</glossseealso>
</glossdef>
</glossentry>
<glossentry id="gloss-kparts">
<glossentry id="gloss-tdeparts">
<glossterm>KParts</glossterm>
<glossdef><para>KParts is an embedding technology which allows &tde;
applications to embed other &tde; applications. For example, the text
@ -41,7 +41,7 @@ Slave</glossseealso>
<glossseealso otherterm="gloss-konqueror">&konqueror;</glossseealso>
</glossdef>
</glossentry>
<glossentry id="gloss-ksycoca">
<glossentry id="gloss-tdesycoca">
<glossterm><acronym>KSycoca</acronym></glossterm>
<glossdef><para><acronym>KSycoca</acronym> (&tde; <emphasis>Sy</emphasis>stem
<emphasis>Co</emphasis>nfiguration <emphasis>Ca</emphasis>che) is a
@ -88,7 +88,7 @@ program and regenerates the
or all modules in
&kcontrol; are missing.</para>
<glossseealso
otherterm="gloss-ksycoca"><acronym>KSycoca</acronym></glossseealso>
otherterm="gloss-tdesycoca"><acronym>KSycoca</acronym></glossseealso>
<glossseealso otherterm="gloss-kcontrol">&kcontrol;</glossseealso>
</glossdef>
</glossentry>

2
doc/glossary/tdeprintingglossary.docbook

@ -1134,7 +1134,7 @@ now.
address gives administrative access to TDEPrint. Konqueror uses &tde;'s
famous "KParts" technology to achieve that.</para>
<glossseealso otherterm="gloss-ioslave">IO Slave</glossseealso>
<glossseealso otherterm="gloss-kparts">KParts</glossseealso>
<glossseealso otherterm="gloss-tdeparts">KParts</glossseealso>
</glossdef>
</glossentry>

2
doc/kcontrol/filemanager/index.docbook

@ -29,7 +29,7 @@
&konqueror;'s file manager functionality.</para>
<note><para>&konqueror;'s web browser functionality has its <ulink
url="help:/kcontrol/khtml/index.html">own configuration
url="help:/kcontrol/tdehtml/index.html">own configuration
modules</ulink>.</para></note>
<sect2 id="fileman-use">

2
doc/kcontrol/kcmcss/index.docbook

@ -45,7 +45,7 @@ tuned for accessibility purposes, especially for people with reduced
vision.</para>
<para>Your choices here affect every &tde; application that renders HTML
with &tde;'s own renderer, which is called khtml. These include
with &tde;'s own renderer, which is called tdehtml. These include
&kmail;, &khelpcenter; and of course &konqueror;. Choices here do not
affect other browsers such as &Netscape;.</para>

2
doc/kcontrol/khtml/Makefile.am

@ -1,2 +0,0 @@
KDE_LANG = en
KDE_DOCS = kcontrol/khtml

4
doc/kcontrol/spellchecking/index.docbook

@ -30,7 +30,7 @@
<title>Spell Checker</title>
<para>The configuration options available here are used by all &tde;
applications that use &kspell;, which is a front end to
applications that use &tdespell;, which is a front end to
<command>ispell</command> or <command>aspell</command>.</para>
<variablelist>
@ -57,7 +57,7 @@ error.</para></listitem>
<term><guilabel>Dictionary:</guilabel></term>
<listitem>
<para>Choose from the available dictionaries, which one to use for
&kspell;.</para>
&tdespell;.</para>
</listitem>
</varlistentry>

2
doc/kcontrol/khtml/CMakeLists.txt → doc/kcontrol/tdehtml/CMakeLists.txt

@ -9,4 +9,4 @@
#
#################################################
tde_create_handbook( DESTINATION kcontrol/khtml )
tde_create_handbook( DESTINATION kcontrol/tdehtml )

2
doc/kcontrol/tdehtml/Makefile.am

@ -0,0 +1,2 @@
KDE_LANG = en
KDE_DOCS = kcontrol/tdehtml

2
doc/kcontrol/khtml/index.docbook → doc/kcontrol/tdehtml/index.docbook

@ -305,7 +305,7 @@ creates one.</para>
</sect2>
<sect2 id="khtml-adblock">
<sect2 id="tdehtml-adblock">
<title>AdBlocK</title>
<para>&konqueror; AdBlocK can be configured to replace or remove

0
doc/kcontrol/khtml/nsplugin.docbook → doc/kcontrol/tdehtml/nsplugin.docbook

2
doc/konqueror/config.docbook

@ -48,7 +48,7 @@ position and icon size</para>
Toolbars...</guimenuitem></menuchoice> option, which brings up the
<guilabel>Configure Toolbars</guilabel> dialog box. The Main and Extra Toolbars
are divided into sections, such as Main Toolbar &lt;&konqueror;&gt;, Main
Toolbar &lt;khtmlpart&gt; and Extra Toolbar &lt;khtmlsettingsplugin&gt;. The
Toolbar &lt;tdehtmlpart&gt; and Extra Toolbar &lt;tdehtmlsettingsplugin&gt;. The
number and type of these sections will depend on whether &konqueror; is in Web
Browser or File Manager mode and whether you have &konqueror; plugins
installed.</para>

4
doc/userguide/groupware-kontact.docbook

@ -242,7 +242,7 @@ class="username">groupware</systemitem> user (already previously
done!)</para></step>
<step><para>Create/configure an <acronym>IMAP</acronym> account in &kmail;
for login as that user</para></step> <step><para>Use kresources to make
for login as that user</para></step> <step><para>Use tderesources to make
&kontact; components work with data taken from <acronym>IMAP</acronym>
source</para></step>
@ -336,7 +336,7 @@ slow data updates.</para>
<para>Now we have to tell &kontact; to use <acronym>IMAP</acronym> as the
data source for it's various components. From the &kmenu;, choose
<guimenuitem>Run command</guimenuitem>, run <userinput><command>kcmshell
kresources</command></userinput>. In the combo box select
tderesources</command></userinput>. In the combo box select
<guilabel>Contacts</guilabel>, then press the <guibutton>Add...</guibutton>
button, and choose <guilabel>Addressbook on IMAP Server via KMail</guilabel>. Then select that new line and
press <guibutton>Use as Standard</guibutton> button. Do the same for

12
doc/userguide/tde-for-admins.docbook

@ -858,7 +858,7 @@ also unique per X-server display. The processes are:</para>
<varlistentry>
<term><command>kded</command></term>
<listitem><para>Generic service daemon.</para>
<para>Triggers <link linkend="ksycoca">Sycoca</link> database updates when
<para>Triggers <link linkend="tdesycoca">Sycoca</link> database updates when
needed</para>
</listitem>
</varlistentry>
@ -1819,14 +1819,14 @@ class="directory">$<envar>HOME</envar>/.trinity/share/applnk</filename>
(user specific). This is observed unless the <literal role="extension">.desktop</literal> file has a <varname>Categories</varname>= line. In that case the categories determine the location in the menu.</para>
</sect2>
<sect2 id="ksycoca">
<sect2 id="tdesycoca">
<title><application>KSycoca</application></title>
<para><application>KSycoca</application> caches menu structure and
information about all available applications. You can rebuild the
database with
<userinput><command>kbuildsycoca</command></userinput>. The database
which is built lives in <filename
class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/ksycoca</filename>.
class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/tdesycoca</filename>.
It is automatically updated by <application>KDED</application>,
checked during &tde; login, and <application>KDED</application>
watches for changes while logged in.</para>
@ -1839,7 +1839,7 @@ CheckSycoca=false
</programlisting>
</para>
<para>To force regeneration, run <userinput><command>touch $<envar>TDEDIR</envar>/share/services/update_ksycoca</command></userinput>.</para>
<para>To force regeneration, run <userinput><command>touch $<envar>TDEDIR</envar>/share/services/update_tdesycoca</command></userinput>.</para>
</sect2>
@ -2031,7 +2031,7 @@ shell_access=false</screen>
<para>Since this affects the &tde; menu and the available applications, we
must force an update of the sycoca database:</para>
<screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_ksycoca</filename></userinput></screen>
<screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_tdesycoca</filename></userinput></screen>
<para>Now re-login to &tde; and check the following points:</para>
@ -2488,7 +2488,7 @@ KDebug
MainApplication-Interface
konsole (default)
konsole-mainwindow#1
ksycoca
tdesycoca
session-1
session-2
session-3

2
doc/userguide/tde-office.docbook

@ -128,7 +128,7 @@ actually use the OASIS OpenDocument file format.
<!-- comment out for final commit before freeze
<chapter id="tde-office-embedding">
<title>Component Embedding</title>
<sect1 id="tde-office-kparts">
<sect1 id="tde-office-tdeparts">
<title>KParts and &koffice;</title>
<para>To be written</para>
</sect1>

2
drkonqi/Makefile.am

@ -11,7 +11,7 @@ EXTRA_DIST = LICENSE
bin_PROGRAMS = drkonqi crashtest
# Libraries:
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
LDADD = $(LIB_TDEUI) $(LIB_KIO)
# toplevel.cpp must be last in row due to X-headers being included. (--enable-final)

4
kappfinder/Makefile.am

@ -3,12 +3,12 @@ SUBDIRS = apps
bin_PROGRAMS = kappfinder
kappfinder_SOURCES = main.cpp toplevel.cpp common.cpp
kappfinder_LDADD = $(LIB_TDEUI) $(LIB_KIO)
kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_PROGRAMS = kappfinder_install
kappfinder_install_SOURCES = main_install.cpp common.cpp
kappfinder_install_LDADD = $(LIB_TDEUI)
kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
INCLUDES = $(all_includes)
METASOURCES = AUTO

2
kate/AUTHORS

@ -27,7 +27,7 @@ Kate/KWrite Team:
(original author of kwrite in kde 1.x until kde 2.1)
- Glen Parker <glenebob@nwlink.com>
(undo history, kspell-integration)
(undo history, tdespell-integration)
- Michael Koch <koch@kde.org>
(port to KParts)

10
kate/ChangeLog

@ -1,18 +1,18 @@
2004-04-22 Christoph Cullmann <cullmann@kde.org>
* kate switched over to katemdi, even smaller replacement for kmdi2 :)
* kate switched over to katemdi, even smaller replacement for tdemdi2 :)
2004-10-06 Christoph Cullmann <cullmann@kde.org>
* kate switched over to kmdi2, a slim version of old kmdi
* kate switched over to tdemdi2, a slim version of old tdemdi
which allows only IDEA mode, but should be much less buggy
beside this, we now allow tabbing thx to the new kmdi stuff
beside this, we now allow tabbing thx to the new tdemdi stuff
and therefor should now be really feature complete at least mdi
wise, having the features to allow multiple main windows,
tabbing, splitters, widget stacks for the views, now only missing thingy
would be to allow non kate view's to be embeded, like a khtml widget for
would be to allow non kate view's to be embeded, like a tdehtml widget for
documentation browsing or something like that
2003-08-28 Christoph Cullmann <cullmann@kde.org>
* jowenn switch kate over to use kmdi, seems to work well
* jowenn switch kate over to use tdemdi, seems to work well
for the first port, but still needs some fixes ;)
2002-07-19 Christoph Cullmann <cullmann@kde.org>

2
kate/app/CMakeLists.txt

@ -46,7 +46,7 @@ tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 0.0.0
EMBED kateinterfacesprivate-static
LINK kutils-shared
LINK tdeutils-shared
DESTINATION ${LIB_INSTALL_DIR}
)

2
kate/app/kateconfigdialog.h

@ -27,7 +27,7 @@
#include "../interfaces/pluginconfiginterfaceextension.h"
#include <kate/document.h>
#include <ktexteditor/configinterfaceextension.h>
#include <tdetexteditor/configinterfaceextension.h>
#include <kdialogbase.h>

2
kate/app/kateconsole.cpp

@ -31,7 +31,7 @@
#include <kde_terminal_interface.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <kurl.h>
#include <klibloader.h>

4
kate/app/katedocmanager.cpp

@ -28,9 +28,9 @@
#include <kate/view.h>
#include <ktexteditor/encodinginterface.h>
#include <tdetexteditor/encodinginterface.h>
#include <kparts/factory.h>
#include <tdeparts/factory.h>
#include <klocale.h>
#include <kdebug.h>

4
kate/app/katemainwindow.cpp

@ -73,7 +73,7 @@
#include <kurldrag.h>
#include <kdesktopfile.h>
#include <khelpmenu.h>
#include <kmultitabbar.h>
#include <tdemultitabbar.h>
#include <ktip.h>
#include <kmenubar.h>
#include <kstringhandler.h>
@ -209,7 +209,7 @@ void KateMainWindow::setupMainWindow ()
m_viewManager = new KateViewManager (this);
KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, SmallIcon("kmultiple"), i18n("Documents"));
KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, SmallIcon("tdemultiple"), i18n("Documents"));
filelist = new KateFileList (this, m_viewManager, ft, "filelist");
filelist->readConfig(KateApp::self()->config(), "Filelist");

2
kate/app/katemainwindow.h

@ -27,7 +27,7 @@
#include <kate/view.h>
#include <kate/document.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <kaction.h>

4
kate/app/katemdi.h

@ -21,9 +21,9 @@
#ifndef __KATE_MDI_H__
#define __KATE_MDI_H__
#include <kparts/mainwindow.h>
#include <tdeparts/mainwindow.h>
#include <kmultitabbar.h>
#include <tdemultitabbar.h>
#include <kxmlguiclient.h>
#include <kaction.h>

2
kate/app/katesavemodifieddialog.cpp

@ -32,7 +32,7 @@
#include <kmessagebox.h>
#include <kdebug.h>
#include <kencodingfiledialog.h>
#include <ktexteditor/encodinginterface.h>
#include <tdetexteditor/encodinginterface.h>
class AbstractKateSaveModifiedDialogCheckListItem:public TQCheckListItem {
public:

2
kate/app/kateviewmanager.cpp

@ -45,7 +45,7 @@
#include <kglobalsettings.h>
#include <kstdaccel.h>
#include <ktexteditor/encodinginterface.h>
#include <tdetexteditor/encodinginterface.h>
#include <tqobjectlist.h>
#include <tqstringlist.h>

4
kate/app/kateviewspacecontainer.cpp

@ -46,7 +46,7 @@
#include <kglobalsettings.h>
#include <kstringhandler.h>
#include <ktexteditor/encodinginterface.h>
#include <tdetexteditor/encodinginterface.h>
#include <tqlayout.h>
#include <tqobjectlist.h>
@ -120,7 +120,7 @@ bool KateViewSpaceContainer::createView ( Kate::Document *doc )
view->actionCollection()->remove (view->actionCollection()->action( "set_confdlg" ));
// popup menu
view->installPopup ((TQPopupMenu*)(mainWindow()->factory()->container("ktexteditor_popup", mainWindow())) );
view->installPopup ((TQPopupMenu*)(mainWindow()->factory()->container("tdetexteditor_popup", mainWindow())) );
connect(view->getDoc(),TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(statusMsg()));
connect(view,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(statusMsg()));

18
kate/app/kwritemain.cpp

@ -24,13 +24,13 @@
#include <kate/document.h>
#include <kate/view.h>
#include <ktexteditor/configinterface.h>
#include <ktexteditor/sessionconfiginterface.h>
#include <ktexteditor/viewcursorinterface.h>
#include <ktexteditor/printinterface.h>
#include <ktexteditor/encodinginterface.h>
#include <ktexteditor/editorchooser.h>
#include <ktexteditor/popupmenuinterface.h>
#include <tdetexteditor/configinterface.h>
#include <tdetexteditor/sessionconfiginterface.h>
#include <tdetexteditor/viewcursorinterface.h>
#include <tdetexteditor/printinterface.h>
#include <tdetexteditor/encodinginterface.h>
#include <tdetexteditor/editorchooser.h>
#include <tdetexteditor/popupmenuinterface.h>
#include <kio/netaccess.h>
@ -54,7 +54,7 @@
#include <kmessagebox.h>
#include <kkeydialog.h>
#include <kedittoolbar.h>
#include <kparts/event.h>
#include <tdeparts/event.h>
#include <kmenubar.h>
#include <tqdropsite.h>
@ -108,7 +108,7 @@ KWrite::KWrite (KTextEditor::Document *doc)
// install a working kate part popup dialog thingy
if (static_cast<Kate::View*>(m_view->tqt_cast("Kate::View")))
static_cast<Kate::View*>(m_view->tqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) );
static_cast<Kate::View*>(m_view->tqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("tdetexteditor_popup", this)) );
// init with more usefull size, stolen from konq :)
if (!initialGeometrySet())

6
kate/app/kwritemain.h

@ -21,10 +21,10 @@
#ifndef __KWRITE_MAIN_H__
#define __KWRITE_MAIN_H__
#include <ktexteditor/view.h>
#include <ktexteditor/document.h>
#include <tdetexteditor/view.h>
#include <tdetexteditor/document.h>
#include <kparts/mainwindow.h>
#include <tdeparts/mainwindow.h>
#include <kdialogbase.h>

2
kate/data/kateui.rc

@ -135,7 +135,7 @@
<DefineGroup name="zoom_operations" />
</ToolBar>
<Menu name="ktexteditor_popup" noMerge="1">
<Menu name="tdetexteditor_popup" noMerge="1">
<DefineGroup name="popup_operations" />
</Menu>

2
kate/data/kwriteui.rc

@ -88,7 +88,7 @@
<DefineGroup name="zoom_operations" />
</ToolBar>
<Menu name="ktexteditor_popup" noMerge="1">
<Menu name="tdetexteditor_popup" noMerge="1">
<DefineGroup name="popup_operations" />
</Menu>

2
kate/interfaces/Makefile.am

@ -6,7 +6,7 @@ libkateinterfacesprivate_la_SOURCES = application.cpp mainwindow.cpp documentman
pluginmanager.cpp plugin.cpp pluginconfiginterface.cpp pluginconfiginterfaceextension.cpp
libkateinterfacesprivate_la_LIBADD = -lkatepartinterfaces
libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kateinclude_HEADERS = application.h documentmanager.h mainwindow.h plugin.h viewmanager.h pluginconfiginterface.h pluginconfiginterfaceextension.h toolviewmanager.h pluginmanager.h
kateincludedir = $(includedir)/kate

2
kate/interfaces/plugin.cpp

@ -21,7 +21,7 @@
#include "plugin.h"
#include "plugin.moc"
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
namespace Kate
{

2
kate/interfaces/plugin.h

@ -56,7 +56,7 @@ KDE_EXPORT Plugin *createPlugin ( const char* libname, Application *application
/*
* view plugin class
* this plugin will be bound to a ktexteditor::view
* this plugin will be bound to a tdetexteditor::view
*/
class KDE_EXPORT PluginViewInterface
{

2
kcheckpass/README

@ -45,7 +45,7 @@ Olaf Kirch <okir@caldera.de> General Framework and PAM support
Christian Esken <esken@kde.org> Shadow and /etc/passwd support
Oswald Buddenhagen <ossi@kde.org> Binary conversation interface, etc.
Some parts were taken from kscreensaver's passwd.cpp
Some parts were taken from tdescreensaver's passwd.cpp
Currently this software is maintained by Oswald Buddenhagen <ossi@kde.org>.
Please send new authentication modules (checkpass_*.c) to me.

2
kcheckpass/kcheckpass.c

@ -41,7 +41,7 @@
* Roberto Teixeira <maragato@kde.org> other user (-U) support
* Oswald Buddenhagen <ossi@kde.org> Binary server mode
*
* Other parts were taken from kscreensaver's passwd.cpp.
* Other parts were taken from tdescreensaver's passwd.cpp.
*
*****************************************************************/

2
kcheckpass/kcheckpass.h

@ -31,7 +31,7 @@
* Christian Esken <esken@kde.org> Shadow and /etc/passwd support
* Oswald Buddenhagen <ossi@kde.org> Binary server mode
*
* Other parts were taken from kscreensaver's passwd.cpp
* Other parts were taken from tdescreensaver's passwd.cpp
*****************************************************************/
#ifndef KCHECKPASS_H_

4
kcminit/CMakeLists.txt

@ -25,7 +25,7 @@ link_directories(
tde_add_tdeinit_executable( kcminit AUTOMOC
SOURCES main.cpp main.skel
LINK kutils-shared
LINK tdeutils-shared
)
@ -33,5 +33,5 @@ tde_add_tdeinit_executable( kcminit AUTOMOC
tde_add_tdeinit_executable( kcminit_startup AUTOMOC
SOURCES main.cpp main.skel
LINK kutils-shared
LINK tdeutils-shared
)

2
kcontrol/arts/CMakeLists.txt

@ -29,6 +29,6 @@ install( FILES arts.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_arts AUTOMOC
SOURCES arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp
LINK kio-shared kmid-shared
LINK kio-shared tdemid-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

2
kcontrol/arts/Makefile.am

@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_arts.la
kcm_arts_la_SOURCES = arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp
kcm_arts_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_arts_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) -lkmid
kcm_arts_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) -ltdemid
AM_CPPFLAGS = -I$(kde_includes)/arts $(all_includes)

4
kcontrol/arts/arts.cpp

@ -48,7 +48,7 @@
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
#include <libkmid/deviceman.h>
#include <libtdemid/deviceman.h>
#include "arts.h"
@ -158,7 +158,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
general = new generalTab(tab);
hardware = new hardwareTab(tab);
//mixer = TDECModuleLoader::loadModule("kmixcfg", tab);
//midi = new KMidConfig(tab, "kmidconfig");
//midi = new KMidConfig(tab, "tdemidconfig");
general->layout()->setMargin( KDialog::marginHint() );
hardware->layout()->setMargin( KDialog::marginHint() );

4
kcontrol/background/bgrender.cpp

@ -311,7 +311,7 @@ wp_load:
goto wp_out;
}
// _Don't_ use KMimeType, as it relies on ksycoca which we really
// _Don't_ use KMimeType, as it relies on tdesycoca which we really
// don't want in krootimage (tdm context).
//if ( KMimeType::findByPath( file )->is( "image/svg+xml" ) ) {
if (file.endsWith(".svg") || file.endsWith(".svgz")) {
@ -399,7 +399,7 @@ wp_load:
}
// HACK: Use KFileMetaInfo only when we're attached to DCOP.
// KFileMetaInfo needs ksycoca and so on, but this code is
// KFileMetaInfo needs tdesycoca and so on, but this code is
// used also in krootimage (which in turn is used by tdm).
if( kapp->dcopClient()->isAttached()) {
KFileMetaInfo metaInfo(file);

4
kcontrol/componentchooser/componentservices/Makefile.am

@ -1,3 +1,3 @@
kcm_ktexteditor_DATA = kcm_kemail.desktop kcm_terminal.desktop kcm_browser.desktop
kcm_ktexteditordir = $(kde_datadir)/kcm_componentchooser
kcm_tdetexteditor_DATA = kcm_kemail.desktop kcm_terminal.desktop kcm_browser.desktop
kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser

2
kcontrol/display/CMakeLists.txt

@ -28,6 +28,6 @@ install( FILES display.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_display AUTOMOC
SOURCES display.cpp
LINK kutils-shared
LINK tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

2
kcontrol/display/display.desktop

@ -1,5 +1,5 @@
[Desktop Entry]
Icon=kscreensaver
Icon=tdescreensaver
Type=Application
Exec=kcmshell display
DocPath=kcontrol/kcmdisplay/index.html

2
kcontrol/displayconfig/CMakeLists.txt

@ -36,6 +36,6 @@ set_source_files_properties( displayconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CO
tde_add_kpart( kcm_displayconfig AUTOMOC
SOURCES
monitorworkspace.cpp displayconfig.cpp displayconfigbase.ui displayconfig.skel
LINK kio-shared krandr-shared kutils-shared
LINK kio-shared tderandr-shared tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

2
kcontrol/displayconfig/Makefile.am

@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_displayconfig.la
kcm_displayconfig_la_SOURCES = displayconfig.cpp displayconfigbase.ui displayconfig.skel
kcm_displayconfig_la_LDFLAGS = $(all_libraries) -lkrandr -module -avoid-version -no-undefined
kcm_displayconfig_la_LDFLAGS = $(all_libraries) -ltderandr -module -avoid-version -no-undefined
kcm_displayconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)

2
kcontrol/displayconfig/displayconfig.h

@ -34,7 +34,7 @@
#include <dcopobject.h>
#include <libkrandr/libkrandr.h>
#include <libtderandr/libtderandr.h>
#include <tdehardwaredevices.h>
#include "monitorworkspace.h"

8
kcontrol/dnssd/CMakeLists.txt

@ -22,15 +22,15 @@ link_directories(
##### other data ################################
install( FILES kcm_kdnssd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES kcm_tdednssd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
##### kcm_kdnssd (module) #######################
##### kcm_tdednssd (module) #######################
set_source_files_properties( kcmdnssd.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
tde_add_kpart( kcm_kdnssd AUTOMOC
tde_add_kpart( kcm_tdednssd AUTOMOC
SOURCES configdialog.ui kcmdnssd.cpp
LINK kdnssd-shared tdeui-shared
LINK tdednssd-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

12
kcontrol/dnssd/Makefile.am

@ -1,12 +1,12 @@
INCLUDES = $(all_includes)
METASOURCES = AUTO
kde_module_LTLIBRARIES = kcm_kdnssd.la
kcm_kdnssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
kcm_kdnssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h
kde_module_LTLIBRARIES = kcm_tdednssd.la
kcm_tdednssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
kcm_tdednssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h
xdg_apps_DATA = kcm_kdnssd.desktop
kcm_kdnssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI)
xdg_apps_DATA = kcm_tdednssd.desktop
kcm_tdednssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI)
messages: rc.cpp
$(EXTRACTRC) *.ui *.rc >> rc.cpp
$(XGETTEXT) $(kcm_kdnssd_la_SOURCES) rc.cpp -o $(podir)/kcmkdnssd.pot
$(XGETTEXT) $(kcm_tdednssd_la_SOURCES) rc.cpp -o $(podir)/kcmtdednssd.pot

4
kcontrol/dnssd/kcm_kdnssd.desktop → kcontrol/dnssd/kcm_tdednssd.desktop

@ -67,7 +67,7 @@ Comment[vi]=Cấu hình dịch vụ khám phá
Comment[wa]=Apontiaedjes do discovraedje do siervice
Comment[zh_CN]=配置探索服务
Comment[zh_TW]=設定服務偵測
Exec=kcmshell kcm_kdnssd
Exec=kcmshell kcm_tdednssd
GenericName=
GenericName[ko]=일반
Icon=network_local
@ -146,7 +146,7 @@ Terminal=false
Type=Application
X-DCOP-ServiceType=
X-TDE-HasReadOnlyMode=false
X-TDE-Library=kdnssd
X-TDE-Library=tdednssd
X-TDE-ModuleType=Library
X-TDE-ParentApp=kcontrol
#root parts unused with Avahi

8
kcontrol/dnssd/kcmdnssd.cpp

@ -34,7 +34,7 @@
#include <klocale.h>
#include <kglobal.h>
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
#include <kprocess.h>
#include <klineedit.h>
#include <kpassdlg.h>
@ -51,12 +51,12 @@
#define MDNSD_PID "/var/run/mdnsd.pid"
typedef KGenericFactory<KCMDnssd, TQWidget> KCMDnssdFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kdnssd, KCMDnssdFactory("kcmkdnssd"))
K_EXPORT_COMPONENT_FACTORY( kcm_tdednssd, KCMDnssdFactory("kcmtdednssd"))
KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
: ConfigDialog(parent, name), m_wdchanged(false)
{
setAboutData(new TDEAboutData(I18N_NOOP("kcm_kdnssd"),
setAboutData(new TDEAboutData(I18N_NOOP("kcm_tdednssd"),
I18N_NOOP("ZeroConf configuration"),0,0,TDEAboutData::License_GPL,
I18N_NOOP("(C) 2004,2005 Jakub Stachowski")));
setQuickHelp(i18n("Setup services browsing with ZeroConf"));
@ -65,7 +65,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
else if (getenv("TDESU_USER")!=0) tabs->removePage(tab);
addConfig(DNSSD::Configuration::self(),this);
// it is host-wide setting so it has to be in global config file
domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" ));
domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" ));
domain->setGroup("publishing");
load();
connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));

2
kcontrol/filetypes/Makefile.am

@ -21,7 +21,7 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails
keditfiletype_SOURCES = keditfiletype.cpp
keditfiletype_LDADD = libfiletypes.la $(LIB_KIO)
keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
messages:
$(XGETTEXT) *.cpp -o $(podir)/filetypes.pot

2
kcontrol/filetypes/filetypedetails.cpp

@ -235,7 +235,7 @@ void FileTypeDetails::updateAskSave()
// - images (reasoning: no need to save, most of the time, because fast to see)
// e.g. postscript is different, because takes longer to read, so
// it's more likely that the user might want to save it.
// - multipart/* ("server push", see kmultipart)
// - multipart/* ("server push", see tdemultipart)
// - other strange 'internal' mimetypes like print/manager...
if ( mime->is( "text/html" ) ||
mime->is( "text/xml" ) ||

4
kcontrol/filetypes/filetypesview.cpp

@ -22,7 +22,7 @@
#include "filetypedetails.h"
#include "filegroupdetails.h"
#include "filetypesview.h"
#include <ksycoca.h>
#include <tdesycoca.h>
FileTypesView::FileTypesView(TQWidget *p, const char *name)
: TDECModule(p, name)
@ -418,7 +418,7 @@ void FileTypesView::slotDatabaseChanged()
{
if ( KSycoca::self()->isChanged( "mime" ) )
{
// ksycoca has new KMimeTypes objects for us, make sure to update
// tdesycoca has new KMimeTypes objects for us, make sure to update
// our 'copies' to be in sync with it. Not important for OK, but
// important for Apply (how to differentiate those 2?).
// See BR 35071.

2
kcontrol/filetypes/keditfiletype.cpp

@ -26,7 +26,7 @@
#include <kaboutdata.h>
#include <kdebug.h>
#include <kcmdlineargs.h>
#include <ksycoca.h>
#include <tdesycoca.h>
#include <kstandarddirs.h>
#ifdef Q_WS_X11

2
kcontrol/filetypes/typeslistitem.h

@ -89,7 +89,7 @@ public:
bool isDirty() const;
void sync();
void setup();
void refresh(); // update m_mimetype from ksycoca when Apply is pressed
void refresh(); // update m_mimetype from tdesycoca when Apply is pressed
static bool defaultEmbeddingSetting( const TQString& major );
static void reset();

2
kcontrol/iccconfig/CMakeLists.txt

@ -33,6 +33,6 @@ set_source_files_properties( iccconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDI
tde_add_kpart( kcm_iccconfig AUTOMOC
SOURCES
iccconfig.cpp iccconfigbase.ui iccconfig.skel
LINK kio-shared krandr-shared
LINK kio-shared tderandr-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

2
kcontrol/iccconfig/Makefile.am

@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_iccconfig.la
kcm_iccconfig_la_SOURCES = iccconfig.cpp iccconfigbase.ui iccconfig.skel
kcm_iccconfig_la_LDFLAGS = $(all_libraries) -lkrandr -module -avoid-version -no-undefined
kcm_iccconfig_la_LDFLAGS = $(all_libraries) -ltderandr -module -avoid-version -no-undefined
kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)

2
kcontrol/iccconfig/iccconfig.h

@ -27,7 +27,7 @@
#include <dcopobject.h>
#include <libkrandr/libkrandr.h>
#include <libtderandr/libtderandr.h>
#include "iccconfigbase.h"

2
kcontrol/kcontrol/CMakeLists.txt

@ -44,7 +44,7 @@ set( ${target}_SRCS
tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK khtml-shared
LINK tdehtml-shared
)
tde_install_symlink( kcontrol ${BIN_INSTALL_DIR}/kinfocenter )

2
kcontrol/kcontrol/aboutwidget.cpp

@ -30,7 +30,7 @@
#include <kpixmapeffect.h>
#include <kcursor.h>
#include <kglobalsettings.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <kapplication.h>
#include <kiconloader.h>

2
kcontrol/kfontinst/kcmfontinst/KCmFontInst.h

@ -39,7 +39,7 @@
#include <kconfig.h>
#include <kio/job.h>
#ifdef HAVE_XFT
#include <kparts/part.h>
#include <tdeparts/part.h>
#endif
class KDirOperator;

2
kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp

<
@ -475,7 +475,7 @@ TQDragObject *CKFileFontView::dragObject()
urls.append( (*it)->url() );
if(urls.count()> 1)
pixmap = DesktopIcon("kmultiple", KIcon::SizeSmall);