Browse Source

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

Timothy Pearson 6 years ago
parent
commit
dc6b76cac4
100 changed files with 175 additions and 175 deletions
  1. 2
    2
      CMakeLists.txt
  2. 1
    1
      Makefile.am.in
  3. 1
    1
      README
  4. 5
    5
      README.pam
  5. 2
    2
      applnk/compat/konqhtml.desktop
  6. 1
    1
      applnk/tde-system-screensavers.directory
  7. 1
    1
      config.h.cmake
  8. 1
    1
      configure.in.in
  9. 1
    1
      doc/faq/webbrowse.docbook
  10. 3
    3
      doc/glossary/index.docbook
  11. 1
    1
      doc/glossary/tdeprintingglossary.docbook
  12. 1
    1
      doc/kcontrol/filemanager/index.docbook
  13. 1
    1
      doc/kcontrol/kcmcss/index.docbook
  14. 0
    2
      doc/kcontrol/khtml/Makefile.am
  15. 2
    2
      doc/kcontrol/spellchecking/index.docbook
  16. 1
    1
      doc/kcontrol/tdehtml/CMakeLists.txt
  17. 2
    0
      doc/kcontrol/tdehtml/Makefile.am
  18. 1
    1
      doc/kcontrol/tdehtml/index.docbook
  19. 0
    0
      doc/kcontrol/tdehtml/nsplugin.docbook
  20. 1
    1
      doc/konqueror/config.docbook
  21. 2
    2
      doc/userguide/groupware-kontact.docbook
  22. 6
    6
      doc/userguide/tde-for-admins.docbook
  23. 1
    1
      doc/userguide/tde-office.docbook
  24. 1
    1
      drkonqi/Makefile.am
  25. 2
    2
      kappfinder/Makefile.am
  26. 1
    1
      kate/AUTHORS
  27. 5
    5
      kate/ChangeLog
  28. 1
    1
      kate/app/CMakeLists.txt
  29. 1
    1
      kate/app/kateconfigdialog.h
  30. 1
    1
      kate/app/kateconsole.cpp
  31. 2
    2
      kate/app/katedocmanager.cpp
  32. 2
    2
      kate/app/katemainwindow.cpp
  33. 1
    1
      kate/app/katemainwindow.h
  34. 2
    2
      kate/app/katemdi.h
  35. 1
    1
      kate/app/katesavemodifieddialog.cpp
  36. 1
    1
      kate/app/kateviewmanager.cpp
  37. 2
    2
      kate/app/kateviewspacecontainer.cpp
  38. 9
    9
      kate/app/kwritemain.cpp
  39. 3
    3
      kate/app/kwritemain.h
  40. 1
    1
      kate/data/kateui.rc
  41. 1
    1
      kate/data/kwriteui.rc
  42. 1
    1
      kate/interfaces/Makefile.am
  43. 1
    1
      kate/interfaces/plugin.cpp
  44. 1
    1
      kate/interfaces/plugin.h
  45. 1
    1
      kcheckpass/README
  46. 1
    1
      kcheckpass/kcheckpass.c
  47. 1
    1
      kcheckpass/kcheckpass.h
  48. 2
    2
      kcminit/CMakeLists.txt
  49. 1
    1
      kcontrol/arts/CMakeLists.txt
  50. 1
    1
      kcontrol/arts/Makefile.am
  51. 2
    2
      kcontrol/arts/arts.cpp
  52. 2
    2
      kcontrol/background/bgrender.cpp
  53. 2
    2
      kcontrol/componentchooser/componentservices/Makefile.am
  54. 1
    1
      kcontrol/display/CMakeLists.txt
  55. 1
    1
      kcontrol/display/display.desktop
  56. 1
    1
      kcontrol/displayconfig/CMakeLists.txt
  57. 1
    1
      kcontrol/displayconfig/Makefile.am
  58. 1
    1
      kcontrol/displayconfig/displayconfig.h
  59. 4
    4
      kcontrol/dnssd/CMakeLists.txt
  60. 6
    6
      kcontrol/dnssd/Makefile.am
  61. 2
    2
      kcontrol/dnssd/kcm_tdednssd.desktop
  62. 4
    4
      kcontrol/dnssd/kcmdnssd.cpp
  63. 1
    1
      kcontrol/filetypes/Makefile.am
  64. 1
    1
      kcontrol/filetypes/filetypedetails.cpp
  65. 2
    2
      kcontrol/filetypes/filetypesview.cpp
  66. 1
    1
      kcontrol/filetypes/keditfiletype.cpp
  67. 1
    1
      kcontrol/filetypes/typeslistitem.h
  68. 1
    1
      kcontrol/iccconfig/CMakeLists.txt
  69. 1
    1
      kcontrol/iccconfig/Makefile.am
  70. 1
    1
      kcontrol/iccconfig/iccconfig.h
  71. 1
    1
      kcontrol/kcontrol/CMakeLists.txt
  72. 1
    1
      kcontrol/kcontrol/aboutwidget.cpp
  73. 1
    1
      kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
  74. 1
    1
      kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
  75. 2
    2
      kcontrol/kfontinst/viewpart/CMakeLists.txt
  76. 1
    1
      kcontrol/kfontinst/viewpart/FontViewPart.h
  77. 2
    2
      kcontrol/kfontinst/viewpart/FontViewerApp.h
  78. 1
    1
      kcontrol/kfontinst/viewpart/Makefile.am
  79. 1
    1
      kcontrol/kicker/CMakeLists.txt
  80. 1
    1
      kcontrol/kio/CMakeLists.txt
  81. 1
    1
      kcontrol/knotify/knotify.cpp
  82. 1
    1
      kcontrol/konq/CMakeLists.txt
  83. 4
    4
      kcontrol/konqhtml/CMakeLists.txt
  84. 3
    3
      kcontrol/konqhtml/Makefile.am
  85. 8
    8
      kcontrol/konqhtml/appearance.cpp
  86. 5
    5
      kcontrol/konqhtml/htmlopts.cpp
  87. 1
    1
      kcontrol/konqhtml/javaopts.cpp
  88. 1
    1
      kcontrol/konqhtml/jspolicies.h
  89. 6
    6
      kcontrol/konqhtml/main.cpp
  90. 3
    3
      kcontrol/konqhtml/tdehtml_behavior.desktop
  91. 3
    3
      kcontrol/konqhtml/tdehtml_filter.desktop
  92. 3
    3
      kcontrol/konqhtml/tdehtml_fonts.desktop
  93. 3
    3
      kcontrol/konqhtml/tdehtml_java_js.desktop
  94. 1
    1
      kcontrol/kthememanager/kthememanager.cpp
  95. 0
    0
      kcontrol/pics/cr128-app-tdescreensaver.png
  96. 0
    0
      kcontrol/pics/cr16-app-tdescreensaver.png
  97. 0
    0
      kcontrol/pics/cr22-app-tdescreensaver.png
  98. 0
    0
      kcontrol/pics/cr32-app-tdescreensaver.png
  99. 0
    0
      kcontrol/pics/cr48-app-tdescreensaver.png
  100. 0
    0
      kcontrol/pics/cr64-app-tdescreensaver.png

+ 2
- 2
CMakeLists.txt View File

@@ -171,7 +171,7 @@ option( BUILD_KAPPFINDER "Build kappfinder" ${BUILD_ALL} )
171 171
 option( BUILD_KCHECKPASS "Build kcheckpass" ${BUILD_ALL} )
172 172
 option( BUILD_KHELPCENTER "Build khelpcenter" ${BUILD_ALL} )
173 173
 option( BUILD_KHOTKEYS "Build khotkeys" ${BUILD_ALL} )
174
-option( BUILD_KSCREENSAVER "Build kscreensaver" ${BUILD_ALL} )
174
+option( BUILD_KSCREENSAVER "Build tdescreensaver" ${BUILD_ALL} )
175 175
 option( BUILD_KSTART "Build kstart" ${BUILD_ALL} )
176 176
 option( BUILD_KSYSTRAYCMD "Build ksystraycmd" ${BUILD_ALL} )
177 177
 option( BUILD_NSPLUGINS "Build nsplugins"  ${BUILD_ALL} )
@@ -248,7 +248,7 @@ tde_conditional_add_subdirectory( BUILD_KAPPFINDER kappfinder )
248 248
 tde_conditional_add_subdirectory( BUILD_KCHECKPASS kcheckpass )
249 249
 tde_conditional_add_subdirectory( BUILD_KHELPCENTER khelpcenter )
250 250
 tde_conditional_add_subdirectory( BUILD_KHOTKEYS khotkeys )
251
-tde_conditional_add_subdirectory( BUILD_KSCREENSAVER kscreensaver )
251
+tde_conditional_add_subdirectory( BUILD_KSCREENSAVER tdescreensaver )
252 252
 tde_conditional_add_subdirectory( BUILD_KSTART kstart )
253 253
 tde_conditional_add_subdirectory( BUILD_KSYSTRAYCMD ksystraycmd )
254 254
 tde_conditional_add_subdirectory( BUILD_NSPLUGINS nsplugins )

+ 1
- 1
Makefile.am.in View File

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

+ 1
- 1
README View File

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

+ 5
- 5
README.pam View File

@@ -1,6 +1,6 @@
1 1
 KDE can be configured to support the PAM ("Pluggable Authentication 
2 2
 Modules") system for password checking by the display manager tdm and 
3
-by the screen saver kscreensaver (for unlocking the display).
3
+by the screen saver tdescreensaver (for unlocking the display).
4 4
 
5 5
 PAM is a flexible application-transparent configurable user-authentication 
6 6
 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
27 27
 If PAM is found, KDE usually uses the PAM service "kde". You may
28 28
 override it for all KDE programs by using --with-pam=<service> and/or
29 29
 individually by using --with-<prog>-pam=<service>, where <prog> is
30
-one of tdm, kcp and kss (for tdm, kcheckpass and kscreensaver).
30
+one of tdm, kcp and kss (for tdm, kcheckpass and tdescreensaver).
31 31
 
32 32
 "make install" will attempt to create suitable service definitions; either
33 33
 by putting files into /etc/pam.d/ or by adding text to /etc/pam.conf. The
34 34
 services are just copies of the "login" service. 
35 35
 You may want to edit these definitions to meet your needs.
36 36
 There are also two example service definitions in this directory -
37
-kde.pamd and kscreensaver.pamd - but don't just copy them!
37
+kde.pamd and tdescreensaver.pamd - but don't just copy them!
38 38
 If the services are misconfigured, you will NOT be able to login via TDM
39 39
 and/or unlock a locked screen!
40 40
 
41 41
 If there is ever any doubt about which PAM service a program was
42 42
 compiled with, it can be determined by examining the PAM-generated 
43
-entries in the system log associated with tdm logins or kscreensaver
43
+entries in the system log associated with tdm logins or tdescreensaver
44 44
 authentication failures.
45 45
 
46 46
 
47 47
 PAM configuration files have four types of entries for each service:
48 48
 
49
-type		used by tdm		used by kscreensaver
49
+type		used by tdm		used by tdescreensaver
50 50
 ----		-----------		--------------------
51 51
 auth		    x				x
52 52
 account		    x				

+ 2
- 2
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 khtml_fonts
80
+Exec=kcmshell tdehtml_fonts
81 81
 X-TDE-ModuleType=Library
82 82
 X-TDE-Library=konqhtml
83
-X-TDE-FactoryName=khtml_fonts
83
+X-TDE-FactoryName=tdehtml_fonts

+ 1
- 1
applnk/tde-system-screensavers.directory View File

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

+ 1
- 1
config.h.cmake View File

@@ -88,7 +88,7 @@
88 88
 // kcontrol/energy
89 89
 #cmakedefine HAVE_DPMS 1
90 90
 
91
-// kdesktop, kcontrol/screensaver, kscreensaver
91
+// kdesktop, kcontrol/screensaver, tdescreensaver
92 92
 #cmakedefine HAVE_GLXCHOOSEVISUAL 1
93 93
 
94 94
 // kcontrol/crypto

+ 1
- 1
configure.in.in View File

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

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

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

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

@@ -33,7 +33,7 @@ Slave</glossseealso>
33 33
 				<glossseealso otherterm="gloss-kde">&tde;</glossseealso>
34 34
 			</glossdef>
35 35
 		</glossentry>
36
-		<glossentry id="gloss-kparts">
36
+		<glossentry id="gloss-tdeparts">
37 37
 			<glossterm>KParts</glossterm>
38 38
 			<glossdef><para>KParts is an embedding technology which allows &tde;
39 39
 				applications to embed other &tde; applications. For example, the text
@@ -41,7 +41,7 @@ Slave</glossseealso>
41 41
 				<glossseealso otherterm="gloss-konqueror">&konqueror;</glossseealso>
42 42
 			</glossdef>
43 43
 		</glossentry>
44
-		<glossentry id="gloss-ksycoca">
44
+		<glossentry id="gloss-tdesycoca">
45 45
 			<glossterm><acronym>KSycoca</acronym></glossterm>
46 46
 			<glossdef><para><acronym>KSycoca</acronym> (&tde; <emphasis>Sy</emphasis>stem
47 47
 				<emphasis>Co</emphasis>nfiguration <emphasis>Ca</emphasis>che) is a
@@ -88,7 +88,7 @@ program and regenerates the
88 88
 or all modules in
89 89
 				&kcontrol; are missing.</para>
90 90
 				<glossseealso 
91
-otherterm="gloss-ksycoca"><acronym>KSycoca</acronym></glossseealso>
91
+otherterm="gloss-tdesycoca"><acronym>KSycoca</acronym></glossseealso>
92 92
 				<glossseealso otherterm="gloss-kcontrol">&kcontrol;</glossseealso>
93 93
 			</glossdef>
94 94
 		</glossentry>

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

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

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

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

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

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

+ 0
- 2
doc/kcontrol/khtml/Makefile.am View File

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

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

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

doc/kcontrol/khtml/CMakeLists.txt → doc/kcontrol/tdehtml/CMakeLists.txt View File

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

+ 2
- 0
doc/kcontrol/tdehtml/Makefile.am View File

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

doc/kcontrol/khtml/index.docbook → doc/kcontrol/tdehtml/index.docbook View File

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

doc/kcontrol/khtml/nsplugin.docbook → doc/kcontrol/tdehtml/nsplugin.docbook View File


+ 1
- 1
doc/konqueror/config.docbook View File

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

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

@@ -242,7 +242,7 @@ class="username">groupware</systemitem> user (already previously
242 242
 done!)</para></step>
243 243
 
244 244
 <step><para>Create/configure an <acronym>IMAP</acronym> account in &kmail;
245
-for login as that user</para></step> <step><para>Use kresources to make
245
+for login as that user</para></step> <step><para>Use tderesources to make
246 246
 &kontact; components work with data taken from <acronym>IMAP</acronym>
247 247
 source</para></step>
248 248
 
@@ -336,7 +336,7 @@ slow data updates.</para>
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 338
 <guimenuitem>Run command</guimenuitem>, run <userinput><command>kcmshell
339
-kresources</command></userinput>. In the combo box select
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
342 342
 press <guibutton>Use as Standard</guibutton> button. Do the same for

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

@@ -858,7 +858,7 @@ also unique per X-server display. The processes are:</para>
858 858
 <varlistentry>
859 859
 <term><command>kded</command></term>
860 860
 <listitem><para>Generic service daemon.</para>
861
-<para>Triggers <link linkend="ksycoca">Sycoca</link> database updates when
861
+<para>Triggers <link linkend="tdesycoca">Sycoca</link> database updates when
862 862
 needed</para>
863 863
 </listitem>
864 864
 </varlistentry>
@@ -1819,14 +1819,14 @@ class="directory">$<envar>HOME</envar>/.trinity/share/applnk</filename>
1819 1819
 (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>
1820 1820
 </sect2>
1821 1821
 
1822
-<sect2 id="ksycoca">
1822
+<sect2 id="tdesycoca">
1823 1823
 <title><application>KSycoca</application></title>
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 1827
 <userinput><command>kbuildsycoca</command></userinput>. The database
1828 1828
 which is built lives in <filename
1829
-class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/ksycoca</filename>.
1829
+class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/tdesycoca</filename>.
1830 1830
 It is automatically updated by <application>KDED</application>,
1831 1831
 checked during &tde; login, and <application>KDED</application>
1832 1832
 watches for changes while logged in.</para>
@@ -1839,7 +1839,7 @@ CheckSycoca=false
1839 1839
 </programlisting>
1840 1840
 </para>
1841 1841
 
1842
-<para>To force regeneration, run <userinput><command>touch $<envar>TDEDIR</envar>/share/services/update_ksycoca</command></userinput>.</para>
1842
+<para>To force regeneration, run <userinput><command>touch $<envar>TDEDIR</envar>/share/services/update_tdesycoca</command></userinput>.</para>
1843 1843
 
1844 1844
 </sect2>
1845 1845
 
@@ -2031,7 +2031,7 @@ shell_access=false</screen>
2031 2031
 <para>Since this affects the &tde; menu and the available applications, we
2032 2032
 must force an update of the sycoca database:</para>
2033 2033
 
2034
-<screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_ksycoca</filename></userinput></screen>
2034
+<screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_tdesycoca</filename></userinput></screen>
2035 2035
 
2036 2036
 <para>Now re-login to &tde; and check the following points:</para>
2037 2037
 
@@ -2488,7 +2488,7 @@ KDebug
2488 2488
 MainApplication-Interface
2489 2489
 konsole (default)
2490 2490
 konsole-mainwindow#1
2491
-ksycoca
2491
+tdesycoca
2492 2492
 session-1
2493 2493
 session-2
2494 2494
 session-3

+ 1
- 1
doc/userguide/tde-office.docbook View File

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

+ 1
- 1
drkonqi/Makefile.am View File

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

+ 2
- 2
kappfinder/Makefile.am View File

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

+ 1
- 1
kate/AUTHORS View File

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

+ 5
- 5
kate/ChangeLog View File

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

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

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

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

@@ -27,7 +27,7 @@
27 27
 #include "../interfaces/pluginconfiginterfaceextension.h"
28 28
 
29 29
 #include <kate/document.h>
30
-#include <ktexteditor/configinterfaceextension.h>
30
+#include <tdetexteditor/configinterfaceextension.h>
31 31
 
32 32
 #include <kdialogbase.h>
33 33
 

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

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include <kde_terminal_interface.h>
33 33
 
34
-#include <kparts/part.h>
34
+#include <tdeparts/part.h>
35 35
 
36 36
 #include <kurl.h>
37 37
 #include <klibloader.h>

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

@@ -28,9 +28,9 @@
28 28
 
29 29
 #include <kate/view.h>
30 30
 
31
-#include <ktexteditor/encodinginterface.h>
31
+#include <tdetexteditor/encodinginterface.h>
32 32
 
33
-#include <kparts/factory.h>
33
+#include <tdeparts/factory.h>
34 34
 
35 35
 #include <klocale.h>
36 36
 #include <kdebug.h>

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

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

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

@@ -27,7 +27,7 @@
27 27
 #include <kate/view.h>
28 28
 #include <kate/document.h>
29 29
 
30
-#include <kparts/part.h>
30
+#include <tdeparts/part.h>
31 31
 
32 32
 #include <kaction.h>
33 33
 

+ 2
- 2
kate/app/katemdi.h View File

@@ -21,9 +21,9 @@
21 21
 #ifndef __KATE_MDI_H__
22 22
 #define __KATE_MDI_H__
23 23
 
24
-#include <kparts/mainwindow.h>
24
+#include <tdeparts/mainwindow.h>
25 25
 
26
-#include <kmultitabbar.h>
26
+#include <tdemultitabbar.h>
27 27
 #include <kxmlguiclient.h>
28 28
 #include <kaction.h>
29 29
 

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

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

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

@@ -45,7 +45,7 @@
45 45
 #include <kglobalsettings.h>
46 46
 #include <kstdaccel.h>
47 47
 
48
-#include <ktexteditor/encodinginterface.h>
48
+#include <tdetexteditor/encodinginterface.h>
49 49
 
50 50
 #include <tqobjectlist.h>
51 51
 #include <tqstringlist.h>

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

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

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

@@ -24,13 +24,13 @@
24 24
 #include <kate/document.h>
25 25
 #include <kate/view.h>
26 26
 
27
-#include <ktexteditor/configinterface.h>
28
-#include <ktexteditor/sessionconfiginterface.h>
29
-#include <ktexteditor/viewcursorinterface.h>
30
-#include <ktexteditor/printinterface.h>
31
-#include <ktexteditor/encodinginterface.h>
32
-#include <ktexteditor/editorchooser.h>
33
-#include <ktexteditor/popupmenuinterface.h>
27
+#include <tdetexteditor/configinterface.h>
28
+#include <tdetexteditor/sessionconfiginterface.h>
29
+#include <tdetexteditor/viewcursorinterface.h>
30
+#include <tdetexteditor/printinterface.h>
31
+#include <tdetexteditor/encodinginterface.h>
32
+#include <tdetexteditor/editorchooser.h>
33
+#include <tdetexteditor/popupmenuinterface.h>
34 34
 
35 35
 #include <kio/netaccess.h>
36 36
 
@@ -54,7 +54,7 @@
54 54
 #include <kmessagebox.h>
55 55
 #include <kkeydialog.h>
56 56
 #include <kedittoolbar.h>
57
-#include <kparts/event.h>
57
+#include <tdeparts/event.h>
58 58
 #include <kmenubar.h>
59 59
 
60 60
 #include <tqdropsite.h>
@@ -108,7 +108,7 @@ KWrite::KWrite (KTextEditor::Document *doc)
108 108
 
109 109
   // install a working kate part popup dialog thingy
110 110
   if (static_cast<Kate::View*>(m_view->tqt_cast("Kate::View")))
111
-    static_cast<Kate::View*>(m_view->tqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) );
111
+    static_cast<Kate::View*>(m_view->tqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("tdetexteditor_popup", this)) );
112 112
 
113 113
   // init with more usefull size, stolen from konq :)
114 114
   if (!initialGeometrySet())

+ 3
- 3
kate/app/kwritemain.h View File

@@ -21,10 +21,10 @@
21 21
 #ifndef __KWRITE_MAIN_H__
22 22
 #define __KWRITE_MAIN_H__
23 23
 
24
-#include <ktexteditor/view.h>
25
-#include <ktexteditor/document.h>
24
+#include <tdetexteditor/view.h>
25
+#include <tdetexteditor/document.h>
26 26
 
27
-#include <kparts/mainwindow.h>
27
+#include <tdeparts/mainwindow.h>
28 28
 
29 29
 #include <kdialogbase.h>
30 30
 

+ 1
- 1
kate/data/kateui.rc View File

@@ -135,7 +135,7 @@
135 135
   <DefineGroup name="zoom_operations" />
136 136
 </ToolBar>
137 137
 
138
-<Menu name="ktexteditor_popup" noMerge="1">
138
+<Menu name="tdetexteditor_popup" noMerge="1">
139 139
   <DefineGroup name="popup_operations" />
140 140
 </Menu>
141 141
 

+ 1
- 1
kate/data/kwriteui.rc View File

@@ -88,7 +88,7 @@
88 88
   <DefineGroup name="zoom_operations" />
89 89
 </ToolBar>
90 90
 
91
-<Menu name="ktexteditor_popup" noMerge="1">
91
+<Menu name="tdetexteditor_popup" noMerge="1">
92 92
   <DefineGroup name="popup_operations" />
93 93
 </Menu>
94 94
 

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

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

+ 1
- 1
kate/interfaces/plugin.cpp View File

@@ -21,7 +21,7 @@
21 21
 #include "plugin.h"
22 22
 #include "plugin.moc"
23 23
 
24
-#include <kparts/componentfactory.h>
24
+#include <tdeparts/componentfactory.h>
25 25
 
26 26
 namespace Kate
27 27
 {

+ 1
- 1
kate/interfaces/plugin.h View File

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

+ 1
- 1
kcheckpass/README View File

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

+ 1
- 1
kcheckpass/kcheckpass.c View File

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

+ 1
- 1
kcheckpass/kcheckpass.h View File

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

+ 2
- 2
kcminit/CMakeLists.txt View File

@@ -25,7 +25,7 @@ link_directories(
25 25
 
26 26
 tde_add_tdeinit_executable( kcminit AUTOMOC
27 27
   SOURCES main.cpp main.skel
28
-  LINK kutils-shared
28
+  LINK tdeutils-shared
29 29
 )
30 30
 
31 31
 
@@ -33,5 +33,5 @@ tde_add_tdeinit_executable( kcminit AUTOMOC
33 33
 
34 34
 tde_add_tdeinit_executable( kcminit_startup AUTOMOC
35 35
   SOURCES main.cpp main.skel
36
-  LINK kutils-shared
36
+  LINK tdeutils-shared
37 37
 )

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

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

+ 1
- 1
kcontrol/arts/Makefile.am View File

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

+ 2
- 2
kcontrol/arts/arts.cpp View File

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

+ 2
- 2
kcontrol/background/bgrender.cpp View File

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

+ 2
- 2
kcontrol/componentchooser/componentservices/Makefile.am View File

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

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

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

+ 1
- 1
kcontrol/display/display.desktop View File

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

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

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

+ 1
- 1
kcontrol/displayconfig/Makefile.am View File

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

+ 1
- 1
kcontrol/displayconfig/displayconfig.h View File

@@ -34,7 +34,7 @@
34 34
 
35 35
 #include <dcopobject.h>
36 36
 
37
-#include <libkrandr/libkrandr.h>
37
+#include <libtderandr/libtderandr.h>
38 38
 #include <tdehardwaredevices.h>
39 39
 
40 40
 #include "monitorworkspace.h"

+ 4
- 4
kcontrol/dnssd/CMakeLists.txt View File

@@ -22,15 +22,15 @@ link_directories(
22 22
 
23 23
 ##### other data ################################
24 24
 
25
-install( FILES kcm_kdnssd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
25
+install( FILES kcm_tdednssd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
26 26
 
27 27
 
28
-##### kcm_kdnssd (module) #######################
28
+##### kcm_tdednssd (module) #######################
29 29
 
30 30
 set_source_files_properties( kcmdnssd.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
31 31
 
32
-tde_add_kpart( kcm_kdnssd AUTOMOC
32
+tde_add_kpart( kcm_tdednssd AUTOMOC
33 33
   SOURCES configdialog.ui kcmdnssd.cpp
34
-  LINK kdnssd-shared tdeui-shared
34
+  LINK tdednssd-shared tdeui-shared
35 35
   DESTINATION ${PLUGIN_INSTALL_DIR}
36 36
 )

+ 6
- 6
kcontrol/dnssd/Makefile.am View File

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

kcontrol/dnssd/kcm_kdnssd.desktop → kcontrol/dnssd/kcm_tdednssd.desktop View File

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

+ 4
- 4
kcontrol/dnssd/kcmdnssd.cpp View File

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

+ 1
- 1
kcontrol/filetypes/Makefile.am View File

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

+ 1
- 1
kcontrol/filetypes/filetypedetails.cpp View File

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

+ 2
- 2
kcontrol/filetypes/filetypesview.cpp View File

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

+ 1
- 1
kcontrol/filetypes/keditfiletype.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <kaboutdata.h>
27 27
 #include <kdebug.h>
28 28
 #include <kcmdlineargs.h>
29
-#include <ksycoca.h>
29
+#include <tdesycoca.h>
30 30
 #include <kstandarddirs.h>
31 31
 
32 32
 #ifdef Q_WS_X11

+ 1
- 1
kcontrol/filetypes/typeslistitem.h View File

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

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

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

+ 1
- 1
kcontrol/iccconfig/Makefile.am View File

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

+ 1
- 1
kcontrol/iccconfig/iccconfig.h View File

@@ -27,7 +27,7 @@
27 27
 
28 28
 #include <dcopobject.h>
29 29
 
30
-#include <libkrandr/libkrandr.h>
30
+#include <libtderandr/libtderandr.h>
31 31
 
32 32
 #include "iccconfigbase.h"
33 33
 

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

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

+ 1
- 1
kcontrol/kcontrol/aboutwidget.cpp View File

@@ -30,7 +30,7 @@
30 30
 #include <kpixmapeffect.h>
31 31
 #include <kcursor.h>
32 32
 #include <kglobalsettings.h>
33
-#include <khtml_part.h>
33
+#include <tdehtml_part.h>
34 34
 #include <kapplication.h>
35 35
 #include <kiconloader.h>
36 36
 

+ 1
- 1
kcontrol/kfontinst/kcmfontinst/KCmFontInst.h View File

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

+ 1
- 1
kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp View File

@@ -475,7 +475,7 @@ TQDragObject *CKFileFontView::dragObject()
475 475
         urls.append( (*it)->url() );
476 476
 
477 477
     if(urls.count()> 1)
478
-        pixmap = DesktopIcon("kmultiple", KIcon::SizeSmall);
478
+        pixmap = DesktopIcon("tdemultiple", KIcon::SizeSmall);
479 479
     if(pixmap.isNull())
480 480
         pixmap = currentFileItem()->pixmap(KIcon::SizeSmall);
481 481
 

+ 2
- 2
kcontrol/kfontinst/viewpart/CMakeLists.txt View File

@@ -33,7 +33,7 @@ install( FILES kfontviewpart.rc kfontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/k
33 33
 
34 34
 tde_add_kpart( libkfontviewpart AUTOMOC
35 35
   SOURCES FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
36
-  LINK kfontinstprint-static kfontinst-shared kparts-shared
36
+  LINK kfontinstprint-static kfontinst-shared tdeparts-shared
37 37
   DESTINATION ${PLUGIN_INSTALL_DIR}
38 38
 )
39 39
 
@@ -42,7 +42,7 @@ tde_add_kpart( libkfontviewpart AUTOMOC
42 42
 
43 43
 tde_add_executable( kfontview AUTOMOC
44 44
   SOURCES FontViewerApp.cpp
45
-  LINK kparts-shared
45
+  LINK tdeparts-shared
46 46
   DESTINATION ${BIN_INSTALL_DIR}
47 47
 )
48 48
 

+ 1
- 1
kcontrol/kfontinst/viewpart/FontViewPart.h View File

@@ -29,7 +29,7 @@
29 29
 // (C) Craig Drummond, 2002, 2003, 2004
30 30
 ////////////////////////////////////////////////////////////////////////////////
31 31
 
32
-#include <kparts/part.h>
32
+#include <tdeparts/part.h>
33 33
 
34 34
 class TQPushButton;
35 35
 class TQFrame;

+ 2
- 2
kcontrol/kfontinst/viewpart/FontViewerApp.h View File

@@ -30,8 +30,8 @@
30 30
 ////////////////////////////////////////////////////////////////////////////////
31 31
 
32 32
 #include <kapplication.h>
33
-#include <kparts/part.h>
34
-#include <kparts/mainwindow.h>
33
+#include <tdeparts/part.h>
34
+#include <tdeparts/mainwindow.h>
35 35
 
36 36
 namespace KFI
37 37
 {

+ 1
- 1
kcontrol/kfontinst/viewpart/Makefile.am View File

@@ -17,7 +17,7 @@ AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFR
17 17
 METASOURCES = AUTO
18 18
 
19 19
 kfontview_LDADD = $(LIB_KPARTS)
20
-kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
20
+kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
21 21
 
22 22
 bin_PROGRAMS = kfontview
23 23
 xdg_apps_DATA = kfontview.desktop

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

@@ -77,6 +77,6 @@ set( ${target}_SRCS
77 77
 
78 78
 tde_add_kpart( ${target} AUTOMOC
79 79
   SOURCES ${${target}_SRCS}
80
-  LINK bgnd-static kickermain-shared kutils-shared
80
+  LINK bgnd-static kickermain-shared tdeutils-shared
81 81
   DESTINATION ${PLUGIN_INSTALL_DIR}
82 82
 )

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

@@ -50,6 +50,6 @@ tde_add_kpart( kcm_kio AUTOMOC
50 50
       kproxydlg_ui.ui kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui
51 51
       policydlg_ui.ui useragentdlg_ui.ui uagentproviderdlg_ui.ui
52 52
       manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui
53
-  LINK kio-shared kutils-shared
53
+  LINK kio-shared tdeutils-shared
54 54
   DESTINATION ${PLUGIN_INSTALL_DIR}
55 55
 )

+ 1
- 1
kcontrol/knotify/knotify.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <kcombobox.h>
32 32
 #include <kconfig.h>
33 33
 #include <knotifydialog.h>
34
-#include <kparts/genericfactory.h>
34
+#include <tdeparts/genericfactory.h>
35 35
 #include <kstandarddirs.h>
36 36
 #include <kurlcompletion.h>
37 37
 #include <kurlrequester.h>

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

@@ -45,6 +45,6 @@ tde_add_kpart( kcm_konq AUTOMOC
45 45
     behaviour.cpp desktop.cpp desktopbehavior_impl.cpp
46 46
     previews.cpp browser.cpp main.cpp rootopts.cpp
47 47
     fontopts.cpp  desktopbehavior.ui
48
-  LINK kio-shared kutils-shared
48
+  LINK kio-shared tdeutils-shared
49 49
   DESTINATION ${PLUGIN_INSTALL_DIR}
50 50
 )

+ 4
- 4
kcontrol/konqhtml/CMakeLists.txt View File

@@ -24,8 +24,8 @@ link_directories(
24 24
 ##### other data ################################
25 25
 
26 26
 install( FILES
27
-    khtml_behavior.desktop khtml_java_js.desktop
28
-    khtml_fonts.desktop khtml_filter.desktop
27
+    tdehtml_behavior.desktop tdehtml_java_js.desktop
28
+    tdehtml_fonts.desktop tdehtml_filter.desktop
29 29
   DESTINATION ${XDG_APPS_INSTALL_DIR} )
30 30
 
31 31
 install(
@@ -36,7 +36,7 @@ install(
36 36
 install(
37 37
   FILES uninstall.desktop
38 38
   DESTINATION ${APPS_INSTALL_DIR}/Settings/WebBrowsing
39
-  RENAME khtml_appearance.desktop )
39
+  RENAME tdehtml_appearance.desktop )
40 40
 
41 41
 ##### kcm_konqhtml (module) #####################
42 42
 
@@ -48,6 +48,6 @@ tde_add_kpart( kcm_konqhtml AUTOMOC
48 48
     jspolicies.cpp nsconfigwidget.ui policies.cpp
49 49
     domainlistview.cpp advancedTabOptions.ui
50 50
     filteropts.cpp
51
-  LINK khtml-shared
51
+  LINK tdehtml-shared
52 52
   DESTINATION ${PLUGIN_INSTALL_DIR}
53 53
 )

+ 3
- 3
kcontrol/konqhtml/Makefile.am View File

@@ -13,9 +13,9 @@ kcm_konqhtml_la_SOURCES = advancedTabDialog.cpp htmlopts.cpp jsopts.cpp \
13 13
 			     filteropts.cpp
14 14
 
15 15
 kcm_konqhtml_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
16
-kcm_konqhtml_la_LIBADD = -lkhtml -ltdeui
16
+kcm_konqhtml_la_LIBADD = -ltdehtml -ltdeui
17 17
 
18
-xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop
18
+xdg_apps_DATA = tdehtml_behavior.desktop tdehtml_java_js.desktop tdehtml_fonts.desktop tdehtml_filter.desktop
19 19
 
20 20
 messages: rc.cpp
21 21
 	$(XGETTEXT) *.cpp -o $(podir)/kcmkonqhtml.pot
@@ -23,4 +23,4 @@ messages: rc.cpp
23 23
 install-data-local: uninstall.desktop
24 24
 	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing
25 25
 	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/nsplugin.desktop
26
-	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/khtml_appearance.desktop
26
+	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/tdehtml_appearance.desktop

+ 8
- 8
kcontrol/konqhtml/appearance.cpp View File

@@ -14,7 +14,7 @@
14 14
 #include <kdialog.h>
15 15
 #include <kfontcombo.h>
16 16
 #include <kglobal.h>
17
-#include <khtmldefaults.h>
17
+#include <tdehtmldefaults.h>
18 18
 #include <klocale.h>
19 19
 #include <knuminput.h>
20 20
 
@@ -320,15 +320,15 @@ void KAppearanceOptions::load()
320 320
 
321 321
 void KAppearanceOptions::load( bool useDefaults )
322 322
 {
323
-    TDEConfig khtmlrc("khtmlrc", true, false);
323
+    TDEConfig tdehtmlrc("tdehtmlrc", true, false);
324 324
 	 m_pConfig->setReadDefaults( useDefaults );
325 325
 
326
-	 khtmlrc.setReadDefaults( useDefaults );
326
+	 tdehtmlrc.setReadDefaults( useDefaults );
327 327
 
328
-#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x)
329
-#define READ_NUM(x,y) m_pConfig->readNumEntry(x, khtmlrc.readNumEntry(x, y))
330
-#define READ_ENTRY(x,y) m_pConfig->readEntry(x, khtmlrc.readEntry(x, y))
331
-#define READ_LIST(x) m_pConfig->readListEntry(x, khtmlrc.readListEntry(x))
328
+#define SET_GROUP(x) m_pConfig->setGroup(x); tdehtmlrc.setGroup(x)
329
+#define READ_NUM(x,y) m_pConfig->readNumEntry(x, tdehtmlrc.readNumEntry(x, y))
330
+#define READ_ENTRY(x,y) m_pConfig->readEntry(x, tdehtmlrc.readEntry(x, y))
331
+#define READ_LIST(x) m_pConfig->readListEntry(x, tdehtmlrc.readListEntry(x))
332 332
 
333 333
     SET_GROUP(m_groupname);
334 334
     fSize = READ_NUM( "MediumFontSize", 12 );
@@ -348,7 +348,7 @@ void KAppearanceOptions::load( bool useDefaults )
348 348
     if (m_pConfig->hasKey("Fonts"))
349 349
        fonts = m_pConfig->readListEntry( "Fonts" );
350 350
     else
351
-       fonts = khtmlrc.readListEntry( "Fonts" );
351
+       fonts = tdehtmlrc.readListEntry( "Fonts" );
352 352
     while (fonts.count() < 7)
353 353
        fonts.append(TQString::null);
354 354
 

+ 5
- 5
kcontrol/konqhtml/htmlopts.cpp View File

@@ -230,13 +230,13 @@ void KMiscHTMLOptions::load()
230 230
 
231 231
 void KMiscHTMLOptions::load( bool useDefaults )
232 232
 {
233
-    TDEConfig khtmlrc("khtmlrc", true, false);
234
-    khtmlrc.setReadDefaults( useDefaults );
233
+    TDEConfig tdehtmlrc("tdehtmlrc", true, false);
234
+    tdehtmlrc.setReadDefaults( useDefaults );
235 235
 	 m_pConfig->setReadDefaults( useDefaults );
236 236
 
237
-#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x)
238
-#define READ_BOOL(x,y) m_pConfig->readBoolEntry(x, khtmlrc.readBoolEntry(x, y))
239
-#define READ_ENTRY(x) m_pConfig->readEntry(x, khtmlrc.readEntry(x))
237
+#define SET_GROUP(x) m_pConfig->setGroup(x); tdehtmlrc.setGroup(x)
238
+#define READ_BOOL(x,y) m_pConfig->readBoolEntry(x, tdehtmlrc.readBoolEntry(x, y))
239
+#define READ_ENTRY(x) m_pConfig->readEntry(x, tdehtmlrc.readEntry(x))
240 240
 
241 241
 
242 242
     // *** load ***

+ 1
- 1
kcontrol/konqhtml/javaopts.cpp View File

@@ -17,7 +17,7 @@
17 17
 #include <kdebug.h>
18 18
 #include <klineedit.h>
19 19
 #include <klocale.h>
20
-#include <khtml_settings.h>
20
+#include <tdehtml_settings.h>
21 21
 #include <knuminput.h>
22 22
 
23 23
 #include <tqlayout.h>

+ 1
- 1
kcontrol/konqhtml/jspolicies.h View File

@@ -25,7 +25,7 @@
25 25
 #include <tqgroupbox.h>
26 26
 #include <tqstring.h>
27 27
 
28
-#include <khtml_settings.h>
28
+#include <tdehtml_settings.h>
29 29
 
30 30
 #include "policies.h"
31 31
 

+ 6
- 6
kcontrol/konqhtml/main.cpp View File

@@ -43,33 +43,33 @@
43 43
 
44 44
 extern "C"
45 45
 {
46
-	KDE_EXPORT TDECModule *create_khtml_behavior(TQWidget *parent, const char *name)
46
+	KDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name)
47 47
 	{
48 48
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
49 49
 		return new KMiscHTMLOptions(c, "HTML Settings", parent, name);
50 50
 	}
51 51
 
52
-	KDE_EXPORT TDECModule *create_khtml_fonts(TQWidget *parent, const char *name)
52
+	KDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name)
53 53
 	{
54 54
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
55 55
 		return new KAppearanceOptions(c, "HTML Settings", parent, name);
56 56
 	}
57 57
 
58
-	KDE_EXPORT TDECModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/)
58
+	KDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/)
59 59
 	{
60 60
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
61 61
 		return new KJSParts(c, parent, "kcmkonqhtml");
62 62
 	}
63 63
 
64
-	KDE_EXPORT TDECModule *create_khtml_plugins(TQWidget *parent, const char *name)
64
+	KDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name)
65 65
 	{
66 66
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
67 67
 		return new KPluginOptions(c, "Java/JavaScript Settings", parent, name);
68 68
 	}
69 69
 
70
-        KDE_EXPORT TDECModule *create_khtml_filter(TQWidget *parent, const char *name )
70
+        KDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name )
71 71
         {
72
-	    TDEConfig *c = new TDEConfig( "khtmlrc", false, false );
72
+	    TDEConfig *c = new TDEConfig( "tdehtmlrc", false, false );
73 73
             return new KCMFilter(c, "Filter Settings", parent, name);
74 74
         }
75 75
 }

kcontrol/konqhtml/khtml_behavior.desktop → kcontrol/konqhtml/tdehtml_behavior.desktop View File

@@ -1,12 +1,12 @@
1 1
 [Desktop Entry]
2 2
 Type=Application
3
-DocPath=kcontrol/khtml/index.html#kbrowse-html
3
+DocPath=kcontrol/tdehtml/index.html#kbrowse-html
4 4
 Icon=konqueror
5
-Exec=kcmshell khtml_behavior
5
+Exec=kcmshell tdehtml_behavior
6 6
 
7 7
 
8 8
 X-TDE-Library=konqhtml
9
-X-TDE-FactoryName=khtml_behavior
9
+X-TDE-FactoryName=tdehtml_behavior
10 10
 
11 11
 Name=Web Behavior
12 12
 Name[af]=Web Gedrag

kcontrol/konqhtml/khtml_filter.desktop → kcontrol/konqhtml/tdehtml_filter.desktop View File

@@ -1,11 +1,11 @@
1 1
 [Desktop Entry]
2 2
 Type=Application
3
-DocPath=kcontrol/khtml/index.html#khtml-adblock
3
+DocPath=kcontrol/tdehtml/index.html#tdehtml-adblock
4 4
 Icon=filter
5
-Exec=kcmshell khtml_filter
5
+Exec=kcmshell tdehtml_filter
6 6
 
7 7
 X-TDE-Library=konqhtml
8
-X-TDE-FactoryName=khtml_filter
8
+X-TDE-FactoryName=tdehtml_filter
9 9
 
10 10
 Name=AdBlocK Filters
11 11
 Name[af]=Advertensie blok filters

kcontrol/konqhtml/khtml_fonts.desktop → kcontrol/konqhtml/tdehtml_fonts.desktop View File

@@ -1,12 +1,12 @@
1 1
 [Desktop Entry]
2 2
 Type=Application
3
-DocPath=kcontrol/khtml/index.html#kbrowse-appearance
3
+DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance
4 4
 Icon=fonts
5
-Exec=kcmshell khtml_fonts
5
+Exec=kcmshell tdehtml_fonts
6 6
 
7 7
 
8 8
 X-TDE-Library=konqhtml
9
-X-TDE-FactoryName=khtml_fonts
9
+X-TDE-FactoryName=tdehtml_fonts
10 10
 
11 11
 Name=Fonts
12 12
 Name[af]=Skriftipes

kcontrol/konqhtml/khtml_java_js.desktop → kcontrol/konqhtml/tdehtml_java_js.desktop View File

@@ -1,12 +1,12 @@
1 1
 [Desktop Entry]
2 2
 Type=Application
3
-DocPath=kcontrol/khtml/index.html#kbrowse-java
3
+DocPath=kcontrol/tdehtml/index.html#kbrowse-java
4 4
 Icon=konqueror
5
-Exec=kcmshell khtml_java_js
5
+Exec=kcmshell tdehtml_java_js
6 6
 
7 7
 
8 8
 X-TDE-Library=konqhtml
9
-X-TDE-FactoryName=khtml_java_js
9
+X-TDE-FactoryName=tdehtml_java_js
10 10
 
11 11
 Name=Java & JavaScript
12 12
 Name[af]=Java & Javaskrip

+ 1
- 1
kcontrol/kthememanager/kthememanager.cpp View File

@@ -398,7 +398,7 @@ void kthememanager::queryLNFModules()
398 398
     dlg->btnStyle->setIconSet( il->loadIconSet( "style", KIcon::Desktop, 32 ) );
399 399
     dlg->btnIcons->setIconSet( il->loadIconSet( "icons", KIcon::Desktop, 32 ) );
400 400
     dlg->btnFonts->setIconSet( il->loadIconSet( "fonts", KIcon::Desktop, 32 ) );
401
-    dlg->btnSaver->setIconSet( il->loadIconSet( "kscreensaver", KIcon::Desktop, 32 ) );
401
+    dlg->btnSaver->setIconSet( il->loadIconSet( "tdescreensaver", KIcon::Desktop, 32 ) );
402 402
 }
403 403
 
404 404
 void kthememanager::updatePreview( const TQString & pixFile )

kcontrol/pics/cr128-app-kscreensaver.png → kcontrol/pics/cr128-app-tdescreensaver.png View File


kcontrol/pics/cr16-app-kscreensaver.png → kcontrol/pics/cr16-app-tdescreensaver.png View File


kcontrol/pics/cr22-app-kscreensaver.png → kcontrol/pics/cr22-app-tdescreensaver.png View File


kcontrol/pics/cr32-app-kscreensaver.png → kcontrol/pics/cr32-app-tdescreensaver.png View File


kcontrol/pics/cr48-app-kscreensaver.png → kcontrol/pics/cr48-app-tdescreensaver.png View File


kcontrol/pics/cr64-app-kscreensaver.png → kcontrol/pics/cr64-app-tdescreensaver.png View File


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

Loading…
Cancel
Save