Browse Source

Additional k => tde renaming and fixes

Slávek Banko 5 years ago
parent
commit
3e88ddfbc3
100 changed files with 267 additions and 267 deletions
  1. 1
    1
      applnk/compat/socks.desktop
  2. 1
    1
      doc/faq/intro.docbook
  3. 2
    2
      doc/glossary/index.docbook
  4. 1
    1
      doc/glossary/tdeprintingglossary.docbook
  5. 2
    2
      doc/kcontrol/tdehtml/index.docbook
  6. 78
    78
      doc/tdeioslave/index.docbook
  7. 1
    1
      doc/tdeioslave/mac.docbook
  8. 2
    2
      doc/userguide/base-tde-applications.docbook
  9. 1
    1
      doc/userguide/extragear-applications.docbook
  10. 3
    3
      doc/userguide/tde-for-admins.docbook
  11. 2
    2
      doc/userguide/tde-office.docbook
  12. 1
    1
      doc/userguide/under-the-hood.docbook
  13. 2
    2
      drkonqi/Makefile.am
  14. 3
    3
      kappfinder/Makefile.am
  15. 3
    3
      kate/ChangeLog
  16. 1
    1
      kate/app/Makefile.am
  17. 1
    1
      kate/interfaces/Makefile.am
  18. 1
    1
      kate/utils/Makefile.am
  19. 2
    2
      kcminit/Makefile.am
  20. 1
    1
      kcontrol/Makefile.am
  21. 1
    1
      kcontrol/access/Makefile.am
  22. 1
    1
      kcontrol/accessibility/Makefile.am
  23. 1
    1
      kcontrol/arts/Makefile.am
  24. 1
    1
      kcontrol/clock/Makefile.am
  25. 1
    1
      kcontrol/colors/Makefile.am
  26. 1
    1
      kcontrol/componentchooser/Makefile.am
  27. 1
    1
      kcontrol/crypto/Makefile.am
  28. 1
    1
      kcontrol/css/Makefile.am
  29. 1
    1
      kcontrol/display/Makefile.am
  30. 1
    1
      kcontrol/displayconfig/Makefile.am
  31. 1
    1
      kcontrol/dnssd/Makefile.am
  32. 1
    1
      kcontrol/ebrowsing/Makefile.am
  33. 2
    2
      kcontrol/ebrowsing/plugins/ikws/Makefile.am
  34. 1
    1
      kcontrol/ebrowsing/plugins/localdomain/Makefile.am
  35. 1
    1
      kcontrol/ebrowsing/plugins/shorturi/Makefile.am
  36. 2
    2
      kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
  37. 1
    1
      kcontrol/energy/Makefile.am
  38. 3
    3
      kcontrol/filetypes/Makefile.am
  39. 1
    1
      kcontrol/iccconfig/Makefile.am
  40. 1
    1
      kcontrol/icons/Makefile.am
  41. 1
    1
      kcontrol/input/Makefile.am
  42. 1
    1
      kcontrol/input/xcursor/themepage.cpp
  43. 1
    1
      kcontrol/ioslaveinfo/Makefile.am
  44. 1
    1
      kcontrol/ioslaveinfo/ioslaveinfo.desktop
  45. 1
    1
      kcontrol/kcontrol/Makefile.am
  46. 1
    1
      kcontrol/kded/Makefile.am
  47. 3
    3
      kcontrol/keys/tdeaccelaction.h
  48. 1
    1
      kcontrol/kicker/Makefile.am
  49. 1
    1
      kcontrol/knotify/Makefile.am
  50. 1
    1
      kcontrol/konq/Makefile.am
  51. 2
    2
      kcontrol/konqhtml/javaopts.cpp
  52. 1
    1
      kcontrol/konsole/Makefile.am
  53. 1
    1
      kcontrol/kthememanager/Makefile.am
  54. 1
    1
      kcontrol/locale/Makefile.am
  55. 1
    1
      kcontrol/nics/Makefile.am
  56. 1
    1
      kcontrol/randr/Makefile.am
  57. 1
    1
      kcontrol/samba/Makefile.am
  58. 1
    1
      kcontrol/screensaver/Makefile.am
  59. 1
    1
      kcontrol/smartcard/Makefile.am
  60. 1
    1
      kcontrol/style/Makefile.am
  61. 1
    1
      kcontrol/tdefontinst/Makefile.am
  62. 3
    3
      kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
  63. 1
    1
      kcontrol/tdefontinst/kcmfontinst/Makefile.am
  64. 1
    1
      kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp
  65. 2
    2
      kcontrol/tdefontinst/lib/FcEngine.cpp
  66. 4
    4
      kcontrol/tdefontinst/lib/KfiConstants.h
  67. 1
    1
      kcontrol/tdefontinst/lib/Makefile.am
  68. 1
    1
      kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
  69. 1
    1
      kcontrol/tdefontinst/tdefile-plugin/Makefile.am
  70. 1
    1
      kcontrol/tdefontinst/tdefontinst/Makefile.am
  71. 41
    41
      kcontrol/tdefontinst/tdeio/KioFonts.cpp
  72. 2
    2
      kcontrol/tdefontinst/tdeio/KioFonts.h
  73. 1
    1
      kcontrol/tdefontinst/tdeio/Makefile.am
  74. 1
    1
      kcontrol/tdefontinst/thumbnail/Makefile.am
  75. 10
    10
      kcontrol/tdefontinst/viewpart/FontViewPart.cpp
  76. 3
    3
      kcontrol/tdefontinst/viewpart/Makefile.am
  77. 1
    1
      kcontrol/tdeio/Makefile.am
  78. 2
    2
      kcontrol/tdeio/lanbrowser.desktop
  79. 1
    1
      kcontrol/tdm/Makefile.am
  80. 1
    1
      kdcop/Makefile.am
  81. 2
    2
      kdebugdialog/tdelistdebugdialog.h
  82. 2
    2
      kdesktop/Makefile.am
  83. 1
    1
      kdesktop/kwebdesktop/Makefile.am
  84. 2
    2
      kdesktop/lock/Makefile.am
  85. 2
    2
      kdialog/Makefile.am
  86. 2
    2
      kdialog/tdelistboxdialog.h
  87. 3
    3
      kfind/Makefile.am
  88. 1
    1
      kfind/kfinddlg.cpp
  89. 1
    1
      kfind/kquery.h
  90. 2
    2
      khelpcenter/DESIGN
  91. 3
    3
      khelpcenter/Makefile.am
  92. 3
    3
      khelpcenter/htmlsearch/Makefile.am
  93. 1
    1
      khotkeys/shared/Makefile.am
  94. 2
    2
      kicker/applets/launcher/Makefile.am
  95. 1
    1
      kicker/applets/lockout/Makefile.am
  96. 1
    1
      kicker/applets/media/Makefile.am
  97. 1
    1
      kicker/applets/run/Makefile.am
  98. 1
    1
      kicker/applets/swallow/Makefile.am
  99. 1
    1
      kicker/applets/systemtray/Makefile.am
  100. 0
    0
      kicker/applets/trash/Makefile.am

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

@@ -19,5 +19,5 @@ Type=Application
19 19
 Icon=proxy
20 20
 Exec=tdecmshell proxy
21 21
 X-TDE-ModuleType=Library
22
-X-TDE-Library=kio
22
+X-TDE-Library=tdeio
23 23
 X-TDE-FactoryName=proxy

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

@@ -162,7 +162,7 @@ Trinity developers want to maintain a "traditional" desktop environment.</para>
162 162
 <itemizedlist>
163 163
 
164 164
 <listitem>
165
-<para>Desktop search through the locate:/ kio-slave and Beagle</para>
165
+<para>Desktop search through the locate:/ tdeio-slave and Beagle</para>
166 166
 </listitem>
167 167
 
168 168
 <listitem>

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

@@ -24,8 +24,8 @@
24 24
 				<glossseealso otherterm="gloss-kde">&tde;</glossseealso>
25 25
 			</glossdef>
26 26
 		</glossentry>
27
-		<glossentry id="gloss-kio">
28
-			<glossterm><acronym>KIO</acronym></glossterm>
27
+		<glossentry id="gloss-tdeio">
28
+			<glossterm><acronym>TDEIO</acronym></glossterm>
29 29
 			<glossdef><para>The &tde; Input/Output system which makes use of so-called
30 30
 				<quote><acronym>IO</acronym> Slaves</quote>.</para>
31 31
 				<glossseealso otherterm="gloss-ioslave"><acronym>IO</acronym> 

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

@@ -1128,7 +1128,7 @@ now.
1128 1128
                 </glossentry>
1129 1129
 
1130 1130
                 <glossentry id="gloss-printtdeioslave">
1131
-                        <glossterm>print:/ KIO Slave</glossterm>
1131
+                        <glossterm>print:/ TDEIO Slave</glossterm>
1132 1132
                         <glossdef><para>You can use a syntax of "print:/..." to get quick access
1133 1133
 				to TDEPrint resources. Typing "print:/manager" as a Konqueror URL
1134 1134
 				address gives administrative access to TDEPrint. Konqueror uses &tde;'s

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

@@ -225,8 +225,8 @@ which &Java; applications can read and write text. While most &Java;
225 225
 applications will not require such a console, it could be helpful in
226 226
 diagnosing problems with &Java; applications.</para>
227 227
 
228
-<para><guilabel>Use KIO</guilabel> will cause the
229
-<acronym>JVM</acronym>to use &tde;'s own <acronym>KIO</acronym>
228
+<para><guilabel>Use TDEIO</guilabel> will cause the
229
+<acronym>JVM</acronym>to use &tde;'s own <acronym>TDEIO</acronym>
230 230
 transports for network connections.</para>
231 231
 
232 232
 <para><guilabel>Use security

+ 78
- 78
doc/tdeioslave/index.docbook View File

@@ -1,45 +1,45 @@
1 1
 <?xml version="1.0" ?>
2 2
 <!DOCTYPE part PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
3 3
 "dtd/kdex.dtd" [
4
-<!ENTITY kio-bzip SYSTEM "bzip.docbook">
5
-<!ENTITY kio-bzip2 SYSTEM "bzip2.docbook">
6
-<!ENTITY kio-cgi SYSTEM "cgi.docbook">
7
-<!ENTITY kio-data SYSTEM "data.docbook">
8
-<!ENTITY kio-file SYSTEM "file.docbook">
9
-<!ENTITY kio-finger SYSTEM "finger.docbook">
10
-<!ENTITY kio-fish SYSTEM "fish.docbook">
11
-<!ENTITY kio-floppy SYSTEM "floppy.docbook">
12
-<!ENTITY kio-ftp SYSTEM "ftp.docbook">
13
-<!ENTITY kio-gopher SYSTEM "gopher.docbook">
14
-<!ENTITY kio-gzip SYSTEM "gzip.docbook">
15
-<!ENTITY kio-help SYSTEM "help.docbook">
16
-<!ENTITY kio-http SYSTEM "http.docbook">
17
-<!ENTITY kio-https SYSTEM "https.docbook">
18
-<!ENTITY kio-imap SYSTEM "imap.docbook">
19
-<!ENTITY kio-imaps SYSTEM "imaps.docbook">
20
-<!ENTITY kio-info SYSTEM "info.docbook">
21
-<!ENTITY kio-lan SYSTEM "lan.docbook">
22
-<!ENTITY kio-ldap SYSTEM "ldap.docbook">
23
-<!ENTITY kio-mailto SYSTEM "mailto.docbook">
24
-<!ENTITY kio-mac SYSTEM "mac.docbook">
25
-<!ENTITY kio-man SYSTEM "man.docbook">
26
-<!ENTITY kio-mrml SYSTEM "mrml.docbook"> <!-- post release, put this in the right module -->
27
-<!ENTITY kio-news SYSTEM "news.docbook">
28
-<!ENTITY kio-nfs SYSTEM "nfs.docbook">
29
-<!ENTITY kio-nntp SYSTEM "nntp.docbook">
30
-<!ENTITY kio-pop3 SYSTEM "pop3.docbook">
31
-<!ENTITY kio-pop3s SYSTEM "pop3s.docbook">
32
-<!ENTITY kio-print SYSTEM "print.docbook">
33
-<!ENTITY kio-rlan SYSTEM "rlan.docbook">
34
-<!ENTITY kio-rlogin SYSTEM "rlogin.docbook">
35
-<!ENTITY kio-sftp SYSTEM "sftp.docbook">
36
-<!ENTITY kio-smb SYSTEM "smb.docbook">
37
-<!ENTITY kio-smtp SYSTEM "smtp.docbook">
38
-<!ENTITY kio-tar SYSTEM "tar.docbook">
39
-<!ENTITY kio-telnet SYSTEM "telnet.docbook">
40
-<!ENTITY kio-thumbnail SYSTEM "thumbnail.docbook">
41
-<!ENTITY kio-webdav SYSTEM "webdav.docbook">
42
-<!ENTITY kio-webdavs SYSTEM "webdavs.docbook">
4
+<!ENTITY tdeio-bzip SYSTEM "bzip.docbook">
5
+<!ENTITY tdeio-bzip2 SYSTEM "bzip2.docbook">
6
+<!ENTITY tdeio-cgi SYSTEM "cgi.docbook">
7
+<!ENTITY tdeio-data SYSTEM "data.docbook">
8
+<!ENTITY tdeio-file SYSTEM "file.docbook">
9
+<!ENTITY tdeio-finger SYSTEM "finger.docbook">
10
+<!ENTITY tdeio-fish SYSTEM "fish.docbook">
11
+<!ENTITY tdeio-floppy SYSTEM "floppy.docbook">
12
+<!ENTITY tdeio-ftp SYSTEM "ftp.docbook">
13
+<!ENTITY tdeio-gopher SYSTEM "gopher.docbook">
14
+<!ENTITY tdeio-gzip SYSTEM "gzip.docbook">
15
+<!ENTITY tdeio-help SYSTEM "help.docbook">
16
+<!ENTITY tdeio-http SYSTEM "http.docbook">
17
+<!ENTITY tdeio-https SYSTEM "https.docbook">
18
+<!ENTITY tdeio-imap SYSTEM "imap.docbook">
19
+<!ENTITY tdeio-imaps SYSTEM "imaps.docbook">
20
+<!ENTITY tdeio-info SYSTEM "info.docbook">
21
+<!ENTITY tdeio-lan SYSTEM "lan.docbook">
22
+<!ENTITY tdeio-ldap SYSTEM "ldap.docbook">
23
+<!ENTITY tdeio-mailto SYSTEM "mailto.docbook">
24
+<!ENTITY tdeio-mac SYSTEM "mac.docbook">
25
+<!ENTITY tdeio-man SYSTEM "man.docbook">
26
+<!ENTITY tdeio-mrml SYSTEM "mrml.docbook"> <!-- post release, put this in the right module -->
27
+<!ENTITY tdeio-news SYSTEM "news.docbook">
28
+<!ENTITY tdeio-nfs SYSTEM "nfs.docbook">
29
+<!ENTITY tdeio-nntp SYSTEM "nntp.docbook">
30
+<!ENTITY tdeio-pop3 SYSTEM "pop3.docbook">
31
+<!ENTITY tdeio-pop3s SYSTEM "pop3s.docbook">
32
+<!ENTITY tdeio-print SYSTEM "print.docbook">
33
+<!ENTITY tdeio-rlan SYSTEM "rlan.docbook">
34
+<!ENTITY tdeio-rlogin SYSTEM "rlogin.docbook">
35
+<!ENTITY tdeio-sftp SYSTEM "sftp.docbook">
36
+<!ENTITY tdeio-smb SYSTEM "smb.docbook">
37
+<!ENTITY tdeio-smtp SYSTEM "smtp.docbook">
38
+<!ENTITY tdeio-tar SYSTEM "tar.docbook">
39
+<!ENTITY tdeio-telnet SYSTEM "telnet.docbook">
40
+<!ENTITY tdeio-thumbnail SYSTEM "thumbnail.docbook">
41
+<!ENTITY tdeio-webdav SYSTEM "webdav.docbook">
42
+<!ENTITY tdeio-webdavs SYSTEM "webdavs.docbook">
43 43
 <!ENTITY tdeprint "<application>TDEPrint</application>">
44 44
 <!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
45 45
 <!ENTITY Ferdinand.Gassauer.mail '<email>f.gassauer@aon.at</email>'>
@@ -49,45 +49,45 @@
49 49
 
50 50
 <part lang="&language;">
51 51
 <title>IO-Slaves</title>
52
-&kio-bzip;
53
-&kio-bzip2;
54
-&kio-cgi;
55
-&kio-data;
56
-&kio-file;
57
-&kio-finger;
58
-&kio-fish;
59
-&kio-floppy;
60
-&kio-ftp;
61
-&kio-gopher;
62
-&kio-gzip;
63
-&kio-help;
64
-&kio-http;
65
-&kio-https;
66
-&kio-imap;
67
-&kio-imaps;
68
-&kio-info;
69
-&kio-lan;
70
-&kio-ldap;
71
-&kio-mailto;
72
-&kio-mac;
73
-&kio-man;
74
-&kio-mrml;
75
-&kio-news;
76
-&kio-nfs;
77
-&kio-nntp;
78
-&kio-pop3;
79
-&kio-pop3s;
80
-&kio-print;
81
-&kio-rlan;
82
-&kio-rlogin;
83
-&kio-sftp;
84
-&kio-smb;
85
-&kio-smtp;
86
-&kio-tar;
87
-&kio-telnet;
88
-&kio-thumbnail;
89
-&kio-webdav;
90
-&kio-webdavs;
52
+&tdeio-bzip;
53
+&tdeio-bzip2;
54
+&tdeio-cgi;
55
+&tdeio-data;
56
+&tdeio-file;
57
+&tdeio-finger;
58
+&tdeio-fish;
59
+&tdeio-floppy;
60
+&tdeio-ftp;
61
+&tdeio-gopher;
62
+&tdeio-gzip;
63
+&tdeio-help;
64
+&tdeio-http;
65
+&tdeio-https;
66
+&tdeio-imap;
67
+&tdeio-imaps;
68
+&tdeio-info;
69
+&tdeio-lan;
70
+&tdeio-ldap;
71
+&tdeio-mailto;
72
+&tdeio-mac;
73
+&tdeio-man;
74
+&tdeio-mrml;
75
+&tdeio-news;
76
+&tdeio-nfs;
77
+&tdeio-nntp;
78
+&tdeio-pop3;
79
+&tdeio-pop3s;
80
+&tdeio-print;
81
+&tdeio-rlan;
82
+&tdeio-rlogin;
83
+&tdeio-sftp;
84
+&tdeio-smb;
85
+&tdeio-smtp;
86
+&tdeio-tar;
87
+&tdeio-telnet;
88
+&tdeio-thumbnail;
89
+&tdeio-webdav;
90
+&tdeio-webdavs;
91 91
 
92 92
 </part>
93 93
 

+ 1
- 1
doc/tdeioslave/mac.docbook View File

@@ -15,7 +15,7 @@ tools</ulink>, so you will need these installed for it to work.</para>
15 15
 
16 16
 <para>Enter <userinput>mac:/</userinput> into &konqueror; and you
17 17
 should see the contents of your &MacOS; partition. If you have not
18
-used kio-mac before, you will probably get an error message saying you
18
+used tdeio-mac before, you will probably get an error message saying you
19 19
 have not specified the right partition. Enter something like
20 20
 <userinput>mac:/<option>?dev=/dev/hda2</option></userinput> to specify
21 21
 the partition (if you don't know which partition &MacOS; is on, you

+ 2
- 2
doc/userguide/base-tde-applications.docbook View File

@@ -23,7 +23,7 @@
23 23
 <variablelist>
24 24
 <varlistentry>
25 25
 <term>&konqueror;</term>
26
-	<listitem><para>&tde;'s file manager, web browser, <acronym>FTP</acronym> client and much more. &konqueror; is the canvas for all the latest &tde; technology, from KIO slaves (which provide mechanisms for file access) to component embedding, allowing it to be a universal viewing application, capable of displaying various image files as well as documents.</para>
26
+	<listitem><para>&tde;'s file manager, web browser, <acronym>FTP</acronym> client and much more. &konqueror; is the canvas for all the latest &tde; technology, from TDEIO slaves (which provide mechanisms for file access) to component embedding, allowing it to be a universal viewing application, capable of displaying various image files as well as documents.</para>
27 27
 	
28 28
 		<itemizedlist>
29 29
 			<listitem><para>Website: <ulink url="http://konqueror.org">http://konqueror.org</ulink></para></listitem>
@@ -122,7 +122,7 @@
122 122
 <itemizedlist>
123 123
 <title>Related Information</title>
124 124
 	<listitem><para><ulink url="http://kde-apps.org">http://kde-apps.org</ulink>  -- mdash; The largest directory of third-party &tde; applications.</para></listitem>
125
-	<listitem><para>As you may have noticed, a wealth of information is accessible from the respective handbooks themselves, which can be accessed either by using the help KIO slave in &konqueror; (that is, type <userinput>help:/<replaceable>application</replaceable></userinput> in the Location toolbar), or by selecting it in the &khelpcenter;.</para></listitem>
125
+	<listitem><para>As you may have noticed, a wealth of information is accessible from the respective handbooks themselves, which can be accessed either by using the help TDEIO slave in &konqueror; (that is, type <userinput>help:/<replaceable>application</replaceable></userinput> in the Location toolbar), or by selecting it in the &khelpcenter;.</para></listitem>
126 126
 	<listitem><para>You can also likely find out quite a bit of information from the &tde; website, itself, at <ulink url="http://kde.org">http://kde.org</ulink>.</para></listitem>
127 127
 </itemizedlist>
128 128
 

+ 1
- 1
doc/userguide/extragear-applications.docbook View File

@@ -70,7 +70,7 @@
70 70
 
71 71
 <varlistentry>
72 72
 <term><application>Gwenview</application></term>
73
-	<listitem><para>Another advanced image viewer which can load and save all image formats supported by &tde;, as well as being able to display the <application>GIMP</application> (*.<acronym>xcf</acronym>) image filetype. <application>Gwenview</application> can perform a few graphical manipulations (rotate, mirroring) and has full support for KIO slaves (allowing you to use it via &FTP;). Other features also include file management operations, such as copy, paste, move and delete.</para>
73
+	<listitem><para>Another advanced image viewer which can load and save all image formats supported by &tde;, as well as being able to display the <application>GIMP</application> (*.<acronym>xcf</acronym>) image filetype. <application>Gwenview</application> can perform a few graphical manipulations (rotate, mirroring) and has full support for TDEIO slaves (allowing you to use it via &FTP;). Other features also include file management operations, such as copy, paste, move and delete.</para>
74 74
 	
75 75
 		<itemizedlist>
76 76
 			<listitem><para>Website: <ulink url="http://gwenview.sourceforge.net/">http://gwenview.sourceforge.net/</ulink></para></listitem>

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

@@ -1188,10 +1188,10 @@ on a multi-head system.</para>
1188 1188
 
1189 1189
 <varlistentry><term>$<envar>TDE_FORK_SLAVES</envar></term>
1190 1190
 <listitem><para>Set this variable to spawn
1191
-<acronym>KIO</acronym>-slaves directly from the application process
1192
-itself. By default <acronym>KIO</acronym>-slaves are spawned using
1191
+<acronym>TDEIO</acronym>-slaves directly from the application process
1192
+itself. By default <acronym>TDEIO</acronym>-slaves are spawned using
1193 1193
 <command>tdelauncher</command>/<command>tdeinit</command>. This option is
1194
-useful if the <acronym>KIO</acronym>-slave should run in the same
1194
+useful if the <acronym>TDEIO</acronym>-slave should run in the same
1195 1195
 environment as the application. This can be the case with
1196 1196
 <application>Clearcase</application>.</para>
1197 1197
 </listitem>

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

@@ -49,7 +49,7 @@ the &tde; desktop. This section was written with version 1.4 of
49 49
 &koffice; is a highly integrated office suite that builds directly on the
50 50
 TDE technology. This has many advantages in terms of integration, features,
51 51
 performance, familiar look and feel and so on. All technologies like &DCOP;,
52
-KIO, KParts are directly available.
52
+TDEIO, KParts are directly available.
53 53
 </para>
54 54
 <para>
55 55
 In particular the KParts technology is extended for the &koffice;
@@ -289,7 +289,7 @@ actually use the OASIS OpenDocument file format.
289 289
 <para>Each Koffice component comes with its own manual.
290 290
 These manuals offer all the latest information about the
291 291
 various components &koffice; has to offer and should be
292
-read to learn more about &koffice;. The application manuals can be accessed by using the documentation KIO Slave in &konqueror; (that is, typing <userinput>help:/<replaceable>application</replaceable></userinput> into the Location toolbar) or by selecting the respective handbook from the &khelpcenter;. The website is
292
+read to learn more about &koffice;. The application manuals can be accessed by using the documentation TDEIO Slave in &konqueror; (that is, typing <userinput>help:/<replaceable>application</replaceable></userinput> into the Location toolbar) or by selecting the respective handbook from the &khelpcenter;. The website is
293 293
 also a good place to find out more; it is at <ulink url="http://www.koffice.org">http://www.koffice.org</ulink>.</para>
294 294
 </sect1>
295 295
 

+ 1
- 1
doc/userguide/under-the-hood.docbook View File

@@ -401,7 +401,7 @@ select/deselect --> in order to enable or disable debugging output for
401 401
 that part of &tde;.</para>
402 402
 
403 403
 <para>The list of debugging areas is sorted numerically, not alphabetically,
404
-so kio (127) comes before artskde (400). The numbers go up to 200000 or so,
404
+so tdeio (127) comes before artskde (400). The numbers go up to 200000 or so,
405 405
 but there are really only 400 areas. You don't have to scroll through the
406 406
 entire list to find the area you need, though. There is a line edit <!--
407 407
 text-entry ? --> box at the top of the dialog where you can enter a part of

+ 2
- 2
drkonqi/Makefile.am View File

@@ -11,8 +11,8 @@ 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) -ltdetexteditor
15
-LDADD  = $(LIB_TDEUI) $(LIB_KIO)
14
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
15
+LDADD  = $(LIB_TDEUI) $(LIB_TDEIO)
16 16
 
17 17
 # toplevel.cpp must be last in row due to X-headers being included. (--enable-final)
18 18
 # Did I mention already that X header files really suck?

+ 3
- 3
kappfinder/Makefile.am View File

@@ -2,13 +2,13 @@ SUBDIRS = apps
2 2
 
3 3
 bin_PROGRAMS = kappfinder
4 4
 kappfinder_SOURCES = main.cpp toplevel.cpp common.cpp
5
-kappfinder_LDADD = $(LIB_TDEUI) $(LIB_KIO)
6
-kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
5
+kappfinder_LDADD = $(LIB_TDEUI) $(LIB_TDEIO)
6
+kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -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) -ltdetexteditor
11
+kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
12 12
 
13 13
 INCLUDES = $(all_includes)
14 14
 METASOURCES = AUTO

+ 3
- 3
kate/ChangeLog View File

@@ -109,16 +109,16 @@
109 109
   * myself back again ;)
110 110
   * now kate is clean (only qt3), no backports ;)
111 111
 
112
-2001-08-24  christian@tdevelop.org
112
+2001-08-24  christian@kdevelop.org
113 113
   * reimplement the commenting of selections on some languages
114 114
 
115
-2001-08-19  christian@tdevelop.org
115
+2001-08-19  christian@kdevelop.org
116 116
   * added back Sather highlighting support
117 117
   * improved Eiffel language syntax highlighting support
118 118
   * added Eiffel language comment directive in eiffel.xml
119 119
   * added Ada language comment directive in ada.xml
120 120
 
121
-2001-08-15  christian@tdevelop.org
121
+2001-08-15  christian@kdevelop.org
122 122
   * committed Eiffel language syntax highlighting support
123 123
 
124 124
 2001-08-08  rokrau@yahoo.com

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

@@ -12,7 +12,7 @@ libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugin
12 12
   kateexternaltools.cpp katesavemodifieddialog.cpp kateviewspacecontainer.cpp \
13 13
   katemwmodonhddialog.cpp katesession.cpp katemdi.cpp katetabwidget.cpp
14 14
 
15
-libkateinterfaces_la_LIBADD   = ../interfaces/libkateinterfacesprivate.la $(LIB_KUTILS) ../utils/libkateutils.la
15
+libkateinterfaces_la_LIBADD   = ../interfaces/libkateinterfacesprivate.la $(LIB_TDEUTILS) ../utils/libkateutils.la
16 16
 
17 17
 libkateinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
18 18
 

+ 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) -ltdetexteditor
9
+libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -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/utils/Makefile.am View File

@@ -8,7 +8,7 @@ libkateutils_la_SOURCES = dockviewbase.cpp messageview.cpp listboxview.cpp
8 8
 
9 9
 libkateutils_la_LDFLAGS = $(all_libraries) -no-undefined
10 10
                       
11
-libkateutils_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO)
11
+libkateutils_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO)
12 12
 
13 13
 libkateutils_la_METASOURCES = AUTO
14 14
 

+ 2
- 2
kcminit/Makefile.am View File

@@ -22,11 +22,11 @@ bin_PROGRAMS=
22 22
 lib_LTLIBRARIES=
23 23
 
24 24
 kcminit_la_SOURCES = main.cpp main.skel
25
-kcminit_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS)
25
+kcminit_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS)
26 26
 kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version
27 27
 
28 28
 kcminit_startup_la_SOURCES = main.cpp main.skel
29
-kcminit_startup_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS)
29
+kcminit_startup_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS)
30 30
 kcminit_startup_la_LDFLAGS = $(all_libraries) -module -avoid-version
31 31
 
32 32
 AM_CPPFLAGS = $(all_includes)

+ 1
- 1
kcontrol/Makefile.am View File

@@ -33,7 +33,7 @@ endif
33 33
 
34 34
 # 'colors' and 'fonts' should come after 'krdb'
35 35
 SUBDIRS = bell background dnssd filetypes samba krdb input info ioslaveinfo tdm\
36
-	kicker locale launch keys kio konq style kded \
36
+	kicker locale launch keys tdeio konq style kded \
37 37
 	konqhtml ebrowsing arts kcontrol knotify\
38 38
 	clock pics $(ACCESS_SUBDIR) colors energy fonts css \
39 39
 	icons screensaver taskbar crypto privacy smserver \

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

@@ -13,7 +13,7 @@ kaccess_la_LIBADD = $(LIB_TDEUI)
13 13
 
14 14
 kcm_access_la_SOURCES = kcmaccess.cpp 
15 15
 kcm_access_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
16
-kcm_access_la_LIBADD = $(LIB_KIO)
16
+kcm_access_la_LIBADD = $(LIB_TDEIO)
17 17
 
18 18
 noinst_HEADERS = kcmaccess.h
19 19
 

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

@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_accessibility.la
5 5
 
6 6
 kcm_accessibility_la_SOURCES = accessibility.cpp accessibilityconfigwidget.ui
7 7
 kcm_accessibility_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
8
-kcm_accessibility_la_LIBADD = $(LIB_KIO)
8
+kcm_accessibility_la_LIBADD = $(LIB_TDEIO)
9 9
 
10 10
 noinst_HEADERS = accessibility.h
11 11
 

+ 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) -ltdemid
6
+kcm_arts_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS) -ltdemid
7 7
 
8 8
 AM_CPPFLAGS = -I$(kde_includes)/arts  $(all_includes)
9 9
 

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

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_clock.la
3 3
 kcm_clock_la_SOURCES = dtime.cpp tzone.cpp main.cpp 
4 4
 
5 5
 kcm_clock_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
6
-kcm_clock_la_LIBADD = $(LIB_KIO)
6
+kcm_clock_la_LIBADD = $(LIB_TDEIO)
7 7
 
8 8
 AM_CPPFLAGS = $(all_includes)
9 9
  

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

@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_colors.la
4 4
 
5 5
 kcm_colors_la_SOURCES = colorscm.cpp widgetcanvas.cpp 
6 6
 kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
7
-kcm_colors_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la
7
+kcm_colors_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/kcontrol/krdb/libkrdb.la
8 8
 METASOURCES = colorscm.moc widgetcanvas.moc
9 9
 
10 10
 noinst_HEADERS = colorscm.h widgetcanvas.h

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

@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kcm_componentchooser.la
7 7
 
8 8
 kcm_componentchooser_la_SOURCES = componentchooser_ui.ui componentconfig_ui.ui emailclientconfig_ui.ui terminalemulatorconfig_ui.ui browserconfig_ui.ui componentchooser.cpp kcm_componentchooser.cpp
9 9
 kcm_componentchooser_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
10
-kcm_componentchooser_la_LIBADD =  $(LIB_KIO)
10
+kcm_componentchooser_la_LIBADD =  $(LIB_TDEIO)
11 11
 
12 12
 xdg_apps_DATA = componentchooser.desktop
13 13
 

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

@@ -6,7 +6,7 @@ kcm_crypto_la_SOURCES = crypto.cpp certexport.cpp kdatetimedlg.cpp
6 6
 AM_CXXFLAGS = $(CXXFLAGS) -DLIBDIR=$(libdir)
7 7
 
8 8
 kcm_crypto_la_LDFLAGS  = $(KDE_RPATH) $(all_libraries) $(SSL_LDFLAGS) -module -avoid-version -no-undefined
9
-kcm_crypto_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSSL)
9
+kcm_crypto_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIBSSL)
10 10
 
11 11
 METASOURCES = AUTO
12 12
 

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

@@ -6,7 +6,7 @@ templatedir = $(kde_datadir)/kcmcss
6 6
 kde_module_LTLIBRARIES = kcm_css.la
7 7
 kcm_css_la_SOURCES = template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui
8 8
 kcm_css_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
9
-kcm_css_la_LIBADD = -ltdeui $(LIB_KIO)
9
+kcm_css_la_LIBADD = -ltdeui $(LIB_TDEIO)
10 10
 
11 11
 METASOURCES = AUTO
12 12
  

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

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_display.la
3 3
 kcm_display_la_SOURCES = display.cpp
4 4
 
5 5
 kcm_display_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
6
-kcm_display_la_LIBADD = $(LIB_KUTILS)
6
+kcm_display_la_LIBADD = $(LIB_TDEUTILS)
7 7
 AM_CPPFLAGS = $(all_includes) 
8 8
 
9 9
 METASOURCES = AUTO

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

@@ -5,7 +5,7 @@ kcm_displayconfig_la_SOURCES = displayconfig.cpp displayconfigbase.ui displaycon
5 5
 
6 6
 kcm_displayconfig_la_LDFLAGS  = $(all_libraries) -ltderandr -module -avoid-version -no-undefined
7 7
 
8
-kcm_displayconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)
8
+kcm_displayconfig_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIB_XRANDR)
9 9
 
10 10
 METASOURCES = AUTO
11 11
 

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

@@ -5,7 +5,7 @@ kcm_tdednssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
5 5
 kcm_tdednssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h
6 6
 
7 7
 xdg_apps_DATA = kcm_tdednssd.desktop
8
-kcm_tdednssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI)
8
+kcm_tdednssd_la_LIBADD = $(LIB_TDEDNSSD) $(LIB_TDEUI)
9 9
 
10 10
 messages: rc.cpp
11 11
 	$(EXTRACTRC) *.ui *.rc >> rc.cpp

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

@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = kcm_kurifilt.la
9 9
 kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp
10 10
 
11 11
 kcm_kurifilt_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
12
-kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA)
12
+kcm_kurifilt_la_LIBADD = $(LIB_TDESYCOCA)
13 13
 # Don't link this lib to the plugins. They are dlopened and linking to them
14 14
 # results in crashes when closing tdecmshell.
15 15
 # plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libtdeshorturifilter.la

+ 2
- 2
kcontrol/ebrowsing/plugins/ikws/Makefile.am View File

@@ -9,10 +9,10 @@ METASOURCES = AUTO
9 9
 kde_module_LTLIBRARIES = libkuriikwsfilter.la libkurisearchfilter.la
10 10
 
11 11
 libkuriikwsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
12
-libkuriikwsfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
12
+libkuriikwsfilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)
13 13
 
14 14
 libkurisearchfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
15
-libkurisearchfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
15
+libkurisearchfilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)
16 16
 
17 17
 libkuriikwsfilter_la_SOURCES = kuriikwsfiltereng.cpp kuriikwsfilter.skel \
18 18
     kuriikwsfilter.cpp searchprovider.cpp

+ 1
- 1
kcontrol/ebrowsing/plugins/localdomain/Makefile.am View File

@@ -5,7 +5,7 @@ AM_CPPFLAGS   =  $(all_includes) -DQT_NO_CAST_ASCII
5 5
 kde_module_LTLIBRARIES = liblocaldomainurifilter.la
6 6
 
7 7
 liblocaldomainurifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
8
-liblocaldomainurifilter_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE)
8
+liblocaldomainurifilter_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE)
9 9
 
10 10
 liblocaldomainurifilter_la_SOURCES = localdomainurifilter.cpp localdomainurifilter.skel
11 11
 

+ 1
- 1
kcontrol/ebrowsing/plugins/shorturi/Makefile.am View File

@@ -5,7 +5,7 @@ AM_CPPFLAGS   =  $(all_includes) -DQT_NO_CAST_ASCII
5 5
 kde_module_LTLIBRARIES = libtdeshorturifilter.la
6 6
 
7 7
 libtdeshorturifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
8
-libtdeshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
8
+libtdeshorturifilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)
9 9
 
10 10
 libtdeshorturifilter_la_SOURCES = tdeshorturifilter.cpp tdeshorturifilter.skel
11 11
 

+ 2
- 2
kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h View File

@@ -20,8 +20,8 @@
20 20
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
21 21
 */
22 22
 
23
-#ifndef _KSHORTURIFILTER_H_
24
-#define _KSHORTURIFILTER_H_
23
+#ifndef _TDESHORTURIFILTER_H_
24
+#define _TDESHORTURIFILTER_H_
25 25
 
26 26
 #include <dcopobject.h>
27 27
 #include <kgenericfactory.h>

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

@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_energy.la
6 6
 
7 7
 kcm_energy_la_SOURCES = energy.cpp
8 8
 kcm_energy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
9
-kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_TDEUI) $(LIB_KIO)
9
+kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_TDEUI) $(LIB_TDEIO)
10 10
 METASOURCES = energy.moc
11 11
 
12 12
 noinst_HEADERS = energy.h

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

@@ -1,6 +1,6 @@
1 1
 AM_CPPFLAGS = $(all_includes)
2 2
 
3
-kcm_filetypes_la_LIBADD	= libfiletypes.la $(LIB_KIO)
3
+kcm_filetypes_la_LIBADD	= libfiletypes.la $(LIB_TDEIO)
4 4
 kcm_filetypes_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
5 5
 METASOURCES = AUTO
6 6
 
@@ -20,8 +20,8 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails
20 20
 		 kserviceselectdlg.cpp
21 21
 
22 22
 keditfiletype_SOURCES = keditfiletype.cpp
23
-keditfiletype_LDADD = libfiletypes.la $(LIB_KIO)
24
-keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
23
+keditfiletype_LDADD = libfiletypes.la $(LIB_TDEIO)
24
+keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
25 25
 
26 26
 messages:
27 27
 	$(XGETTEXT) *.cpp -o $(podir)/filetypes.pot

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

@@ -5,7 +5,7 @@ kcm_iccconfig_la_SOURCES = iccconfig.cpp iccconfigbase.ui iccconfig.skel
5 5
 
6 6
 kcm_iccconfig_la_LDFLAGS  = $(all_libraries) -ltderandr -module -avoid-version -no-undefined
7 7
 
8
-kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR)
8
+kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIB_XRANDR)
9 9
 
10 10
 METASOURCES = AUTO
11 11
 

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

@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_icons.la
4 4
 
5 5
 kcm_icons_la_SOURCES = iconthemes.cpp icons.cpp main.cpp
6 6
 kcm_icons_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
7
-kcm_icons_la_LIBADD = $(LIB_KIO)
7
+kcm_icons_la_LIBADD = $(LIB_TDEIO)
8 8
 
9 9
 METASOURCES = AUTO 
10 10
 

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

@@ -22,7 +22,7 @@ kde_module_LTLIBRARIES = kcm_input.la
22 22
 
23 23
 kcm_input_la_SOURCES = mouse.cpp kmousedlg.ui main.cpp logitechmouse.cpp logitechmouse_base.ui
24 24
 kcm_input_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
25
-kcm_input_la_LIBADD = $(THEMEPAGE_LIB) $(XTESTLIB) $(LIB_KIO) $(LIB_XCURSOR) $(USB_LIBS)
25
+kcm_input_la_LIBADD = $(THEMEPAGE_LIB) $(XTESTLIB) $(LIB_TDEIO) $(LIB_XCURSOR) $(USB_LIBS)
26 26
 
27 27
 METASOURCES = AUTO 
28 28
 

+ 1
- 1
kcontrol/input/xcursor/themepage.cpp View File

@@ -269,7 +269,7 @@ void ThemePage::removeClicked()
269 269
 	//  theme with the same name, we shouldn't remove the theme from the list if it's
270 270
 	//  still available elsewhere. This could be solved by calling insertThemes() here,
271 271
 	//  but since TDEIO::del() is an asynchronos operation, the theme we're deleting will
272
-	//  be readded to the list again before KIO has removed it.
272
+	//  be readded to the list again before TDEIO has removed it.
273 273
 }
274 274
 
275 275
 

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

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_ioslaveinfo.la
3 3
 kcm_ioslaveinfo_la_SOURCES = kcmioslaveinfo.cpp
4 4
 
5 5
 kcm_ioslaveinfo_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
6
-kcm_ioslaveinfo_la_LIBADD = -ltdeui $(LIB_KIO)
6
+kcm_ioslaveinfo_la_LIBADD = -ltdeui $(LIB_TDEIO)
7 7
 
8 8
 AM_CPPFLAGS= $(all_includes)
9 9
 

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

@@ -97,7 +97,7 @@ Keywords[es]=Protocolo,Slaves de E/S,Slaves,Red,Información,Tiempo de expiraci
97 97
 Keywords[et]=protokoll,IO moodulid,moodulid,võrk,info,taimaut,aegumine
98 98
 Keywords[eu]=Protocol,IO morroiak,Morroiak,Sarea,Informazioa,Denbora-muga
99 99
 Keywords[fa]=قرارداد، IO slaves، Slaves، شبکه، اطلاعات، اتمام وقت
100
-Keywords[fi]=Protokolla,Yhteyskäytäntö,KIO,KIO-palvelu,Verkko,Aikavalvonta,aikakatkaisu
100
+Keywords[fi]=Protokolla,Yhteyskäytäntö,TDEIO,TDEIO-palvelu,Verkko,Aikavalvonta,aikakatkaisu
101 101
 Keywords[fr]=protocole,modules,entrées/sorties,réseau,informations,délai
102 102
 Keywords[fy]=protocol,IO slaves,slaves,network,ynformaasje,timeout,netwurk,tiidslimyt
103 103
 Keywords[gl]=Protocolo,escravos IO,Escravos,Rede,Información,Tempo de agarda,Timeout

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

@@ -32,7 +32,7 @@ kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \
32 32
 	moduleIface.cpp moduleIface.skel global.cpp modules.cpp \
33 33
 	proxywidget.cpp kcrootonly.cpp searchwidget.cpp
34 34
 
35
-kcontrol_la_LIBADD  = $(LIB_TDEUI) $(LIB_KUTILS) $(LIB_TDEHTML)
35
+kcontrol_la_LIBADD  = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIB_TDEHTML)
36 36
 kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version
37 37
 
38 38
 rccontroldir = $(kde_datadir)/kcontrol

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

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_kded.la
3 3
 kcm_kded_la_SOURCES = kcmkded.cpp
4 4
 
5 5
 kcm_kded_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
6
-kcm_kded_la_LIBADD =  $(LIB_KIO)
6
+kcm_kded_la_LIBADD =  $(LIB_TDEIO)
7 7
 
8 8
 AM_CPPFLAGS= $(all_includes)
9 9
 

+ 3
- 3
kcontrol/keys/tdeaccelaction.h View File

@@ -20,8 +20,8 @@
20 20
     Boston, MA 02110-1301, USA.
21 21
 */
22 22
 
23
-#ifndef _KACCELACTION_H
24
-#define _KACCELACTION_H
23
+#ifndef _TDEACCELACTION_H
24
+#define _TDEACCELACTION_H
25 25
 
26 26
 #include <tqmap.h>
27 27
 #include <tqptrvector.h>
@@ -202,4 +202,4 @@ class TDEAccelActions
202 202
 	friend class TDEAccelBase;
203 203
 };
204 204
 
205
-#endif // _KACCELACTION_H
205
+#endif // _TDEACCELACTION_H

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

@@ -7,7 +7,7 @@ kcm_kicker_la_SOURCES = positiontab.ui hidingtab.ui lookandfeeltab.ui menutab.ui
7 7
                         positionconfig.cpp hidingconfig.cpp menuconfig.cpp lookandfeelconfig.cpp
8 8
 
9 9
 kcm_kicker_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
10
-kcm_kicker_la_LIBADD = $(top_builddir)/kicker/libkicker/libkickermain.la ../background/libbgnd.la $(LIB_KIO) $(LIB_KUTILS)
10
+kcm_kicker_la_LIBADD = $(top_builddir)/kicker/libkicker/libkickermain.la ../background/libbgnd.la $(LIB_TDEIO) $(LIB_TDEUTILS)
11 11
 AM_CPPFLAGS = -I$(top_srcdir)/kicker/kicker/core -I$(top_srcdir)/kicker/libkicker \
12 12
 	-I$(top_builddir)/kicker/libkicker -I$(srcdir)/../background $(all_includes)
13 13
 

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

@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_knotify.la
5 5
 kcm_knotify_la_SOURCES = knotify.cpp playersettings.ui
6 6
 
7 7
 kcm_knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
8
-kcm_knotify_la_LIBADD = $(LIB_KIO)
8
+kcm_knotify_la_LIBADD = $(LIB_TDEIO)
9 9
 AM_CPPFLAGS = $(all_includes)
10 10
  
11 11
 METASOURCES = AUTO 

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

@@ -11,7 +11,7 @@ kcm_konq_la_SOURCES = behaviour.cpp desktop.cpp rootopts.cpp \
11 11
 		desktopbehavior.ui
12 12
 
13 13
 kcm_konq_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
14
-kcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_KUTILS)
14
+kcm_konq_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDESYCOCA) $(LIB_TDEUTILS)
15 15
 
16 16
 kcm_konq_la_DATA = overlapping.png onlyone.png
17 17
 kcm_konq_ladir = $(kde_datadir)/kcontrol/pics

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

@@ -86,7 +86,7 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
86 86
     grid->addWidget( javaSecurityManagerCB, 0, 0 );
87 87
     connect( javaSecurityManagerCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
88 88
 
89
-    useKioCB = new TQCheckBox( i18n("Use &KIO"), checkboxes );
89
+    useKioCB = new TQCheckBox( i18n("Use &TDEIO"), checkboxes );
90 90
     grid->addWidget( useKioCB, 0, 1 );
91 91
     connect( useKioCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
92 92
 
@@ -158,7 +158,7 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
158 158
                                                   "policytool utility to give code downloaded from certain sites more "
159 159
                                                   "permissions." ) );
160 160
 
161
-    TQWhatsThis::add( useKioCB, i18n( "Enabling this will cause the jvm to use KIO for network transport ") );
161
+    TQWhatsThis::add( useKioCB, i18n( "Enabling this will cause the jvm to use TDEIO for network transport ") );
162 162
 
163 163
     TQWhatsThis::add( pathED, i18n("Enter the path to the java executable. If you want to use the jre in "
164 164
                                   "your path, simply leave it as 'java'. If you need to use a different jre, "

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

@@ -4,7 +4,7 @@ kcm_konsole_la_SOURCES =  schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp \
4 4
 	schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui
5 5
 
6 6
 kcm_konsole_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
7
-kcm_konsole_la_LIBADD = -ltdeui $(LIB_KIO)
7
+kcm_konsole_la_LIBADD = -ltdeui $(LIB_TDEIO)
8 8
 AM_CPPFLAGS = $(all_includes) 
9 9
 
10 10
 METASOURCES = AUTO 

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

@@ -4,7 +4,7 @@ METASOURCES = AUTO
4 4
 kde_module_LTLIBRARIES = kcm_kthememanager.la
5 5
 
6 6
 kcm_kthememanager_la_SOURCES = kthemedlg.ui newthemewidget.ui knewthemedlg.cpp ktheme.cpp kthememanager.cpp
7
-kcm_kthememanager_la_LIBADD = $(LIB_KIO)
7
+kcm_kthememanager_la_LIBADD = $(LIB_TDEIO)
8 8
 kcm_kthememanager_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
9 9
 
10 10
 noinst_HEADERS = kthememanager.h ktheme.h knewthemedlg.h kthemedlg.ui.h

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

@@ -10,7 +10,7 @@ METASOURCES = AUTO
10 10
 noinst_HEADERS = toplevel.h kcmlocale.h klocalesample.h localenum.h localemon.h localetime.h localeother.h 
11 11
 
12 12
 kcm_locale_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
13
-kcm_locale_la_LIBADD = $(LIB_KIO)
13
+kcm_locale_la_LIBADD = $(LIB_TDEIO)
14 14
 
15 15
 # Note: newer glibc (e.g. zonetab version 1.31 (cvs revision 1.22) have more/other data than older ones (e.g. zonetab version 1.28)
16 16
 

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

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_nic.la
3 3
 kcm_nic_la_SOURCES = nic.cpp
4 4
 
5 5
 kcm_nic_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
6
-kcm_nic_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSOCKET)
6
+kcm_nic_la_LIBADD = -ltdeui $(LIB_TDEIO) $(LIBSOCKET)
7 7
 
8 8
 AM_CPPFLAGS= $(all_includes)
9 9
 

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

@@ -30,7 +30,7 @@ bin_PROGRAMS = tderandrtray
30 30
 
31 31
 tderandrtray_SOURCES = main.cpp tderandrtray.cpp tderandrapp.cpp tderandrpassivepopup.cpp configdialog.cpp
32 32
 tderandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltderandr
33
-tderandrtray_LDADD = $(LIB_TDEFILE) $(LIB_KUTILS) $(LIB_XRANDR)
33
+tderandrtray_LDADD = $(LIB_TDEFILE) $(LIB_TDEUTILS) $(LIB_XRANDR)
34 34
 
35 35
 messages: rc.cpp
36 36
 	$(XGETTEXT) *.cpp -o $(podir)/tderandr.pot

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

@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_samba.la
3 3
 kcm_samba_la_SOURCES = main.cpp ksmbstatus.cpp kcmsambaimports.cpp kcmsambalog.cpp kcmsambastatistics.cpp
4 4
 
5 5
 kcm_samba_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
6
-kcm_samba_la_LIBADD = $(LIB_KIO)
6
+kcm_samba_la_LIBADD = $(LIB_TDEIO)
7 7
 
8 8
 AM_CPPFLAGS = $(all_includes)
9 9
 

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

@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_screensaver.la
6 6
 kcm_screensaver_la_SOURCES = advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp \
7 7
         saverconfig.cpp advanceddialog.cpp kswidget.cpp
8 8
 kcm_screensaver_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
9
-kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB) $(GLLIB)
9
+kcm_screensaver_la_LIBADD = $(LIB_TDESYCOCA) $(DPMSLIB) $(GLLIB)
10 10
 METASOURCES = AUTO
11 11
 
12 12
 noinst_HEADERS = scrnsave.h

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

@@ -5,7 +5,7 @@ kcm_smartcard_la_SOURCES = smartcard.cpp smartcardbase.ui nosmartcardbase.ui sma
5 5
 
6 6
 kcm_smartcard_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
7 7
 
8
-kcm_smartcard_la_LIBADD = -ltdeui -lksmartcard $(LIB_KIO)
8
+kcm_smartcard_la_LIBADD = -ltdeui -lksmartcard $(LIB_TDEIO)
9 9
 
10 10
 METASOURCES = AUTO
11 11
 

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

@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_style.la
6 6
 
7 7
 kcm_style_la_SOURCES = kcmstyle.cpp stylepreview.ui menupreview.cpp styleconfdialog.cpp
8 8
 kcm_style_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
9
-kcm_style_la_LIBADD = $(LIB_KIO) ../krdb/libkrdb.la
9
+kcm_style_la_LIBADD = $(LIB_TDEIO) ../krdb/libkrdb.la
10 10
 METASOURCES = AUTO 
11 11
 
12 12
 noinst_HEADERS = kcmstyle.h stylepreview.h menupreview.h

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

@@ -3,7 +3,7 @@ FONTINST_TN_SUBDIR=thumbnail
3 3
 FONTINST_VP_SUBDIR=viewpart
4 4
 endif
5 5
 
6
-SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin tdefontinst kio
6
+SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin tdefontinst tdeio
7 7
 
8 8
 EXTRA_DIST = TODO
9 9
 

+ 3
- 3
kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp View File

@@ -146,7 +146,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
146 146
 
147 147
     TQString previousPath=itsConfig.readEntry(CFG_PATH);
148 148
 
149
-    itsDirOp = new KDirOperator(Misc::root() ? TQString("fonts:/") : TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER),
149
+    itsDirOp = new KDirOperator(Misc::root() ? TQString("fonts:/") : TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_USER),
150 150
                                 fontsFrame);
151 151
     itsDirOp->setViewConfig(&itsConfig, "ListView Settings");
152 152
     itsDirOp->setMinimumSize(TQSize(96, 64));
@@ -439,7 +439,7 @@ void CKCmFontInst::removeFonts()
439 439
         {
440 440
             KURL url((*it)->url());
441 441
 
442
-            url.setQuery(KFI_KIO_NO_CLEAR);
442
+            url.setQuery(KFI_TDEIO_NO_CLEAR);
443 443
             files.append((*it)->text());
444 444
             urls.append(url);
445 445
         }
@@ -596,7 +596,7 @@ void CKCmFontInst::delResult(TDEIO::Job *job)
596 596
 
597 597
     stream << KFI::SPECIAL_RESCAN;
598 598
 
599
-    TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
599
+    TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_TDEIO_FONTS_PROTOCOL ":/", packedArgs), this);
600 600
     jobResult(job);
601 601
 }
602 602
 

+ 1
- 1
kcontrol/tdefontinst/kcmfontinst/Makefile.am View File

@@ -4,7 +4,7 @@ FONTINST_PRINT_LIB=../viewpart/libtdefontinstprint.la
4 4
 endif
5 5
 
6 6
 kde_module_LTLIBRARIES = kcm_fontinst.la
7
-kcm_fontinst_la_LIBADD  = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libtdefontinst.la
7
+kcm_fontinst_la_LIBADD  = $(LIB_TDEIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libtdefontinst.la
8 8
 METASOURCES = AUTO
9 9
 kcm_fontinst_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
10 10
 AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)

+ 1
- 1
kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp View File

@@ -90,7 +90,7 @@ void CSettingsDialog::slotOk()
90 90
 
91 91
         stream << KFI::SPECIAL_RECONFIG;
92 92
 
93
-        TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
93
+        TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_TDEIO_FONTS_PROTOCOL ":/", packedArgs), this);
94 94
     }
95 95
 
96 96
     hide();

+ 2
- 2
kcontrol/tdefontinst/lib/FcEngine.cpp View File

@@ -909,7 +909,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
909 909
     //    fonts:/System/times.ttf
910 910
     //    file:/home/wibble/hmm.ttf
911 911
     //
912
-    if(KFI_KIO_FONTS_PROTOCOL==url.protocol())
912
+    if(KFI_TDEIO_FONTS_PROTOCOL==url.protocol())
913 913
     {
914 914
         TDEIO::UDSEntry udsEntry;
915 915
         TQString       name;
@@ -948,7 +948,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
948 948
             TQTextStream stream(&file);
949 949
 
950 950
             thumbUrl=stream.readLine();
951
-            isThumbnailUrl=0==thumbUrl.find(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all);
951
+            isThumbnailUrl=0==thumbUrl.find(KFI_TDEIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all);
952 952
             file.close();
953 953
         }
954 954
 

+ 4
- 4
kcontrol/tdefontinst/lib/KfiConstants.h View File

@@ -6,10 +6,10 @@
6 6
 #define KFI_CATALOGUE                "tdefontinst"
7 7
 
8 8
 // io-slave
9
-#define KFI_KIO_FONTS_PROTOCOL       "fonts"
10
-#define KFI_KIO_FONTS_USER           I18N_NOOP("Personal")
11
-#define KFI_KIO_FONTS_SYS            I18N_NOOP("System")
12
-#define KFI_KIO_NO_CLEAR             "?noclear"
9
+#define KFI_TDEIO_FONTS_PROTOCOL       "fonts"
10
+#define KFI_TDEIO_FONTS_USER           I18N_NOOP("Personal")
11
+#define KFI_TDEIO_FONTS_SYS            I18N_NOOP("System")
12
+#define KFI_TDEIO_NO_CLEAR             "?noclear"
13 13
 
14 14
 // Config
15 15
 #define KFI_UI_CFG_FILE              KFI_CATALOGUE"uirc"

+ 1
- 1
kcontrol/tdefontinst/lib/Makefile.am View File

@@ -9,6 +9,6 @@ Misc.h \
9 9
 FcEngine.h \
10 10
 KfiConstants.h
11 11
 
12
-libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB)
12
+libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_TDEIO) $(LIBXFT_LIB)
13 13
 libtdefontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
14 14
 AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE

+ 1
- 1
kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp View File

@@ -320,7 +320,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
320 320
             slantAll;
321 321
     KURL    url(info.url());
322 322
     TQString fName;
323
-    bool    fontsProt  = KFI_KIO_FONTS_PROTOCOL == url.protocol(),
323
+    bool    fontsProt  = KFI_TDEIO_FONTS_PROTOCOL == url.protocol(),
324 324
             fileProt   = "file"             == url.protocol(),
325 325
             downloaded = false,
326 326
             status     = false;

+ 1
- 1
kcontrol/tdefontinst/tdefile-plugin/Makefile.am View File

@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdefile_font.la
2 2
 
3 3
 tdefile_font_la_SOURCES = KFileFont.cpp
4 4
 tdefile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
5
-tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libtdefontinst.la
5
+tdefile_font_la_LIBADD = $(LIB_TDEIO) $(LIBFREETYPE_LIBS) ../lib/libtdefontinst.la
6 6
 
7 7
 kdelnkdir = $(kde_servicesdir)
8 8
 kde_services_DATA = tdefile_font.desktop

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

@@ -11,6 +11,6 @@ FontEngine.h \
11 11
 Fontmap.h \
12 12
 XConfig.h
13 13
 
14
-tdefontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_KIO) ../lib/libtdefontinst.la
14
+tdefontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_TDEIO) ../lib/libtdefontinst.la
15 15
 tdefontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH)
16 16
 AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)

+ 41
- 41
kcontrol/tdefontinst/tdeio/KioFonts.cpp View File

@@ -104,13 +104,13 @@ int kdemain(int argc, char **argv)
104 104
 {
105 105
     if (argc != 4)
106 106
     {
107
-        fprintf(stderr, "Usage: tdeio_" KFI_KIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n");
107
+        fprintf(stderr, "Usage: tdeio_" KFI_TDEIO_FONTS_PROTOCOL " protocol domain-socket1 domain-socket2\n");
108 108
         exit(-1);
109 109
     }
110 110
 
111 111
     TDELocale::setMainCatalogue(KFI_CATALOGUE);
112 112
 
113
-    TDEInstance instance("tdeio_" KFI_KIO_FONTS_PROTOCOL);
113
+    TDEInstance instance("tdeio_" KFI_TDEIO_FONTS_PROTOCOL);
114 114
     KFI::CKioFonts slave(argv[2], argv[3]);
115 115
 
116 116
     slave.dispatchLoop();
@@ -123,12 +123,12 @@ namespace KFI
123 123
 
124 124
 inline bool isSysFolder(const TQString &sect)
125 125
 {
126
-    return i18n(KFI_KIO_FONTS_SYS)==sect || KFI_KIO_FONTS_SYS==sect;
126
+    return i18n(KFI_TDEIO_FONTS_SYS)==sect || KFI_TDEIO_FONTS_SYS==sect;
127 127
 }
128 128
 
129 129
 inline bool isUserFolder(const TQString &sect)
130 130
 {
131
-    return i18n(KFI_KIO_FONTS_USER)==sect || KFI_KIO_FONTS_USER==sect;
131
+    return i18n(KFI_TDEIO_FONTS_USER)==sect || KFI_TDEIO_FONTS_USER==sect;
132 132
 }
133 133
 
134 134
 static TQString removeMultipleExtension(const KURL &url)
@@ -289,10 +289,10 @@ static bool createFolderUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, c
289 289
 
290 290
         addAtom(entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime);
291 291
         addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, sys
292
-                                                ? KFI_KIO_FONTS_PROTOCOL"/system-folder" 
293
-                                                : KFI_KIO_FONTS_PROTOCOL"/folder");
292
+                                                ? KFI_TDEIO_FONTS_PROTOCOL"/system-folder" 
293
+                                                : KFI_TDEIO_FONTS_PROTOCOL"/folder");
294 294
         addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
295
-        TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
295
+        TQString url(KFI_TDEIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
296 296
         return true;
297 297
     }
298 298
     else if (sys && !Misc::root())   // Default system fonts folder does not actually exist yet!
@@ -303,7 +303,7 @@ static bool createFolderUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, c
303 303
         addAtom(entry, TDEIO::UDS_ACCESS, 0744);
304 304
         addAtom(entry, TDEIO::UDS_USER, 0, "root");
305 305
         addAtom(entry, TDEIO::UDS_GROUP, 0, "root");
306
-        addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KFI_KIO_FONTS_PROTOCOL"/system-folder");
306
+        addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KFI_TDEIO_FONTS_PROTOCOL"/system-folder");
307 307
         addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
308 308
 
309 309
         return true;
@@ -393,11 +393,11 @@ static bool createFontUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, TQV
393 393
             addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
394 394
             addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
395 395
 
396
-            TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
396
+            TQString url(KFI_TDEIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
397 397
 
398 398
             if(!Misc::root())
399 399
             {
400
-                url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER);
400
+                url+=sys ? i18n(KFI_TDEIO_FONTS_SYS) : i18n(KFI_TDEIO_FONTS_USER);
401 401
                 url+=TQString::fromLatin1("/");
402 402
             }
403 403
             if(multiple)
@@ -706,7 +706,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
706 706
 }
707 707
 
708 708
 CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app)
709
-         : TDEIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app),
709
+         : TDEIO::SlaveBase(KFI_TDEIO_FONTS_PROTOCOL, pool, app),
710 710
            itsRoot(Misc::root()),
711 711
            itsUsingFcFpe(false),
712 712
            itsUsingXfsFpe(false),
@@ -855,9 +855,9 @@ void CKioFonts::listDir(const KURL &url)
855 855
         {
856 856
             size=2;
857 857
             totalSize(size);
858
-            createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_USER), itsFolders[FOLDER_USER].location, false);
858
+            createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_USER), itsFolders[FOLDER_USER].location, false);
859 859
             listEntry(entry, false);
860
-            createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_SYS), itsFolders[FOLDER_SYS].location, true);
860
+            createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_SYS), itsFolders[FOLDER_SYS].location, true);
861 861
             listEntry(entry, false);
862 862
         }
863 863
 
@@ -896,13 +896,13 @@ void CKioFonts::stat(const KURL &url)
896 896
                     err=!createStatEntry(entry, url, FOLDER_SYS);
897 897
                 else
898 898
                     if(isUserFolder(pathList[0]))
899
-                        err=!createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_USER), itsFolders[FOLDER_USER].location, false);
899
+                        err=!createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_USER), itsFolders[FOLDER_USER].location, false);
900 900
                     else if(isSysFolder(pathList[0]))
901
-                        err=!createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_SYS), itsFolders[FOLDER_USER].location, true);
901
+                        err=!createFolderUDSEntry(entry, i18n(KFI_TDEIO_FONTS_SYS), itsFolders[FOLDER_USER].location, true);
902 902
                     else
903 903
                     {
904 904
                         error(TDEIO::ERR_SLAVE_DEFINED,
905
-                              i18n("Please specify \"%1\" or \"%2\".").arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
905
+                              i18n("Please specify \"%1\" or \"%2\".").arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS)));
906 906
                         return;
907 907
                     }
908 908
                 break;
@@ -1098,7 +1098,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
1098 1098
  
1099 1099
         if(passwd.isEmpty())
1100 1100
         {
1101
-            error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
1101
+            error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
1102 1102
             return;
1103 1103
         }
1104 1104
     }
@@ -1150,7 +1150,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
1150 1150
             }
1151 1151
             else
1152 1152
             {
1153
-                error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
1153
+                error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
1154 1154
                 return;
1155 1155
             }
1156 1156
         }
@@ -1165,7 +1165,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
1165 1165
             }
1166 1166
             else
1167 1167
             {
1168
-                error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_USER)));
1168
+                error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_USER)));
1169 1169
                 return;
1170 1170
             }
1171 1171
         }
@@ -1317,7 +1317,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
1317 1317
         return;
1318 1318
     }
1319 1319
 
1320
-    bool fromFonts=KFI_KIO_FONTS_PROTOCOL==src.protocol();
1320
+    bool fromFonts=KFI_TDEIO_FONTS_PROTOCOL==src.protocol();
1321 1321
 
1322 1322
     if((!fromFonts || updateFontList()) // CPD: dont update font list upon a copy from file - is too slow. Just stat on filename!
1323 1323
         &&  checkUrl(src) && checkAllowed(src))
@@ -1390,7 +1390,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
1390 1390
                     }
1391 1391
                     else
1392 1392
                     {
1393
-                        error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
1393
+                        error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
1394 1394
                         return;
1395 1395
                     }
1396 1396
                 }
@@ -1595,7 +1595,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
1595 1595
                     }
1596 1596
                     else
1597 1597
                     {
1598
-                        error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
1598
+                        error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
1599 1599
                         return;
1600 1600
                     }
1601 1601
                 }
@@ -1619,7 +1619,7 @@ void CKioFonts::del(const KURL &url, bool)
1619 1619
         TQValueList<FcPattern *>::Iterator it,
1620 1620
                                           end=entries->end();
1621 1621
         CDirList                          modifiedDirs;
1622
-        bool                              clearList=KFI_KIO_NO_CLEAR!=url.query();
1622
+        bool                              clearList=KFI_TDEIO_NO_CLEAR!=url.query();
1623 1623
 
1624 1624
         if(nonRootSys(url))
1625 1625
         {
@@ -1656,7 +1656,7 @@ void CKioFonts::del(const KURL &url, bool)
1656 1656
             if(doRootCmd(cmd))
1657 1657
                 modified(FOLDER_SYS, clearList, modifiedDirs);
1658 1658
             else
1659
-                error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
1659
+                error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_TDEIO_FONTS_SYS)));
1660 1660
         }
1661 1661
         else
1662 1662
         {
@@ -1905,7 +1905,7 @@ TQString CKioFonts::getRootPasswd(bool askPasswd)
1905 1905
     int           attempts=0;
1906 1906
     TQString       errorMsg;
1907 1907
 
1908
-    authInfo.url=KURL(KFI_KIO_FONTS_PROTOCOL ":///");
1908
+    authInfo.url=KURL(KFI_TDEIO_FONTS_PROTOCOL ":///");
1909 1909
     authInfo.username=SYS_USER;
1910 1910
     authInfo.keepPassword=true;
1911 1911
 
@@ -1964,19 +1964,19 @@ bool CKioFonts::confirmUrl(KURL &url)
1964 1964
                                                                 "case the font will only be usable by you), or \"%2\" ("
1965 1965
                                                                 "the font will be usable by all users - but you will "
1966 1966
                                                                 "need to know the administrator's password)?")
1967
-                                                               .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)),
1968
-                                                           i18n("Where to Install"), i18n(KFI_KIO_FONTS_USER),
1969
-                                                           i18n(KFI_KIO_FONTS_SYS));
1967
+                                                               .arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS)),
1968
+                                                           i18n("Where to Install"), i18n(KFI_TDEIO_FONTS_USER),
1969
+                                                           i18n(KFI_TDEIO_FONTS_SYS));
1970 1970
 
1971 1971
             if(changeToSystem)
1972 1972
             {
1973 1973
                 itsLastDest=DEST_SYS;
1974
-                url.setPath(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+url.fileName());
1974
+                url.setPath(TQChar('/')+i18n(KFI_TDEIO_FONTS_SYS)+TQChar('/')+url.fileName());
1975 1975
             }
1976 1976
             else
1977 1977
             {
1978 1978
                 itsLastDest=DEST_USER;
1979
-                url.setPath(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+url.fileName());
1979
+                url.setPath(TQChar('/')+i18n(KFI_TDEIO_FONTS_USER)+TQChar('/')+url.fileName());
1980 1980
             }
1981 1981
 
1982 1982
             KFI_DBUG << "Changed URL to:" << url.path() << endl;
@@ -2150,7 +2150,7 @@ bool CKioFonts::checkFile(const TQString &file)
2150 2150
 
2151 2151
 bool CKioFonts::getSourceFiles(const KURL &src, TQStringList &files)
2152 2152
 {
2153
-    if(KFI_KIO_FONTS_PROTOCOL==src.protocol())
2153
+    if(KFI_TDEIO_FONTS_PROTOCOL==src.protocol())
2154 2154
     {
2155 2155
         TQValueList<FcPattern *> *entries=getEntries(src);
2156 2156
 
@@ -2275,7 +2275,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map,
2275 2275
 // (such as there would be for a TTC font), then ask the user for confirmation of the action.
2276 2276
 bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFolder folder, EOp op)
2277 2277
 {
2278
-    if(KFI_KIO_FONTS_PROTOCOL!=url.protocol())
2278
+    if(KFI_TDEIO_FONTS_PROTOCOL!=url.protocol())
2279 2279
         return true;
2280 2280
 
2281 2281
     TQStringList::ConstIterator it,
@@ -2330,7 +2330,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFol
2330 2330
 
2331 2331
 bool CKioFonts::confirmMultiple(const KURL &url, TQValueList<FcPattern *> *patterns, EFolder folder, EOp op)
2332 2332
 {
2333
-    if(KFI_KIO_FONTS_PROTOCOL!=url.protocol())
2333
+    if(KFI_TDEIO_FONTS_PROTOCOL!=url.protocol())
2334 2334
         return true;
2335 2335
 
2336 2336
     TQStringList files;
@@ -2349,7 +2349,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, TQValueList<FcPattern *> *patte
2349 2349
 
2350 2350
 bool CKioFonts::checkUrl(const KURL &u, bool rootOk)
2351 2351
 {
2352
-    if(KFI_KIO_FONTS_PROTOCOL==u.protocol() && (!rootOk || (rootOk && "/"!=u.path())))
2352
+    if(KFI_TDEIO_FONTS_PROTOCOL==u.protocol() && (!rootOk || (rootOk && "/"!=u.path())))
2353 2353
     {
2354 2354
         TQString sect(getSect(u.path()));
2355 2355
 
@@ -2369,7 +2369,7 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk)
2369 2369
             if(!isSysFolder(sect) && !isUserFolder(sect))
2370 2370
             {
2371 2371
                 error(TDEIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".")
2372
-                      .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
2372
+                      .arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS)));
2373 2373
                 return false;
2374 2374
             }
2375 2375
     }
@@ -2379,17 +2379,17 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk)
2379 2379
 
2380 2380
 bool CKioFonts::checkAllowed(const KURL &u)
2381 2381
 {
2382
-    if (KFI_KIO_FONTS_PROTOCOL==u.protocol())
2382
+    if (KFI_TDEIO_FONTS_PROTOCOL==u.protocol())
2383 2383
     {
2384 2384
         TQString ds(Misc::dirSyntax(u.path()));
2385 2385
 
2386
-        if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) ||
2387
-           ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) ||
2388
-           ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
2389
-           ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
2386
+        if(ds==TQString(TQChar('/')+i18n(KFI_TDEIO_FONTS_USER)+TQChar('/')) ||
2387
+           ds==TQString(TQChar('/')+i18n(KFI_TDEIO_FONTS_SYS)+TQChar('/')) ||
2388
+           ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_TDEIO_FONTS_USER)+TQChar('/')) ||
2389
+           ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_TDEIO_FONTS_SYS)+TQChar('/')))
2390 2390
         {
2391 2391
             error(TDEIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
2392
-                  .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \
2392
+                  .arg(i18n(KFI_TDEIO_FONTS_USER)).arg(i18n(KFI_TDEIO_FONTS_SYS))); \
2393 2393
             return false;
2394 2394
         }
2395 2395
     }

+ 2
- 2
kcontrol/tdefontinst/tdeio/KioFonts.h View File

@@ -1,5 +1,5 @@
1
-#ifndef __KIO_FONTS_H__
2
-#define __KIO_FONTS_H__
1
+#ifndef __TDEIO_FONTS_H__
2
+#define __TDEIO_FONTS_H__
3 3
 
4 4
 ////////////////////////////////////////////////////////////////////////////////
5 5
 //

+ 1
- 1
kcontrol/tdefontinst/tdeio/Makefile.am View File

@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdeio_fonts.la
2 2
 tdeio_fonts_la_SOURCES = \
3 3
 KioFonts.cpp
4 4
 
5
-tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libtdefontinst.la
5
+tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_TDEIO) -ltdesu ../lib/libtdefontinst.la
6 6
 tdeio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
7 7
 AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
8 8
 

+ 1
- 1
kcontrol/tdefontinst/thumbnail/Makefile.am View File

@@ -1,7 +1,7 @@
1 1
 kde_module_LTLIBRARIES = fontthumbnail.la
2 2
 
3 3
 fontthumbnail_la_SOURCES = FontThumbnail.cpp
4
-fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libtdefontinst.la
4
+fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_TDEIO) ../lib/libtdefontinst.la
5 5
 fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
6 6
 METASOURCES = AUTO
7 7
 

+ 10
- 10
kcontrol/tdefontinst/viewpart/FontViewPart.cpp View File

@@ -59,7 +59,7 @@ static KURL getDest(const KURL &url, bool system)
59 59
 {
60 60
     return KURL(KFI::Misc::root()
61 61
                   ? TQString("fonts:/") + url.fileName()
62
-                  : TQString("fonts:/") + TQString(system ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER))
62
+                  : TQString("fonts:/") + TQString(system ? i18n(KFI_TDEIO_FONTS_SYS) : i18n(KFI_TDEIO_FONTS_USER))
63 63
                                        + TQChar('/') + url.fileName());
64 64
 }
65 65
 
@@ -122,7 +122,7 @@ bool CFontViewPart::openURL(const KURL &url)
122 122
     if (!url.isValid() || !closeURL())
123 123
         return false;
124 124
 
125
-    if(KFI_KIO_FONTS_PROTOCOL==url.protocol() || url.isLocalFile())
125
+    if(KFI_TDEIO_FONTS_PROTOCOL==url.protocol() || url.isLocalFile())
126 126
     {
127 127
         m_url=url;
128 128
         emit started(0);
@@ -150,7 +150,7 @@ bool CFontViewPart::openFile()
150 150
 void CFontViewPart::timeout()
151 151
 {
152 152
     bool showFs=false,
153
-         isFonts=KFI_KIO_FONTS_PROTOCOL==m_url.protocol();
153
+         isFonts=KFI_TDEIO_FONTS_PROTOCOL==m_url.protocol();
154 154
 
155 155
     itsShowInstallButton=false;
156 156
 
@@ -169,12 +169,12 @@ void CFontViewPart::timeout()
169 169
         }
170 170
         else
171 171
         {
172
-            destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
172
+            destUrl=TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
173 173
             if(TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
174 174
                 itsShowInstallButton=false;
175 175
             else
176 176
             {
177
-                destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
177
+                destUrl=TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
178 178
                 itsShowInstallButton=!TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
179 179
             }
180 180
         }
@@ -198,7 +198,7 @@ void CFontViewPart::previewStatus(bool st)
198 198
     itsInstallButton->setShown(st && itsShowInstallButton);
199 199
     itsToolsFrame->setShown(itsInstallButton->isShown()||itsFaceSelector->isShown());
200 200
     itsChangeTextAction->setEnabled(st);
201
-    itsPrintAction->setEnabled(st && KFI_KIO_FONTS_PROTOCOL==m_url.protocol());
201
+    itsPrintAction->setEnabled(st && KFI_TDEIO_FONTS_PROTOCOL==m_url.protocol());
202 202
 }
203 203
 
204 204
 void CFontViewPart::install()
@@ -211,10 +211,10 @@ void CFontViewPart::install()
211 211
                                                                    "password)")
212 212
                                                                    .arg(itsPreview->engine().getName(m_url))
213 213
                                                                    .arg(m_url.fileName())
214
-                                                                   .arg(i18n(KFI_KIO_FONTS_USER))
215
-                                                                   .arg(i18n(KFI_KIO_FONTS_SYS)),
216
-                                                              i18n("Install"), i18n(KFI_KIO_FONTS_USER),
217
-                                                              i18n(KFI_KIO_FONTS_SYS));
214
+                                                                   .arg(i18n(KFI_TDEIO_FONTS_USER))
215
+                                                                   .arg(i18n(KFI_TDEIO_FONTS_SYS)),
216
+                                                              i18n("Install"), i18n(KFI_TDEIO_FONTS_USER),
217
+                                                              i18n(KFI_TDEIO_FONTS_SYS));
218 218
 
219 219
     if(KMessageBox::Cancel!=resp)
220 220
     {

+ 3
- 3
kcontrol/tdefontinst/viewpart/Makefile.am View File

@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = libtdefontviewpart.la
7 7
 
8 8
 libtdefontviewpart_la_SOURCES = FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
9 9
 libtdefontviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
10
-libtdefontviewpart_la_LIBADD = $(LIB_KPARTS) libtdefontinstprint.la ../lib/libtdefontinst.la
10
+libtdefontviewpart_la_LIBADD = $(LIB_TDEPARTS) libtdefontinstprint.la ../lib/libtdefontinst.la
11 11
 
12 12
 noinst_HEADERS  = FontViewPart.h FontViewPartFactory.h FontPreview.h FontViewerApp.h KfiPrint.h
13 13
 
@@ -16,8 +16,8 @@ kde_services_DATA = tdefontviewpart.desktop
16 16
 AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
17 17
 METASOURCES = AUTO
18 18
 
19
-tdefontview_LDADD = $(LIB_KPARTS)
20
-tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
19
+tdefontview_LDADD = $(LIB_TDEPARTS)
20
+tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
21 21
 
22 22
 bin_PROGRAMS = tdefontview
23 23
 xdg_apps_DATA = tdefontview.desktop

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

@@ -17,7 +17,7 @@ kcm_tdeio_la_SOURCES = policydlg.cpp kcookiesmain.cpp kcookiespolicies.cpp \
17 17
       manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui
18 18
 
19 19
 kcm_tdeio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
20
-kcm_tdeio_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS)
20
+kcm_tdeio_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS)
21 21
 
22 22
 messages: rc.cpp
23 23
 	$(XGETTEXT) *.cpp -o $(podir)/kcmtdeio.pot

+ 2
- 2
kcontrol/tdeio/lanbrowser.desktop View File

@@ -104,10 +104,10 @@ Comment[de]=Einrichtung von LISa, resLISa und Ein-/Ausgabemodulen
104 104
 Comment[el]=Ρύθμιση του lisa, reslisa και των ioslaves
105 105
 Comment[eo]=Agordo de Lisa, Reslisa kaj la Enel-sklavoj
106 106
 Comment[es]=Configuración de lisa, reslisa y los ioslaves
107
-Comment[et]=Lisa, reslisa ja KIO moodulite seadistamine
107
+Comment[et]=Lisa, reslisa ja TDEIO moodulite seadistamine
108 108
 Comment[eu]=Konfiguratu lisa, reslisa eta ioslave-ak
109 109
 Comment[fa]=برپایی lisa، reslisa و ioslaves
110
-Comment[fi]=Lisan, Reslisan ja KIO-palveluiden asetukset
110
+Comment[fi]=Lisan, Reslisan ja TDEIO-palveluiden asetukset
111 111
 Comment[fr]=Configuration de LISa, ResLISa et des modules d'entrées-sorties
112 112
 Comment[fy]=Lisa, reslisa en de ioslaves ynstelle
113 113
 Comment[ga]=Socraigh lisa, reslisa agus ioslaves

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

@@ -5,7 +5,7 @@ kcm_tdm_la_SOURCES = background.cpp tdm-appear.cpp tdm-font.cpp tdm-shut.cpp \
5 5
 	tdm-users.cpp tdm-conv.cpp main.cpp kbackedcombobox.cpp
6 6
 
7 7
 kcm_tdm_la_LDFLAGS  = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined
8
-kcm_tdm_la_LIBADD = $(top_builddir)/kcontrol/background/libkcmbgnd.la $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) $(LIB_KNEWSTUFF)
8
+kcm_tdm_la_LIBADD = $(top_builddir)/kcontrol/background/libkcmbgnd.la $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_TDEIO) $(LIB_KNEWSTUFF)
9 9
 
10 10
 AM_CPPFLAGS= -I$(top_builddir)/kcontrol/background \
11 11
           -I$(top_srcdir)/kcontrol/background \

+ 1
- 1
kdcop/Makefile.am View File

@@ -10,7 +10,7 @@ INCLUDES = $(all_includes)
10 10
 bin_PROGRAMS = kdcop
11 11
 
12 12
 kdcop_SOURCES = kdcop.cpp kdcopwindow.cpp kdcoplistview.cpp kdcopview.ui
13
-kdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) -lDCOP $(LIB_QT)
13
+kdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) -lDCOP $(LIB_QT)
14 14
 
15 15
 noinst_HEADERS = kdcopwindow.h
16 16
 METASOURCES =	AUTO

+ 2
- 2
kdebugdialog/tdelistdebugdialog.h View File

@@ -17,8 +17,8 @@
17 17
     Boston, MA 02110-1301, USA.
18 18
 */
19 19
 
20
-#ifndef KLISTDEBUGDIALOG__H
21
-#define KLISTDEBUGDIALOG__H
20
+#ifndef TDELISTDEBUGDIALOG__H
21
+#define TDELISTDEBUGDIALOG__H
22 22
 
23 23
 #include "kabstractdebugdialog.h"
24 24
 #include <tqcheckbox.h>

+ 2
- 2
kdesktop/Makefile.am View File

@@ -2,7 +2,7 @@
2 2
 
3 3
 INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq -I$(top_srcdir)/tdmlib $(all_includes)
4 4
 kdesktop_la_LDFLAGS  = $(all_libraries) -module $(KDE_PLUGIN)
5
-kdesktop_la_LIBADD   = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/tdmlib/libdmctl.la $(LIB_XSS) $(LIB_KUTILS) $(LIB_XCURSOR)
5
+kdesktop_la_LIBADD   = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/tdmlib/libdmctl.la $(LIB_XSS) $(LIB_TDEUTILS) $(LIB_XCURSOR)
6 6
 
7 7
 SUBDIRS = . lock pics patterns programs init kwebdesktop
8 8
 
@@ -39,7 +39,7 @@ kcheckrunning_LDADD = $(LIB_X11) $(LIB_QT)
39 39
 
40 40
 kxdglauncher_SOURCES = kxdglauncher.cpp
41 41
 kxdglauncher_LDFLAGS = $(all_libraries)
42
-kxdglauncher_LDADD = $(LIB_KUTILS)
42
+kxdglauncher_LDADD = $(LIB_TDEUTILS)
43 43
 
44 44
 METASOURCES = AUTO
45 45
 

+ 1
- 1
kdesktop/kwebdesktop/Makefile.am View File

@@ -7,7 +7,7 @@ bin_PROGRAMS = 	kwebdesktop
7 7
 METASOURCES = AUTO
8 8
 
9 9
 kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc 
10
-kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
10
+kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
11 11
 
12 12
 kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
13 13
 kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs

+ 2
- 2
kdesktop/lock/Makefile.am View File

@@ -1,8 +1,8 @@
1 1
 ## Makefile.am of tdebase/kdesktop/lock
2 2
 
3 3
 INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/tdmlib $(GLINC) $(all_includes)
4
-kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
5
-kdesktop_lock_LDADD    = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
4
+kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
5
+kdesktop_lock_LDADD    = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LIB_TDEIO) $(LIB_XF86MISC) $(GLLIB)
6 6
 
7 7
 ####### Files
8 8
 

+ 2
- 2
kdialog/Makefile.am View File

@@ -4,8 +4,8 @@ INCLUDES = $(all_includes)
4 4
 bin_PROGRAMS = kdialog
5 5
 
6 6
 kdialog_SOURCES = kdialog.cpp widgets.cpp tdelistboxdialog.cpp progressdialog.cpp progressdialogiface.skel
7
-kdialog_LDADD = $(LIB_KIO)
8
-kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
7
+kdialog_LDADD = $(LIB_TDEIO)
8
+kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
9 9
 
10 10
 METASOURCES = AUTO
11 11
 

+ 2
- 2
kdialog/tdelistboxdialog.h View File

@@ -18,8 +18,8 @@
18 18
 //
19 19
 
20 20
 
21
-#ifndef _KLISTBOXDIALOG_H_
22
-#define _KLISTBOXDIALOG_H_
21
+#ifndef _TDELISTBOXDIALOG_H_
22
+#define _TDELISTBOXDIALOG_H_
23 23
 
24 24
 #include <kdialogbase.h>
25 25
 

+ 3
- 3
kfind/Makefile.am View File

@@ -14,7 +14,7 @@ kde_module_LTLIBRARIES = libkfindpart.la
14 14
 
15 15
 libkfindpart_la_SOURCES = kfindpart.cpp
16 16
 libkfindpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
17
-libkfindpart_la_LIBADD = libkfind_common.la $(LIB_KPARTS) $(top_builddir)/libkonq/libkonq.la 
17
+libkfindpart_la_LIBADD = libkfind_common.la $(LIB_TDEPARTS) $(top_builddir)/libkonq/libkonq.la 
18 18
 
19 19
 noinst_HEADERS	= kftabdlg.h kfind.h version.h kquery.h  kdatecombo.h
20 20
 
@@ -30,7 +30,7 @@ messages:
30 30
 
31 31
 bin_PROGRAMS = kfind
32 32
 kfind_SOURCES = kfwin.cpp kfinddlg.cpp main.cpp 
33
-kfind_LDADD   =  libkfind_common.la $(LIB_KPARTS)
33
+kfind_LDADD   =  libkfind_common.la $(LIB_TDEPARTS)
34 34
 
35 35
 # the library search path.
36
-kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
36
+kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+ 1
- 1
kfind/kfinddlg.cpp View File

@@ -189,7 +189,7 @@ void KfindDlg::slotResult(int errorCode)
189 189
   }
190 190
   else
191 191
   {
192
-     kdDebug()<<"KIO error code: "<<errorCode<<endl;
192
+     kdDebug()<<"TDEIO error code: "<<errorCode<<endl;
193 193
      setStatusMsg(i18n("Error."));
194 194
   };
195 195
 

+ 1
- 1
kfind/kquery.h View File

@@ -49,7 +49,7 @@ class KQuery : public TQObject
49 49
   /* List of files found using slocate */
50 50
   void slotListEntries(TQStringList);
51 51
  protected slots:
52
-  /* List of files found using KIO */
52
+  /* List of files found using TDEIO */
53 53
   void slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &);
54 54
   void slotResult(TDEIO::Job *);
55 55
   void slotCanceled(TDEIO::Job *);

+ 2
- 2
khelpcenter/DESIGN View File

@@ -219,7 +219,7 @@ regexp' or 'Search case sensitive'.
219 219
 # We could show them in a listview on the Search tab, each found search engine
220 220
 # being represented by a checkable listview item. So, we just let the user
221 221
 # enter a term, replace the \{@} placeholder in the URIs specified in the
222
-# selected .desktop files with that term, send out a request via KIO and show
222
+# selected .desktop files with that term, send out a request via TDEIO and show
223 223
 # the results in our TDEHTMLPart (after all KHC::View is a TDEHTMLPart already). A
224 224
 # problem with this: How to display the multiple HTML pages returned by the
225 225
 # selected search engines? Using a QSplitter to split multiple TDEHTMLParts?
@@ -237,7 +237,7 @@ regexp' or 'Search case sensitive'.
237 237
 # In additionl there could be a X-KHelpCenter-XSLT key which defines which .xslt
238 238
 # stylesheet to use for that particular search engine. We then query that search
239 239
 # engine by replacing the placeholder in the URI with whatever the user entered
240
-# and hand it to KIO. All the HTML returned by the various search engines gets
240
+# and hand it to TDEIO. All the HTML returned by the various search engines gets
241 241
 # then transformed into a custom, intermediate, XML dialect, using the XSLT
242 242
 # stylesheets define in the .desktop files. Using that intermediate step we
243 243
 # can nicely drop duplicate hits, for example, or create a list of hits in the

+ 3
- 3
khelpcenter/Makefile.am View File

@@ -6,7 +6,7 @@ METASOURCES = AUTO
6 6
 bin_PROGRAMS = khc_indexbuilder
7 7
 lib_LTLIBRARIES = 
8 8
 
9
-khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
9
+khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
10 10
 khc_indexbuilder_LDADD = $(LIB_TDECORE)
11 11
 khc_indexbuilder_SOURCES = khc_indexbuilder.cpp
12 12
 
@@ -27,14 +27,14 @@ khelpcenter_la_SOURCES = navigator.cpp \
27 27
 
28 28
 #kcm_helpcenter_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version \
29 29
 #                            $(all_libraries) -no-undefined
30
-#kcm_helpcenter_la_LIBADD  = $(LIB_KIO)
30
+#kcm_helpcenter_la_LIBADD  = $(LIB_TDEIO)
31 31
 #kcm_helpcenter_la_SOURCES = kcmhelpcenter.cpp docmetainfo.cpp \
32 32
 #                            docentrytraverser.cpp docentry.cpp htmlsearch.cpp \
33 33
 #                            htmlsearchconfig.cpp
34 34
 
35 35
 EXTRA_PROGRAMS = testmetainfo
36 36
 
37
-testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
37
+testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
38 38
 testmetainfo_LDADD = $(LIB_TDECORE) docentry.lo docmetainfo.lo \
39 39
                      docentrytraverser.lo htmlsearch.lo
40 40
 testmetainfo_SOURCES = testmetainfo.cpp

+ 3
- 3
khelpcenter/htmlsearch/Makefile.am View File

@@ -11,11 +11,11 @@ lib_LTLIBRARIES = libhtmlsearch.la libkcm_htmlsearch.la
11 11
 
12 12
 libhtmlsearch_la_SOURCES = htmlsearch.cpp progressdialog.cpp
13 13
 libhtmlsearch_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
14
-libhtmlsearch_la_LIBADD = $(LIB_KIO)
14
+libhtmlsearch_la_LIBADD = $(LIB_TDEIO)
15 15
 
16 16
 libkcm_htmlsearch_la_SOURCES = kcmhtmlsearch.cpp klangcombo.cpp ktagcombobox.cpp
17 17
 libkcm_htmlsearch_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
18
-libkcm_htmlsearch_la_LIBADD = $(LIB_KIO)
18
+libkcm_htmlsearch_la_LIBADD = $(LIB_TDEIO)
19 19
 
20 20
 noinst_HEADERS = kcmhtmlsearch.h htmlsearch.h
21 21
 
@@ -27,7 +27,7 @@ wrapperdir = $(kde_datadir)/khelpcenter/
27 27
 wrapper_SCRIPTS = meinproc_wrapper
28 28
 
29 29
 tdehtmlindex_SOURCES = index.cpp
30
-tdehtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
30
+tdehtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
31 31
 tdehtmlindex_LDADD = libhtmlsearch.la $(LIB_TDEUI)
32 32
 
33 33
 xpm_DATA = unchecked.xpm checked.xpm

+ 1
- 1
khotkeys/shared/Makefile.am View File

@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libkhotkeys_shared.la
3 3
 libkhotkeys_shared_la_SOURCES = action_data.cpp khotkeysglobal.cpp triggers.cpp windows.cpp \
4 4
     settings.cpp actions.cpp input.cpp conditions.cpp khlistview.cpp khlistbox.cpp \
5 5
     gestures.cpp voices.cpp voicesignature.cpp sound.cpp soundrecorder.cpp
6
-libkhotkeys_shared_la_LIBADD  = $(LIB_KIO) $(XTESTLIB) -lXext -lX11 $(X_PRE_LIBS)
6
+libkhotkeys_shared_la_LIBADD  = $(LIB_TDEIO) $(XTESTLIB) -lXext -lX11 $(X_PRE_LIBS)
7 7
 libkhotkeys_shared_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -version-info 1:0:0 -no-undefined
8 8
 
9 9
 INCLUDES = $(all_includes)

+ 2
- 2
kicker/applets/launcher/Makefile.am View File

@@ -15,8 +15,8 @@ EXTRA_DIST = $(lnk_DATA)
15 15
 
16 16
 launcher_panelapplet_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) -avoid-version -no-undefined
17 17
 launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la  ../../kicker/buttons/libkicker_buttons.la \
18
-				../../kicker/ui/libkicker_ui.la ../../libkicker/libkickermain.la $(LIB_KIO) \
19
-				$(LIB_KSYCOCA) $(LIB_TDEUI) $(LIB_KUTILS)
18
+				../../kicker/ui/libkicker_ui.la ../../libkicker/libkickermain.la $(LIB_TDEIO) \
19
+				$(LIB_TDESYCOCA) $(LIB_TDEUI) $(LIB_TDEUTILS)
20 20
 
21 21
 kde_kcfg_DATA = launcherapplet.kcfg
22 22
 

+ 1
- 1
kicker/applets/lockout/Makefile.am View File

@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = lockout_panelapplet.la
5 5
 
6 6
 lockout_panelapplet_la_SOURCES = lockout.cpp
7 7
 lockout_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
8
-lockout_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KSYCOCA)
8
+lockout_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDESYCOCA)
9 9
 
10 10
 noinst_HEADERS = lockout.h
11 11
 

+ 1
- 1
kicker/applets/media/Makefile.am View File

@@ -13,7 +13,7 @@ lnk_DATA = mediaapplet.desktop
13 13
 EXTRA_DIST = $(lnk_DATA)
14 14
 
15 15
 media_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
16
-media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_KUTILS)
16
+media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEUTILS)
17 17
 
18 18
 messages: rc.cpp
19 19
 	$(XGETTEXT) *.cpp *.h -o $(podir)/mediaapplet.pot

+ 1
- 1
kicker/applets/run/Makefile.am View File

@@ -13,7 +13,7 @@ lnk_DATA = runapplet.desktop
13 13
 EXTRA_DIST = $(lnk_DATA)
14 14
 
15 15
 run_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
16
-run_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
16
+run_panelapplet_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)
17 17
 
18 18
 messages:
19 19
 	$(XGETTEXT) *.cpp *.h -o $(podir)/krunapplet.pot

+ 1
- 1
kicker/applets/swallow/Makefile.am View File

@@ -3,7 +3,7 @@ INCLUDES = $(all_includes)
3 3
 kde_module_LTLIBRARIES = swallow_panelapplet.la
4 4
 
5 5
 swallow_panelapplet_la_LDFLAGS	= -module $(KDE_PLUGIN) $(all_libraries)
6
-swallow_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
6
+swallow_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
7 7
 
8 8
 swallow_panelapplet_la_SOURCES = swallow.cpp prefwidgetbase.ui prefwidget.cpp
9 9
 

+ 1
- 1
kicker/applets/systemtray/Makefile.am View File

@@ -14,7 +14,7 @@ lnk_DATA = systemtrayapplet.desktop
14 14
 EXTRA_DIST = $(lnk_DATA)
15 15
 
16 16
 systemtray_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
17
-systemtray_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KIO)
17
+systemtray_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_TDEIO)
18 18
 
19 19
 
20 20
 messages:

+ 0
- 0
kicker/applets/trash/Makefile.am View File


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

Loading…
Cancel
Save