Browse Source

Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 8 years ago
parent
commit
10308be19e
100 changed files with 583 additions and 584 deletions
  1. 1
    1
      COMPILING.html
  2. 3
    3
      COPYING
  3. 9
    9
      COPYING-DOCS
  4. 7
    7
      COPYING.LIB
  5. 1
    1
      DEBUG
  6. 2
    2
      INSTALL
  7. 32
    32
      KDE2PORTING.html
  8. 30
    30
      KDE3PORTING.html
  9. 2
    2
      Mainpage.dox
  10. 7
    7
      Makefile.am.in
  11. 3
    3
      README
  12. 5
    5
      TODO
  13. 1
    1
      arts/kde/kartsdispatcher.h
  14. 3
    3
      arts/kde/kartsserver.cpp
  15. 1
    1
      arts/kde/kartsserver.h
  16. 1
    1
      arts/kde/kaudioconverter.h
  17. 1
    1
      arts/kde/kaudiorecordstream.h
  18. 1
    1
      arts/kde/kconverttest.h
  19. 1
    1
      arts/kde/kioinputstream_impl.cpp
  20. 4
    4
      arts/kde/kplayobject.cc
  21. 2
    2
      arts/kde/kplayobject.h
  22. 1
    1
      arts/kde/kplayobjectcreator.h
  23. 1
    1
      arts/kde/kplayobjectfactory.cc
  24. 1
    1
      arts/kde/kplayobjectfactory_p.h
  25. 3
    3
      arts/kde/kvideowidget.cpp
  26. 1
    1
      arts/kde/kvideowidget.h
  27. 7
    7
      arts/knotify/knotify.cpp
  28. 2
    2
      arts/knotify/knotify.h
  29. 1
    1
      arts/message/artsmessage.cc
  30. 2
    2
      common_texts.cpp
  31. 2
    2
      config.h.cmake
  32. 8
    8
      configure.in.bot
  33. 1
    1
      configure.in.in
  34. 5
    5
      dcop/HOWTO
  35. 1
    1
      dcop/KDE-ICE/ICE-def.cpp
  36. 3
    3
      dcop/KDE-ICE/ICEmsg.h
  37. 1
    1
      dcop/KDE-ICE/ICEutil.h
  38. 4
    4
      dcop/KDE-ICE/Xtrans.c
  39. 10
    10
      dcop/KDE-ICE/Xtranssock.c
  40. 13
    13
      dcop/KDE-ICE/authutil.c
  41. 2
    2
      dcop/KDE-ICE/iceauth.c
  42. 2
    2
      dcop/KDE-ICE/listen.c
  43. 2
    2
      dcop/KDE-ICE/listenwk.c
  44. 1
    1
      dcop/KDE-ICE/locking.c
  45. 1
    1
      dcop/KDE-ICE/ping.c
  46. 1
    1
      dcop/KDE-ICE/watch.c
  47. 6
    6
      dcop/Mainpage.dox
  48. 4
    4
      dcop/client/README.dcop
  49. 22
    22
      dcop/client/dcop.cpp
  50. 10
    10
      dcop/client/dcopfind.cpp
  51. 1
    1
      dcop/client/dcopstart.cpp
  52. 19
    19
      dcop/client/marshall.cpp
  53. 10
    10
      dcop/dcopc.c
  54. 91
    91
      dcop/dcopclient.cpp
  55. 13
    14
      dcop/dcopclient.h
  56. 8
    8
      dcop/dcopidl/scanner.cc
  57. 2
    2
      dcop/dcopidl/scanner.ll
  58. 1
    1
      dcop/dcopidl/yacc.cc
  59. 1
    1
      dcop/dcopidl/yacc.yy
  60. 3
    3
      dcop/dcopidl2cpp/main.cpp
  61. 3
    3
      dcop/dcopidl2cpp/skel.cpp
  62. 6
    6
      dcop/dcopidl2cpp/stub.cpp
  63. 1
    1
      dcop/dcopidl2cpp/stubimpl.cpp
  64. 1
    1
      dcop/dcopidl2cpp/type.h
  65. 14
    14
      dcop/dcopidlng/kalyptus
  66. 19
    19
      dcop/dcopidlng/kdocAstUtil.pm
  67. 3
    3
      dcop/dcopidlng/kdocUtil.pm
  68. 6
    6
      dcop/dcopobject.cpp
  69. 3
    3
      dcop/dcopobject.h
  70. 4
    4
      dcop/dcopref.cpp
  71. 1
    1
      dcop/dcopref.h
  72. 41
    41
      dcop/dcopserver.cpp
  73. 8
    8
      dcop/dcopserver.h
  74. 1
    1
      dcop/dcopserver_win.cpp
  75. 10
    10
      dcop/dcopsignals.cpp
  76. 2
    2
      dcop/dcopstub.cpp
  77. 4
    4
      dcop/dcopstub.h
  78. 6
    6
      dcop/kdatastream.h
  79. 10
    10
      dcop/testdcop.cpp
  80. 2
    2
      dcop/testdcop.h
  81. 3
    3
      dcop/tests/testcases
  82. 2
    2
      dnssd/Mainpage.dox
  83. 1
    1
      dnssd/Makefile.am
  84. 1
    1
      dnssd/README
  85. 1
    1
      dnssd/domainbrowser.cpp
  86. 1
    1
      dnssd/domainbrowser.h
  87. 1
    1
      dnssd/query.h
  88. 2
    2
      dnssd/remoteservice.cpp
  89. 1
    1
      dnssd/responder.cpp
  90. 1
    1
      dnssd/responder.h
  91. 8
    8
      dnssd/servicebase.cpp
  92. 3
    3
      dnssd/servicebrowser.cpp
  93. 2
    2
      dnssd/servicebrowser.h
  94. 1
    1
      doc/common/Doxyfile.global
  95. 5
    5
      doc/common/README.Doxygen
  96. BIN
      doc/common/doctop1.png
  97. 9
    9
      doc/common/fdl-license
  98. 9
    9
      doc/common/fdl-license.html
  99. 3
    3
      doc/common/gpl-license
  100. 0
    0
      doc/common/gpl-license.html

+ 1
- 1
COMPILING.html View File

@@ -79,7 +79,7 @@ gmake
79 79
 gmake install </pre>
80 80
 
81 81
 <p>(On Linux, GNU make is the default make, and gmake in the above commands
82
-can be tqreplaced with make).
82
+can be replaced with make).
83 83
 
84 84
 <p>For Qt the magic sequence is:
85 85
 

+ 3
- 3
COPYING View File

@@ -65,7 +65,7 @@ modification follow.
65 65
 		    GNU GENERAL PUBLIC LICENSE
66 66
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
67 67
 
68
-  0. This License applies to any program or other work which tqcontains
68
+  0. This License applies to any program or other work which contains
69 69
 a notice placed by the copyright holder saying it may be distributed
70 70
 under the terms of this General Public License.  The "Program", below,
71 71
 refers to any such program or work, and a "work based on the Program"
@@ -102,7 +102,7 @@ above, provided that you also meet all of these conditions:
102 102
     stating that you changed the files and the date of any change.
103 103
 
104 104
     b) You must cause any work that you distribute or publish, that in
105
-    whole or in part tqcontains or is derived from the Program or any
105
+    whole or in part contains or is derived from the Program or any
106 106
     part thereof, to be licensed as a whole at no charge to all third
107 107
     parties under the terms of this License.
108 108
 
@@ -160,7 +160,7 @@ Sections 1 and 2 above provided that you also do one of the following:
160 160
 
161 161
 The source code for a work means the preferred form of the work for
162 162
 making modifications to it.  For an executable work, complete source
163
-code means all the source code for all modules it tqcontains, plus any
163
+code means all the source code for all modules it contains, plus any
164 164
 associated interface definition files, plus the scripts used to
165 165
 control compilation and installation of the executable.  However, as a
166 166
 special exception, the source code distributed need not include

+ 9
- 9
COPYING-DOCS View File

@@ -35,7 +35,7 @@ principally for works whose purpose is instruction or reference.
35 35
 1. APPLICABILITY AND DEFINITIONS
36 36
 
37 37
 This License applies to any manual or other work, in any medium, that
38
-tqcontains a notice placed by the copyright holder saying it can be
38
+contains a notice placed by the copyright holder saying it can be
39 39
 distributed under the terms of this License.  Such a notice grants a
40 40
 world-wide, royalty-free license, unlimited in duration, to use that
41 41
 work under the conditions stated herein.  The "Document", below,
@@ -51,7 +51,7 @@ modifications and/or translated into another language.
51 51
 A "Secondary Section" is a named appendix or a front-matter section of
52 52
 the Document that deals exclusively with the relationship of the
53 53
 publishers or authors of the Document to the Document's overall subject
54
-(or to related matters) and tqcontains nothing that could fall directly
54
+(or to related matters) and contains nothing that could fall directly
55 55
 within that overall subject.  (Thus, if the Document is in part a
56 56
 textbook of mathematics, a Secondary Section may not explain any
57 57
 mathematics.)  The relationship could be a matter of historical
@@ -104,7 +104,7 @@ the text near the most prominent appearance of the work's title,
104 104
 preceding the beginning of the body of the text.
105 105
 
106 106
 A section "Entitled XYZ" means a named subunit of the Document whose
107
-title either is precisely XYZ or tqcontains XYZ in parentheses following
107
+title either is precisely XYZ or contains XYZ in parentheses following
108 108
 text that translates XYZ in another language.  (Here XYZ stands for a
109 109
 specific section name mentioned below, such as "Acknowledgements",
110 110
 "Dedications", "Endorsements", or "History".)  To "Preserve the Title"
@@ -237,7 +237,7 @@ of these sections as invariant.  To do this, add their titles to the
237 237
 list of Invariant Sections in the Modified Version's license notice.
238 238
 These titles must be distinct from any other section titles.
239 239
 
240
-You may add a section Entitled "Endorsements", provided it tqcontains
240
+You may add a section Entitled "Endorsements", provided it contains
241 241
 nothing but endorsements of your Modified Version by various
242 242
 parties--for example, statements of peer review or that the text has
243 243
 been approved by an organization as the authoritative definition of a
@@ -250,7 +250,7 @@ Front-Cover Text and one of Back-Cover Text may be added by (or
250 250
 through arrangements made by) any one entity.  If the Document already
251 251
 includes a cover text for the same cover, previously added by you or
252 252
 by arrangement made by the same entity you are acting on behalf of,
253
-you may not add another; but you may tqreplace the old one, on explicit
253
+you may not add another; but you may replace the old one, on explicit
254 254
 permission from the previous publisher that added the old one.
255 255
 
256 256
 The author(s) and publisher(s) of the Document do not by this License
@@ -268,7 +268,7 @@ list them all as Invariant Sections of your combined work in its
268 268
 license notice, and that you preserve all their Warranty Disclaimers.
269 269
 
270 270
 The combined work need only contain one copy of this License, and
271
-multiple identical Invariant Sections may be tqreplaced with a single
271
+multiple identical Invariant Sections may be replaced with a single
272 272
 copy.  If there are multiple Invariant Sections with the same name but
273 273
 different contents, make the title of each such section unique by
274 274
 adding at the end of it, in parentheses, the name of the original
@@ -286,7 +286,7 @@ Entitled "Endorsements".
286 286
 6. COLLECTIONS OF DOCUMENTS
287 287
 
288 288
 You may make a collection consisting of the Document and other documents
289
-released under this License, and tqreplace the individual copies of this
289
+released under this License, and replace the individual copies of this
290 290
 License in the various documents with a single copy that is included in
291 291
 the collection, provided that you follow the rules of this License for
292 292
 verbatim copying of each of the documents in all other respects.
@@ -382,7 +382,7 @@ license notices just after the title page:
382 382
     Free Documentation License".
383 383
 
384 384
 If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
385
-tqreplace the "with...Texts." line with this:
385
+replace the "with...Texts." line with this:
386 386
 
387 387
     with the Invariant Sections being LIST THEIR TITLES, with the
388 388
     Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
@@ -391,7 +391,7 @@ If you have Invariant Sections without Cover Texts, or some other
391 391
 combination of the three, merge those two alternatives to suit the
392 392
 situation.
393 393
 
394
-If your document tqcontains nontrivial examples of program code, we
394
+If your document contains nontrivial examples of program code, we
395 395
 recommend releasing these examples in parallel under your choice of
396 396
 free software license, such as the GNU General Public License,
397 397
 to permit their use in free software.

+ 7
- 7
COPYING.LIB View File

@@ -99,7 +99,7 @@ will lead to faster development of free libraries.
99 99
   The precise terms and conditions for copying, distribution and
100 100
 modification follow.  Pay close attention to the difference between a
101 101
 "work based on the library" and a "work that uses the library".  The
102
-former tqcontains code derived from the library, while the latter only
102
+former contains code derived from the library, while the latter only
103 103
 works together with the library.
104 104
 
105 105
   Note that it is possible for a library to be covered by the ordinary
@@ -109,7 +109,7 @@ General Public License rather than by this special one.
109 109
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
110 110
 
111 111
   0. This License Agreement applies to any software library which
112
-tqcontains a notice placed by the copyright holder or other authorized
112
+contains a notice placed by the copyright holder or other authorized
113 113
 party saying it may be distributed under the terms of this Library
114 114
 General Public License (also called "this License").  Each licensee is
115 115
 addressed as "you".
@@ -128,7 +128,7 @@ included without limitation in the term "modification".)
128 128
 
129 129
   "Source code" for a work means the preferred form of the work for
130 130
 making modifications to it.  For a library, complete source code means
131
-all the source code for all modules it tqcontains, plus any associated
131
+all the source code for all modules it contains, plus any associated
132 132
 interface definition files, plus the scripts used to control compilation
133 133
 and installation of the library.
134 134
 
@@ -230,7 +230,7 @@ source code from the same place satisfies the requirement to
230 230
 distribute the source code, even though third parties are not
231 231
 compelled to copy the source along with the object code.
232 232
 
233
-  5. A program that tqcontains no derivative of any portion of the
233
+  5. A program that contains no derivative of any portion of the
234 234
 Library, but is designed to work with the Library by being compiled or
235 235
 linked with it, is called a "work that uses the Library".  Such a
236 236
 work, in isolation, is not a derivative work of the Library, and
@@ -238,7 +238,7 @@ therefore falls outside the scope of this License.
238 238
 
239 239
   However, linking a "work that uses the Library" with the Library
240 240
 creates an executable that is a derivative of the Library (because it
241
-tqcontains portions of the Library), rather than a "work that uses the
241
+contains portions of the Library), rather than a "work that uses the
242 242
 library".  The executable is therefore covered by this License.
243 243
 Section 6 states terms for distribution of such executables.
244 244
 
@@ -250,7 +250,7 @@ linked without the Library, or if the work is itself a library.  The
250 250
 threshold for this to be true is not precisely defined by law.
251 251
 
252 252
   If such an object file uses only numerical parameters, data
253
-structure tqlayouts and accessors, and small macros and small inline
253
+structure layouts and accessors, and small macros and small inline
254 254
 functions (ten lines or less in length), then the use of the object
255 255
 file is unrestricted, regardless of whether it is legally a derivative
256 256
 work.  (Executables containing this object code plus portions of the
@@ -329,7 +329,7 @@ permitted, and provided that you do these two things:
329 329
 
330 330
     b) Give prominent notice with the combined library of the fact
331 331
     that part of it is a work based on the Library, and explaining
332
-    where to tqfind the accompanying uncombined form of the same work.
332
+    where to find the accompanying uncombined form of the same work.
333 333
 
334 334
   8. You may not copy, modify, sublicense, link with, or distribute
335 335
 the Library except as expressly provided under this License.  Any

+ 1
- 1
DEBUG View File

@@ -115,7 +115,7 @@ a crash you are just in time to start your debugger.
115 115
 
116 116
 First lets attach gdb to an application that hasn't crashed (yet).
117 117
 
118
-You start with tqfinding the process of the application with e.g. "ps -aux":
118
+You start with finding the process of the application with e.g. "ps -aux":
119 119
 
120 120
 > ps -aux | grep kedit 
121 121
 bastian  21570 15.1  6.8 13740 8800 pts/6    S    15:34   0:01 kedit

+ 2
- 2
INSTALL View File

@@ -17,7 +17,7 @@ reconfiguring, and a file `config.log' containing compiler output
17 17
 to figure out how `configure' could check whether to do them, and mail
18 18
 diffs or instructions to the address given in the `README' so they can
19 19
 be considered for the next release.  If at some point `config.cache'
20
-tqcontains results you don't want to keep, you may remove or edit it.
20
+contains results you don't want to keep, you may remove or edit it.
21 21
 
22 22
    The file `configure.in' is used to create `configure' by a program
23 23
 called `autoconf'.  You only need `configure.in' if you want to change
@@ -107,7 +107,7 @@ is something like `gnu-as' or `x' (for the X Window System).  The
107 107
 package recognizes.
108 108
 
109 109
    For packages that use the X Window System, `configure' can usually
110
-tqfind the X include and library files automatically, but if it doesn't,
110
+find the X include and library files automatically, but if it doesn't,
111 111
 you can use the `configure' options `--x-includes=DIR' and
112 112
 `--x-libraries=DIR' to specify their locations.
113 113
 

+ 32
- 32
KDE2PORTING.html View File

@@ -7,7 +7,7 @@
7 7
 
8 8
 <H2>Porting Applications to KDE 2.0</H2>
9 9
 <H3>Last Modified on November 28, 2000</H3>
10
-This document tqcontains the changes you have to apply to programs written for
10
+This document contains the changes you have to apply to programs written for
11 11
 KDE1.1 when you want to port them to KDE2.0.<P>
12 12
 
13 13
 As a start you should have a look at doc/porting.doc in the Qt package,
@@ -18,7 +18,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
18 18
 <UL>
19 19
 <LI><A HREF="#gettingstarted">Getting Started</A></LI>
20 20
 <LI><A HREF="#general">Global changes</A></LI>
21
-<LI><A HREF="#autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></LI>
21
+<LI><A HREF="#automoc">automoc/am_edit, Makefile.am tags</A></LI>
22 22
 <LI><A HREF="#KApplication">KApplication</A></LI>
23 23
 <LI><A HREF="#KCmdLineArgs">KCmdLineArgs</A></LI>
24 24
 <LI><A HREF="#KLocale">KLocale</A></LI>
@@ -95,12 +95,12 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
95 95
 
96 96
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
97 97
 
98
-<H3><A NAME="autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></H3>
98
+<H3><A NAME="automoc">automoc/am_edit, Makefile.am tags</A></H3>
99 99
 
100
-  On the subject of the compilation framework, autotqmoc has been removed from
101
-  the admin directory. It has been tqreplaced by am_edit which provides a lot of
100
+  On the subject of the compilation framework, automoc has been removed from
101
+  the admin directory. It has been replaced by am_edit which provides a lot of
102 102
   additional features.<P>
103
-  METASOURCES=AUTO still does the job of generating the appropriate tqmoc files,
103
+  METASOURCES=AUTO still does the job of generating the appropriate moc files,
104 104
   but in addition, you should use KDE_ICON for the icons representing the application
105 105
   (and naming those icons conforming to lo16-app-&lt;appname&gt;.png), and install
106 106
   the application-specific icons under $(kde_datadir)/&lt;appname&gt;/pics.
@@ -110,7 +110,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
110 110
 <H3><A NAME="KApplication">KApplication</A></H3>
111 111
 
112 112
   doesn't hold any longer a KLocale instance. With this getLocale()
113
-  and isLocaleInstantiated are now tqreplaced by KGlobal::locale()<P>
113
+  and isLocaleInstantiated are now replaced by KGlobal::locale()<P>
114 114
 
115 115
   it also doesn't hold a KiconLoader instance. As this also getIconLoader()
116 116
   has been removed. Replace kapp-&gt;getIconLoader()-&gt;loadIcon() with
@@ -118,7 +118,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
118 118
 
119 119
   kde_*dir() have been removed as they require a unique top level directory
120 120
   for all applications (KDEDIR). This concept doesn't exist in KDE 2.0
121
-  any more, it has been tqreplaced with "multiple levels of directories",
121
+  any more, it has been replaced with "multiple levels of directories",
122 122
   set in KDEDIRS, so that it's possible to have global settings and
123 123
   group settings, applied before user settings.<P>
124 124
 
@@ -174,7 +174,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
174 174
   In return for this information you can query KCmdLineArgs whether an 
175 175
   certain option was specified on the command line and your application 
176 176
   now automatically supports --help and --version. It aborts with a
177
-  useful error message when the command line tqcontains a syntax error.
177
+  useful error message when the command line contains a syntax error.
178 178
   See kdelibs/kdecore/kcmdlineargs.h for more info.<P>
179 179
 
180 180
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -185,11 +185,11 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
185 185
 
186 186
   KApplication::getApplication()-&gt;getLocale()-&gt;translate<P>
187 187
 
188
-  but a function on its own. klocale is obsolete and tqreplace every call
188
+  but a function on its own. klocale is obsolete and replace every call
189 189
   to klocale-&gt;translate with i18n.<P>
190 190
 
191 191
   The return value of i18n is also no longer a const char*,
192
-  but a tqunicode TQString.<P>
192
+  but a unicode TQString.<P>
193 193
 
194 194
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
195 195
 
@@ -230,7 +230,7 @@ must have created a KApplication object before the methods can be used.<P>
230 230
 <H3><A NAME="KIconLoader">KIconLoader</A></H3>
231 231
 
232 232
 KIconLoader in 1.1 used to mix icons for applications and for toolbars.
233
-This has changed, so you may notice that your application doesn't tqfind
233
+This has changed, so you may notice that your application doesn't find
234 234
 the right icons. loadIcon (used by BarIcon) returns only toolbar icons.<P>
235 235
 If you need icons for applications, use loadApplicationIcon.<P>
236 236
 loadMiniIcon and loadApplicationMiniIcon have been removed, instead
@@ -248,12 +248,12 @@ in stripping off the .xpm part<P>
248 248
 
249 249
 <H3><A NAME="KTMainWindow">KTMainWindow</A></H3>
250 250
 
251
-KTMainWindow has been tqreplaced with KMainWindow.<p>
251
+KTMainWindow has been replaced with KMainWindow.<p>
252 252
 
253 253
 The KMainWindow constructor needs a parent widget as first argument. 
254 254
 You can use 0 for this.<p>
255
-setView() has been tqreplaced with setCentralWidget().<p>
256
-view() has been tqreplaced with centralWidget().<p>
255
+setView() has been replaced with setCentralWidget().<p>
256
+view() has been replaced with centralWidget().<p>
257 257
 addToolBar() has been removed, it is not needed any more.<p>
258 258
 setMenu(...) has been removed, it is not needed any more.<p>
259 259
 setStatusBar(...) has been removed, it is not needed any more.<p>
@@ -349,7 +349,7 @@ This makes KRun the recommended way to run another program in KDE 2.
349 349
 
350 350
 <H3><A NAME="khtmlw">khtmlw</A></H3>
351 351
 
352
-khtmlw has been tqreplaced with khtml.<BR>
352
+khtmlw has been replaced with khtml.<BR>
353 353
 <UL>
354 354
 	<LI>KHTMLView has vanished. Just use KHTMLWidget, which does scrollbar
355 355
   managing for free.
@@ -371,11 +371,11 @@ khtmlw has been tqreplaced with khtml.<BR>
371 371
   also exist in a const char * version.<P>
372 372
 
373 373
 
374
-<LI>you won't need the getKHTMLWiget function anymore. Just tqreplace
374
+<LI>you won't need the getKHTMLWiget function anymore. Just replace
375 375
 	getKHTMLWidget-&gt;xxx() with xxx()<P>
376 376
 <LI>xxx(TQString) -&gt; xxx(const TQString &amp;)<P>
377 377
 <LI>consistent naming. All getXyz() functions are renamed to xyz()<P>
378
-<LI>tqreplaced/changed functions:<P>
378
+<LI>replaced/changed functions:<P>
379 379
 <TABLE BORDER="1">
380 380
 <TR>
381 381
 <TD>KHTMLWidget::setDefaultFontBase()</TD>
@@ -390,7 +390,7 @@ khtmlw has been tqreplaced with khtml.<BR>
390 390
 <TD>-&gt; TQString selectedText()</TD>
391 391
 </TR>
392 392
 <TR>
393
-<TD COLSPAN="2" ROWSPAN="0">tqfindTextEnd() has vanished. just remove the call from your code</TD>
393
+<TD COLSPAN="2" ROWSPAN="0">findTextEnd() has vanished. just remove the call from your code</TD>
394 394
 </TR>
395 395
 <TR>
396 396
 <TD>gotoXY(x, y)</TD>
@@ -413,7 +413,7 @@ khtmlw has been tqreplaced with khtml.<BR>
413 413
 
414 414
 <H3><A NAME="KIntegerLine">KIntegerLine, KIntLineEdit</A></H3>
415 415
 
416
-  KIntegerLine and KIntLineEdit  have been tqreplaced by KIntNumInput.
416
+  KIntegerLine and KIntLineEdit  have been replaced by KIntNumInput.
417 417
   The new header file is called knuminput.h.<P>
418 418
 
419 419
   The new KIntNumInput can have an optional slider attached, ensures
@@ -474,7 +474,7 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
474 474
   These classes have been largely re-implemented.  The external API
475 475
   remains mostly the same, with the single notable change that
476 476
   the groupIterator and entryIterator methods have been removed and
477
-  instead tqreplaced by groupList (which returns a TQStringList of groups)
477
+  instead replaced by groupList (which returns a TQStringList of groups)
478 478
   and entryMap(const TQString &amp;group) (which returns a TQMap of entries
479 479
   in the specified group).  This is due to internal changes in KConfig
480 480
   which would make providing iterators possibly rather difficult.<P>
@@ -533,7 +533,7 @@ Note that the best way to write new dialogs is to use KDialogBase (see kdialogba
533 533
 The kcharsets class has been completely rewritten, and most of it has
534 534
 vanished, since support for it moved to Qt.<P>
535 535
 
536
-Most applications will only need to tqreplace kapp-&gt;getKCharsets() with
536
+Most applications will only need to replace kapp-&gt;getKCharsets() with
537 537
 KGlobal::charsets().<P>
538 538
 
539 539
 For conversion of various input formats to QStrings, please have a
@@ -544,7 +544,7 @@ changed from convertTag to fromEntity and toEntity.<P>
544 544
 
545 545
 To get a font, which can display a certain charset (if such a font
546 546
 exists), you can use the KCharsets::setQFont methods. Input is a font and
547
-a charset. Kcharsets tries to tqfind an output font, which matches the
547
+a charset. Kcharsets tries to find an output font, which matches the
548 548
 input font most closely, but can display the given charset.<P>
549 549
 
550 550
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -555,13 +555,13 @@ KWizard is based on TQWizard now. The API has changed. Consult Qt's
555 555
 documentation and kdelibs/kdetest/kwizardtest.cpp for an example use.<P>
556 556
 KNoteBook (deeply entwined with the former KWizard) has been removed until
557 557
 someone is willing to port it to work with the new wizard. If you want to
558
-use it you'll tqfind the necessary files in kdegraphics/kiconedit.<P>
558
+use it you'll find the necessary files in kdegraphics/kiconedit.<P>
559 559
 
560 560
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
561 561
 
562 562
 <H3><A NAME="KSpinBox">KSpinBox, KNumericSpinBox</A></H3>
563 563
 
564
-These classes have been tqreplaced by TQSpinBox. API is almost the same
564
+These classes have been replaced by TQSpinBox. API is almost the same
565 565
 HINTS:<P>
566 566
 <UL>
567 567
 	<LI>valueincreased()/valuedecreased -&gt; valueChanged()
@@ -607,7 +607,7 @@ KListView has no addChild(), insertItem() and removeItem() calls. Inserting
607 607
 a root item is done by constructing a TQListViewItem with the KListView
608 608
 passed as the parent widget. adding a child item is done by constructing
609 609
 a TQListViewItem with the parent item as parameter. removeItem() should
610
-be tqreplaced by delete &lt;pointer to item&gt;.<P>
610
+be replaced by delete &lt;pointer to item&gt;.<P>
611 611
 
612 612
 The root items are not shown in a tree fashion by default. to get this,
613 613
 use KListView::setDecorativeRoot(true).<P>
@@ -642,7 +642,7 @@ KComboBox::setEditText.<P>
642 642
 
643 643
 <H3><A NAME="KQuickHelp">KQuickHelp</A></H3>
644 644
 
645
-KQuickHelp, the "super-tooltip" widget, has been tqreplaced by TQWhatsThis.
645
+KQuickHelp, the "super-tooltip" widget, has been replaced by TQWhatsThis.
646 646
 It provides a compatible API and almost the same look and feel, in addition
647 647
 to some new functionality.<P>
648 648
 
@@ -685,7 +685,7 @@ unbalancedGradient(), hash(), desaturate(), pattern(), fade(), blend() etc.<P>
685 685
 
686 686
 <H3><A NAME="KTabListBox">KTabListBox</A></H3>
687 687
 
688
-This widget has been tqreplaced by the almighty KListView. Everything said
688
+This widget has been replaced by the almighty KListView. Everything said
689 689
 about KTreeList could be repeated here. The good thing is, that you now
690 690
 can combine TreeView's and normal Tablists without problems.<P>
691 691
 
@@ -716,7 +716,7 @@ The file has been removed completely, use TQString instead. (<A HREF="mailto:mir
716 716
 
717 717
 <H3><A NAME="ktopwidget">ktopwidget.h / KTopWidget</A></H3>
718 718
 
719
-KMainWindow tqreplaces this class completely. ktopwidget.h does not
719
+KMainWindow replaces this class completely. ktopwidget.h does not
720 720
 exist in KDE 2. (<A HREF="mailto:mirko@kde.org">mirko@kde.org</A>)<P>
721 721
 
722 722
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -726,7 +726,7 @@ exist in KDE 2. (<A HREF="mailto:mirko@kde.org">mirko@kde.org</A>)<P>
726 726
 Since Qt 2.0, the class TQToolButton provides the functionality of
727 727
 buttons that raise when the mouse is moved over them, so there is no
728 728
 reason to have a class providing the same feature in KDE libs. All
729
-occurrences of KButton in the KDE CVS have been tqreplaced by QToolButtons,
729
+occurrences of KButton in the KDE CVS have been replaced by QToolButtons,
730 730
 but for applications not in the CVS it has to be done by the respective
731 731
 developer. (<A HREF="mailto:mirko@kde.org">mirko@kde.org</A>)<P>
732 732
 
@@ -836,7 +836,7 @@ in this class. This slot is called each time the selected file/dir changes.
836 836
 In this slot you have to react appropriate (i.e. show the preview :). The
837 837
 easiest way this can be done is to derive your class from TQWidgetStack and 
838 838
 add a Object (derived from TQWidget) for each file type. In the showPreview
839
-method you just raise the matching widget. If you can't tqfind an appropriate
839
+method you just raise the matching widget. If you can't find an appropriate
840 840
 widget just hide() the widget stack.<P>
841 841
 If you need some "inspiration" on how that could be done, please have a look
842 842
 at koffice/lib/kofficecore/koFilterManager.cc (PreviewStack).<P>
@@ -913,7 +913,7 @@ KImageIO has moved from 'kimgio.h' to 'kimageio.h'. LIB_KIMGIO does no longer
913 913
 exists, you need to link against LIB_KSYCOCA instead.
914 914
 </p>
915 915
 <p>
916
-kimgioRegister() has been tqreplaced by KImageIO::registerFormats().
916
+kimgioRegister() has been replaced by KImageIO::registerFormats().
917 917
 </p>
918 918
 
919 919
 <p>

+ 30
- 30
KDE3PORTING.html View File

@@ -6,7 +6,7 @@
6 6
 <BODY>
7 7
 
8 8
 <H2>Porting Applications to KDE 3.0</H2>
9
-This document tqcontains the changes you have to apply to programs written for
9
+This document contains the changes you have to apply to programs written for
10 10
 KDE 2.x when you want to port them to KDE 3.0.<P>
11 11
 
12 12
 As a start you should have a look at doc/porting.doc in the Qt package,
@@ -82,7 +82,7 @@ instead, everything else is source compatible.
82 82
 <LI>kdualcolorbtn.h is now kdualcolorbutton.h</LI>
83 83
 
84 84
 </UL>
85
-This is to help tqfinding out header files from class names and the other
85
+This is to help finding out header files from class names and the other
86 86
 way round. Compatibility headers have been created. You can use them as 
87 87
 long as you don't compile with KDE_NO_COMPAT.
88 88
 
@@ -90,13 +90,13 @@ long as you don't compile with KDE_NO_COMPAT.
90 90
 The file with the DCOP connection information has been renamed. The new
91 91
 name is $HOME/.DCOPserver_<hostname>_<display>. The screen part has been 
92 92
 stripped from <display> and the ':' character that separates host and
93
-display-number has been tqreplaced with a '_'. If you access DCOP via
93
+display-number has been replaced with a '_'. If you access DCOP via
94 94
 DCOPClient you do not need to change anything.
95 95
 <p>
96 96
 It is no longer possible to make calls to an application registered as
97 97
 "<appid>-<pid>" with "<appid>" only. The full name can be obtained by using
98
-either KApplication::startServiceBy...() or DCOPClient::tqfindObject() or 
99
-their command line equivalents "dcopstart" and "dcoptqfind".
98
+either KApplication::startServiceBy...() or DCOPClient::findObject() or 
99
+their command line equivalents "dcopstart" and "dcopfind".
100 100
 
101 101
 <H4>KLibFactory</H4>
102 102
 KLibFactory's create method is no more virtual and the createObject method
@@ -131,7 +131,7 @@ The old name will still work unless KDE_NO_COMPAT is defined.
131 131
 
132 132
 <H4>KMD5</H4>
133 133
 HASHHEX and HASH has been removed to make this class namespace clean. 
134
-They have been tqreplaced by TQCString and KMD5::Digest. <br>
134
+They have been replaced by TQCString and KMD5::Digest. <br>
135 135
 The API has been cleaned up, it is no longer necessary to call finalize(). 
136 136
 Simply remove any calls to it. 
137 137
 
@@ -143,9 +143,9 @@ setEncoding(int) instead.
143 143
 <li>formatNumber(const TQString &amp;) has been removed.
144 144
 <li>languages() has been removed. Use languageList() instead.
145 145
 <li>All references to monthName(), monthNamePossessive(), and weekDayName()
146
-should be tqreplaced with methods from KLocale::calendar().
146
+should be replaced with methods from KLocale::calendar().
147 147
 <li>Hard coded date handling or date handling with TQDate should in most
148
-cases be tqreplaced by methods in KLocale::calendar().
148
+cases be replaced by methods in KLocale::calendar().
149 149
 
150 150
 <H4>Accelerators Keys</H4>
151 151
 <h5>KAccel</h5>
@@ -160,12 +160,12 @@ not be available.
160 160
 		Key_Up, this, TQT_SLOT(scrollUp()) );
161 161
 </pre>
162 162
 	Note that a What's This parameter is now a part of the insert function.
163
-	You might tqreplace the TQString::null parameter with
163
+	You might replace the TQString::null parameter with
164 164
 	<pre> i18n("Scroll the current document's contents up by one line.") </pre>
165 165
 	for example.</li>
166 166
 	<li> KAccel::changeMenuAccel() has been deprecated because it was
167 167
 	never used in cvs.  If you've used it in your application, the following
168
-	can tqreplace it.  Note, however, that this would be handled automatically
168
+	can replace it.  Note, however, that this would be handled automatically
169 169
 	by using KAction instead.
170 170
 <pre>
171 171
 	- kaccel-&gt;changeMenuAccel( menu, id, "file_open" );
@@ -195,7 +195,7 @@ The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
195 195
 	<li><i>StdAccel::Insert</i> and the corresponding <i>insert()</i>
196 196
 	have been removed. (Nobody on the list knew what its function was
197 197
 	supposed to be.)  Calls to <i>insert()</i> and the equivalent
198
-	<i>key(KStdAccel::Insert)</i> can be tqreplaced with the former default
198
+	<i>key(KStdAccel::Insert)</i> can be replaced with the former default
199 199
 	of <i>Qt::CTRL+Qt::Key_Insert</i>.</li>
200 200
 	<li>The following functions have been deprecated and will need to be changed if KDE_NO_COMPAT is defined:
201 201
 		<table border=1>
@@ -206,7 +206,7 @@ The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
206 206
 			<tr><td>bool isEqual(const TQKeyEvent* pEvent, int keyQt)</td>
207 207
 				<td>The best method for replacing this varies.  One possibility is to use
208 208
 				<i>KKey(const TQKeyEvent*) == KKey(int)</i>.  Another is to use
209
-				<i>KShortcut::tqcontains( const KKey&/KKeySequence& )</i>.</td></tr>
209
+				<i>KShortcut::contains( const KKey&/KKeySequence& )</i>.</td></tr>
210 210
 			<tr><td>int key(StdAccel)</td><td>const KShortcut& shortcut(StdAccel)</td></tr>
211 211
 		</table></li-->
212 212
 </ul>
@@ -228,7 +228,7 @@ Use QPopupMenu/KPopupMenu or the XML-UI method for building menus.
228 228
 <H4>KAction</H4>
229 229
 <ul>
230 230
 	<li>The following methods have been deprecated and will need to be
231
-	tqreplaced if KDE_NO_COMPAT is defined.
231
+	replaced if KDE_NO_COMPAT is defined.
232 232
 		<table border=1>
233 233
 			<tr><th>Old</th><th>New</th></tr>
234 234
 			<tr><td>int accel()</td><td>const KShortcut&amp; shortcut()</td></tr>
@@ -256,14 +256,14 @@ single image-file that has been prepared with the kimage_concat tool.
256 256
 See kdelibs/pics/hicolor/kde for an example of its use.
257 257
 
258 258
 <H4>KContainerLayout</H4>
259
-This class has been removed, use Qt tqlayouts instead.
259
+This class has been removed, use Qt layouts instead.
260 260
 
261 261
 <H4>KCommand</H4>
262 262
 This class has been made lighter: the name isn't stored into the command anymore,
263 263
 but must be provided by the inherited class, as the result of the virtual name() function.
264 264
 This saves storing a TQString into each command in memory.
265 265
 The former behavior is available in the class KNamedCommand, so for a quick port
266
-simply tqreplace KCommand with KNamedCommand.
266
+simply replace KCommand with KNamedCommand.
267 267
 
268 268
 <H4>KDialogBase</H4>
269 269
 The deprecated getMainWidget() method has been removed. Use mainWidget() instead.
@@ -361,12 +361,12 @@ TQString&) is not a slot anymore.
361 361
   <li>KTarGz is now KTar (#define for source compatibility)</li>
362 362
   <li>A base class KArchive has been written, to support other archive formats in the future</li>
363 363
   <li>KTarEntry is now KArchiveEntry, KTarDirectory is now KArchiveDirectory, and KTarFile is now KArchiveFile.</li>
364
-  <li>The classes ProgressBase, tqStatusbarProgress and DefaultProgress have been moved to the KIO namespace.</li>
364
+  <li>The classes ProgressBase, StatusbarProgress and DefaultProgress have been moved to the KIO namespace.</li>
365 365
   <li>The signal KDirLister::started(const TQString &amp;url) has changed to KDirLister::started(const KURL &amp;url).<li>
366 366
   <li>KServiceTypeProfile::preferredService( const TQString &amp; serviceType, bool needApp ) has been removed, use
367 367
       KServiceTypeProfile::preferredService( ..., "Application") if needApp was true, or
368 368
       KServiceTypeProfile::preferredService( ..., TQString::null) if needApp was false.
369
-  <li>The following functions in KProtocolManager have been tqreplaced:
369
+  <li>The following functions in KProtocolManager have been replaced:
370 370
       <ul>
371 371
 <li>ftpProxy(), use proxyFor("ftp") instead.
372 372
 <li>httpProxy(), use proxyFor("http") instead.
@@ -498,11 +498,11 @@ The API has been cleaned up to be in line with the rest of kdelibs, in particula
498 498
 <H3><A NAME="khtmlpart">API-cleanups in KHTML</A></H3>
499 499
 
500 500
 There were a few relatively minor API-adjustements in KHTMLPart. In particular:
501
-<ul><li>enableJScript(bool) has been tqreplaced by setJScriptEnabled(bool)
502
-<li>enableJava(bool) has been tqreplaced by setJavaEnabled(bool)
503
-<li>enablePlugins(bool) has been tqreplaced by setPluginsEnabled(bool)
504
-<li>autoloadImages(bool) has been tqreplaced by setAutoloadImages(bool)
505
-<li>enableMetaRefresh(bool) has been tqreplaced by setMetaRefreshEnabled(bool)
501
+<ul><li>enableJScript(bool) has been replaced by setJScriptEnabled(bool)
502
+<li>enableJava(bool) has been replaced by setJavaEnabled(bool)
503
+<li>enablePlugins(bool) has been replaced by setPluginsEnabled(bool)
504
+<li>autoloadImages(bool) has been replaced by setAutoloadImages(bool)
505
+<li>enableMetaRefresh(bool) has been replaced by setMetaRefreshEnabled(bool)
506 506
 <li>setBaseURL and setBaseTarget have been removed. baseURL(), baseTarget() and
507 507
 completeURL() are remained for compatibility reasons, but they're deprecated now. use the variants in DOM::HTMLDocument() instead.
508 508
 <li>the second parameter of KHTMLPart::completeURL is removed. it didn't have
@@ -515,8 +515,8 @@ any problems. Backward compatibility exists for the common methods, to
515 515
 disable this use a #define KDE_NO_COMPAT.
516 516
 <p>In KHTMLView, the following changes were done:
517 517
 <ul>
518
-<li>gotoNextLink has been tqreplaced by gotoLink(true);
519
-<li>gotoPrevLink has been tqreplaced by gotoLink(false);
518
+<li>gotoNextLink has been replaced by gotoLink(true);
519
+<li>gotoPrevLink has been replaced by gotoLink(false);
520 520
 </ul>
521 521
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
522 522
 
@@ -531,7 +531,7 @@ parts are rarely used outside of kfile.
531 531
 <p>
532 532
 The changes are:
533 533
 <H4>KFileItem</H4>
534
-The KFileViewItem class is completely tqreplaced with KFileItem from kio. All its functionality has
534
+The KFileViewItem class is completely replaced with KFileItem from kio. All its functionality has
535 535
 been merged with its former base class KFileItem. Additionally, some of its methods have been
536 536
 modified:
537 537
 <table>
@@ -647,13 +647,13 @@ For more details please consult the HOWTO file in the kcontrol directory.
647 647
 
648 648
 <p>The API for Kicker panel applets and extensions has changed. Panels can now be
649 649
 left/top, center, or right/bottom aligned, and applets and extensions may receive
650
-notification about a change in tqalignment.
650
+notification about a change in alignment.
651 651
 
652 652
 <H4>KPanelApplet</H4>
653 653
 
654 654
 <p>The virtual methods orientationChange() and popupDirectionChange() are deprecated.
655
-Instead you should reimplement positionChange() and tqalignmentChange() to be
656
-notified of changes in the position and tqalignment of the panel on which your applet
655
+Instead you should reimplement positionChange() and alignmentChange() to be
656
+notified of changes in the position and alignment of the panel on which your applet
657 657
 resides. In addition, the popupDirection() method and the Direction enum are
658 658
 deprecated. Instead you should use the position() method and Position enum. Applets that use
659 659
 the deprecated methods will still work with KDE 3, but may not compile or work with
@@ -661,8 +661,8 @@ a future version.
661 661
 
662 662
 <H4>KPanelExtension</H4>
663 663
 
664
-<p>There is a new method tqalignmentChange() that your extension should reimplement if
665
-it needs to know about changes in tqalignment.
664
+<p>There is a new method alignmentChange() that your extension should reimplement if
665
+it needs to know about changes in alignment.
666 666
 
667 667
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
668 668
 <p>

+ 2
- 2
Mainpage.dox View File

@@ -1,7 +1,7 @@
1 1
 /**
2 2
 	* @mainpage The Trinity API Reference
3 3
 	*
4
-	* This section tqcontains the Trinity online class reference for the current
4
+	* This section contains the Trinity online class reference for the current
5 5
 	* development version of Trinity. You can also 
6 6
 	* download the complete API documentation from
7 7
         * <a target="_top" href="http://trinity.pearsoncomputing.net/">trinity.pearsoncomputing.net</a>.  Additionally, you 
@@ -57,7 +57,7 @@
57 57
 	*   <i>The Trinity resources system.</i>
58 58
 	* - <a target="_top" href="kutils/html/index.html"><b>kutils</b></a>
59 59
         *   (<a target="_top" href="kutils/html/classes.html">classes</a>)\n
60
-	*   <i>High-level utils, like search/tqreplace support.</i>
60
+	*   <i>High-level utils, like search/replace support.</i>
61 61
 	* - <a target="_top" href="arts/html/index.html"><b>arts</b></a>
62 62
         *   (<a target="_top" href="arts/html/classes.html">classes</a>)\n
63 63
 	*   <i>Trinity bindings for arts including knotify.</i>

+ 7
- 7
Makefile.am.in View File

@@ -40,8 +40,8 @@ pot_DATA = kde.pot
40 40
 
41 41
 messages:
42 42
 	cd kabc/scripts && perl ./makeaddressee
43
-	tqfind . -type d | grep -v '\.svn' | sed -e 's,$$,/,' > dirs
44
-	mfs=`tqfind . -name Makefile.am | xargs egrep -l '^messages:'` ;\
43
+	find . -type d | grep -v '\.svn' | sed -e 's,$$,/,' > dirs
44
+	mfs=`find . -name Makefile.am | xargs egrep -l '^messages:'` ;\
45 45
 	for dir in $$mfs; do \
46 46
 	  if test "$$dir" != "./Makefile.am"; then \
47 47
 	    dir=`dirname $$dir` ;\
@@ -50,11 +50,11 @@ messages:
50 50
 	done
51 51
 	fgrep -v "/tests" dirs > dirs.new && mv dirs.new dirs ;\
52 52
 	dirs=`cat dirs` ;\
53
-	tqfind $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\
54
-	tqfind $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
55
-	tqfind $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
53
+	find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\
54
+	find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
55
+	find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
56 56
 	echo ./kdecore/kde-config.cpp.in >> files ;\
57
-	$(EXTRACTRC) `tqfind $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
57
+	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
58 58
 	: > kde.pot ;\
59 59
 	$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/kdelibs.pot
60 60
 	$(XGETTEXT) common_texts.cpp -o kde.pot
@@ -81,7 +81,7 @@ qtmessages:
81 81
 	if test x$(top_srcdir) = x; then top_srcdir=. ; else top_srcdir=$(top_srcdir); fi ;\
82 82
 	cd $$top_srcdir/../qt-copy/src ;\
83 83
 	sed -e "s,#define,," xml/qxml.cpp  > qxml_clean.cpp ;\
84
-	tqfind . -name "*.cpp" | grep -v tqmoc_ > list ;\
84
+	find . -name "*.cpp" | grep -v moc_ > list ;\
85 85
 	for file in qfiledialog qcolordialog qprintdialog \
86 86
 		qurloperator qftp qhttp qlocal qerrormessage; do \
87 87
 		grep -v $$file list > list.new && mv list.new list ;\

+ 3
- 3
README View File

@@ -20,7 +20,7 @@ Here is an alphabetical list:
20 20
 * arts
21 21
     ARTS (analog realtime synthesizer) is a environment of small modules
22 22
     that one can plug together to process multimedia data. This directory
23
-    tqcontains KDE wrapper and KDE user interface elements for ARTS.
23
+    contains KDE wrapper and KDE user interface elements for ARTS.
24 24
 
25 25
 * dcop
26 26
     The desktop communication program allows even shell scripts to
@@ -86,7 +86,7 @@ Here is an alphabetical list:
86 86
 
87 87
 * kio
88 88
     Classes that fetch and decode URLs are contained here. This library also
89
-    tqcontains "ksycoca", the system configure cache containing services,
89
+    contains "ksycoca", the system configure cache containing services,
90 90
     applications, servicetypes and mimetypes.
91 91
 
92 92
 * kioslave
@@ -236,7 +236,7 @@ So, here are some tips on bug reporting:
236 236
   older, deprecated versions usually don't get that much attention :-)
237 237
 
238 238
 * Also the chance is high that another one experienced your problem. The
239
-  bug report wizard at http://bugs.kde.org will help you to tqfind out if your
239
+  bug report wizard at http://bugs.kde.org will help you to find out if your
240 240
   problem has already been reported.
241 241
 
242 242
 * The best bug report for a project based on voluntary work is of course one

+ 5
- 5
TODO View File

@@ -3,7 +3,7 @@ that we would like to make for the next binary incompatible release.
3 3
 
4 4
 - Check for forked classes in kde pim and other modules
5 5
 
6
-- There is no reason why KConfigBase should inherit from TQObject, get rid of that.
6
+- There is no reason why KConfigBase should inherit from QObject, get rid of that.
7 7
 
8 8
 - Change all FooPrivate *d; -> Private * const d; and place initialization
9 9
   in the constructor (for classes that would benefit from this).  To help catch silly
@@ -19,7 +19,7 @@ that we would like to make for the next binary incompatible release.
19 19
 - Remove all KDE_NO_COMPAT from the KDE2 -> KDE3 port before adding new ones for KDE4.
20 20
 
21 21
 - Remove the smart-to-dumb-pointer conversion operator from KSharedPtr
22
-  and tqreplace it with a T* Get() member function. An implict conversion is
22
+  and replace it with a T* Get() member function. An implict conversion is
23 23
   far too dangerous.
24 24
   See: http://groups.google.com/groups?selm=4ognb0%243cd%40linda.teleport.com&oe=UTF-8&output=gplain
25 25
   Also free the client from the requirement to inherit from KShared.
@@ -59,7 +59,7 @@ that we would like to make for the next binary incompatible release.
59 59
 
60 60
 - Manually, properly clean up the includes in all of the headers.  Remove
61 61
   unnecessary ones and change pointers to use class foo; decorations and move the 
62
-  headers into the cpp files.  When finished fixkdeincludes shouldn't tqfind
62
+  headers into the cpp files.  When finished fixkdeincludes shouldn't find
63 63
   anything (but don't rely on fixkdeinclude, it should be done manually first!)
64 64
 
65 65
 - Use of the C++ keyword "explicit". Make all ctors explicit which can be used
@@ -199,7 +199,7 @@ an alternative help->contents action)
199 199
 - Make sure all GUI classes adopt well to palette changes.
200 200
 
201 201
 - Rework KPanelExtension and KPanelApplet to have a sane set of global position
202
-  enums, make the tqgeometry handling less spaghetti like and extend the API so
202
+  enums, make the geometry handling less spaghetti like and extend the API so
203 203
   requests for things like re-reading the config of a KPanelExtension can be
204 204
   done by its parent.
205 205
 
@@ -212,7 +212,7 @@ an alternative help->contents action)
212 212
 - KListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
213 213
   "dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). Unless Qt4 does it all :)
214 214
 
215
-- Move KIO::findDeviceMountPoint, tqfindPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
215
+- Move KIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
216 216
   to merge that code.
217 217
 
218 218
 - Refactor the kio/bookmarks code so we don't need to use the static d-pointer trick anymore.

+ 1
- 1
arts/kde/kartsdispatcher.h View File

@@ -61,7 +61,7 @@ namespace Arts
61 61
  * }
62 62
  * \endcode
63 63
  */
64
-class KDE_EXPORT KArtsDispatcher : public TQObject
64
+class KDE_EXPORT KArtsDispatcher : public QObject
65 65
 {
66 66
 Q_OBJECT
67 67
 public:

+ 3
- 3
arts/kde/kartsserver.cpp View File

@@ -77,12 +77,12 @@ Arts::SoundServerV2 KArtsServer::server(void)
77 77
 
78 78
 	X11CommConfig.sync();
79 79
 	
80
-	proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper")));
80
+	proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper")));
81 81
 
82 82
 	if(rt)
83
-		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper")));
83
+		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper")));
84 84
 	else
85
-		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artsd")));
85
+		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd")));
86 86
 
87 87
 	proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );
88 88
 

+ 1
- 1
arts/kde/kartsserver.h View File

@@ -34,7 +34,7 @@
34 34
  * artsd on KDE startup, but at the very least there will always be third
35 35
  * party PlayObjects that will crash.  So, this is necessary.
36 36
  */
37
-class KDE_ARTS_EXPORT KArtsServer : public TQObject
37
+class KDE_ARTS_EXPORT KArtsServer : public QObject
38 38
 {
39 39
 Q_OBJECT
40 40
 

+ 1
- 1
arts/kde/kaudioconverter.h View File

@@ -29,7 +29,7 @@
29 29
 class KURL;
30 30
 class TQString;
31 31
 
32
-class KAudioConverter : public TQObject
32
+class KAudioConverter : public QObject
33 33
 {
34 34
 Q_OBJECT
35 35
 public:

+ 1
- 1
arts/kde/kaudiorecordstream.h View File

@@ -38,7 +38,7 @@ namespace Arts { class StereoEffectStack; }
38 38
  * @author Matthias Kretz <kretz@kde.org>
39 39
  * @since 3.2
40 40
 */
41
-class KDE_ARTS_EXPORT KAudioRecordStream : public TQObject
41
+class KDE_ARTS_EXPORT KAudioRecordStream : public QObject
42 42
 {
43 43
 	Q_OBJECT
44 44
 

+ 1
- 1
arts/kde/kconverttest.h View File

@@ -24,7 +24,7 @@
24 24
 
25 25
 #include <tqobject.h>
26 26
 
27
-class KConvertTest : public TQObject
27
+class KConvertTest : public QObject
28 28
 {
29 29
 Q_OBJECT
30 30
 public:

+ 1
- 1
arts/kde/kioinputstream_impl.cpp View File

@@ -78,7 +78,7 @@ void KIOInputStream_impl::streamStart()
78 78
 	m_job = KIO::get(m_url, false, false);
79 79
 
80 80
 	m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
81
-	m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(ARTS_VERSION));
81
+	m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
82 82
 
83 83
 	TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
84 84
 			 this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));		     

+ 4
- 4
arts/kde/kplayobject.cc View File

@@ -65,7 +65,7 @@ void KPlayObject::halt()
65 65
 
66 66
 TQString KPlayObject::description()
67 67
 {
68
-	return TQString::tqfromLatin1(object().description().c_str());
68
+	return TQString::fromLatin1(object().description().c_str());
69 69
 }
70 70
 
71 71
 Arts::poTime KPlayObject::currentTime()
@@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities()
85 85
 
86 86
 TQString KPlayObject::mediaName()
87 87
 {
88
-	return TQString::tqfromLatin1(object().mediaName().c_str());
88
+	return TQString::fromLatin1(object().mediaName().c_str());
89 89
 }
90 90
 
91 91
 Arts::poState KPlayObject::state()
@@ -243,7 +243,7 @@ TQString KDE::PlayObject::description()
243 243
 {
244 244
 	if ( object().isNull() )
245 245
 		return TQString();
246
-	return TQString::tqfromLatin1(object().description().c_str());
246
+	return TQString::fromLatin1(object().description().c_str());
247 247
 }
248 248
 
249 249
 Arts::poTime KDE::PlayObject::currentTime()
@@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName()
271 271
 {
272 272
 	if ( object().isNull() )
273 273
 		return TQString();
274
-	return TQString::tqfromLatin1(object().mediaName().c_str());
274
+	return TQString::fromLatin1(object().mediaName().c_str());
275 275
 }
276 276
 
277 277
 Arts::poState KDE::PlayObject::state()

+ 2
- 2
arts/kde/kplayobject.h View File

@@ -27,7 +27,7 @@
27 27
 #include <kurl.h>
28 28
 #include <tqobject.h>
29 29
 
30
-class KDE_EXPORT KPlayObject : public TQObject
30
+class KDE_EXPORT KPlayObject : public QObject
31 31
 {
32 32
 Q_OBJECT
33 33
 public:
@@ -185,7 +185,7 @@ class PlayObjectFactory;
185 185
   * internal state until the real Arts::PlayObject got created, afterwards
186 186
   * the state of the Arts::PlayObject will be returned.
187 187
   */
188
-class KDE_EXPORT PlayObject : public TQObject
188
+class KDE_EXPORT PlayObject : public QObject
189 189
 {
190 190
 Q_OBJECT
191 191
 public:

+ 1
- 1
arts/kde/kplayobjectcreator.h View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 namespace KDE {
31 31
 
32
-class PlayObjectCreator : public TQObject
32
+class PlayObjectCreator : public QObject
33 33
 {
34 34
 Q_OBJECT
35 35
 public:

+ 1
- 1
arts/kde/kplayobjectfactory.cc View File

@@ -155,7 +155,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
155 155
 	}
156 156
 
157 157
 	// decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over kio_audiocd
158
-	if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().tqcontains( "application/x-cda" ) ) )
158
+	if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) )
159 159
 	{
160 160
 		// we rely on the delivered mimetype if it's a local file
161 161
 		d->playObj = new KDE::PlayObject( d->server.createPlayObjectForURL( string( TQFile::encodeName( url.path() ) ), string( mimetype.latin1() ), createBUS ), false );

+ 1
- 1
arts/kde/kplayobjectfactory_p.h View File

@@ -29,7 +29,7 @@ namespace KDE
29 29
 /**
30 30
  * @internal
31 31
  */
32
-class POFHelper : public TQObject
32
+class POFHelper : public QObject
33 33
 {
34 34
 	friend class PlayObjectFactory;
35 35
 	Q_OBJECT

+ 3
- 3
arts/kde/kvideowidget.cpp View File

@@ -92,7 +92,7 @@ KVideoWidget::KVideoWidget( TQWidget *parent, const char *name, WFlags f )
92 92
 void KVideoWidget::init(void)
93 93
 {
94 94
     setMinimumSize(0, 0);
95
-    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
95
+    setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
96 96
     setFocusPolicy( ClickFocus );
97 97
 
98 98
     fullscreenWidget = 0;
@@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo )
147 147
 	}
148 148
 
149 149
 	setBackgroundMode( PaletteBackground );
150
-	tqrepaint();
150
+	repaint();
151 151
 
152 152
 	// Resize GUI
153 153
 	videoWidth  = 0;
@@ -286,7 +286,7 @@ void KVideoWidget::setDoubleSize()
286 286
     doubleSizeActivated();
287 287
 }
288 288
 
289
-TQSize KVideoWidget::tqsizeHint() const
289
+TQSize KVideoWidget::sizeHint() const
290 290
 {
291 291
     return TQSize( videoWidth, videoHeight );
292 292
 }

+ 1
- 1
arts/kde/kvideowidget.h View File

@@ -36,7 +36,7 @@ public:
36 36
     bool isNormalSize();
37 37
     bool isDoubleSize();
38 38
 
39
-    TQSize tqsizeHint() const;
39
+    TQSize sizeHint() const;
40 40
 
41 41
     virtual int heightForWidth ( int w ) const;
42 42
 

+ 7
- 7
arts/knotify/knotify.cpp View File

@@ -351,13 +351,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
351 351
     if ( !event.isEmpty() ) {
352 352
 
353 353
         // get config file
354
-        if ( d->events.tqcontains( fromApp ) ) {
354
+        if ( d->events.contains( fromApp ) ) {
355 355
             eventsFile = d->events[fromApp];
356 356
         } else {
357 357
             eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false);
358 358
             d->events.insert( fromApp, eventsFile );
359 359
         }
360
-        if ( d->configs.tqcontains( fromApp) ) {
360
+        if ( d->configs.contains( fromApp) ) {
361 361
             configFile = d->configs[fromApp];
362 362
         } else {
363 363
             configFile=new KConfig(fromApp+".eventsrc",true,false);
@@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)
642 642
 
643 643
     // append msg
644 644
     TQTextStream strm( &logFile );
645
-    strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
645
+    strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
646 646
     strm << text << endl;
647 647
 
648 648
     // close file
@@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text)
660 660
     TQTextStream strm( stderr, IO_WriteOnly );
661 661
 
662 662
     // output msg
663
-    strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
663
+    strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": ";
664 664
     strm << text << endl;
665 665
 
666 666
     return true;
@@ -695,7 +695,7 @@ void KNotify::playTimeout()
695 695
         ++it;
696 696
         if ( (*current)->state() != Arts::posPlaying )
697 697
         {
698
-            TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.tqfind( *current );
698
+            TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.find( *current );
699 699
             if ( eit != d->playObjectEventMap.end() )
700 700
             {
701 701
                 soundFinished( *eit, PlayedOK );
@@ -730,7 +730,7 @@ void KNotify::slotPlayerProcessExited( KProcess *proc )
730 730
 void KNotify::abortFirstPlayObject()
731 731
 {
732 732
 #ifndef WITHOUT_ARTS
733
-    TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.tqfind( d->playObjects.getFirst() );
733
+    TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() );
734 734
     if ( it != d->playObjectEventMap.end() )
735 735
     {
736 736
         soundFinished( it.data(), Aborted );
@@ -740,7 +740,7 @@ void KNotify::abortFirstPlayObject()
740 740
 #endif
741 741
 }
742 742
 
743
-void KNotify::soundFinished( int eventId, PlayingFinishedtqStatus reason )
743
+void KNotify::soundFinished( int eventId, PlayingFinishedStatus reason )
744 744
 {
745 745
     TQByteArray data;
746 746
     TQDataStream stream( data, IO_WriteOnly );

+ 2
- 2
arts/knotify/knotify.h View File

@@ -37,7 +37,7 @@ public:
37 37
 	KNotify( bool useArts );
38 38
 	~KNotify();
39 39
 
40
-    enum PlayingFinishedtqStatus
40
+    enum PlayingFinishedStatus
41 41
     {
42 42
         PlayedOK = 0,        // success, all following mean failure
43 43
         NoSoundFile,
@@ -86,7 +86,7 @@ private:
86 86
 	
87 87
 	bool isPlaying( const TQString& soundFile ) const;
88 88
 
89
-    void soundFinished( int eventId, PlayingFinishedtqStatus reason );
89
+    void soundFinished( int eventId, PlayingFinishedStatus reason );
90 90
     void abortFirstPlayObject();
91 91
 	
92 92
         WId checkWinId( const TQString& appName, WId senderWinId );

+ 1
- 1
arts/message/artsmessage.cc View File

@@ -83,7 +83,7 @@ int main(int argc, char **argv) {
83 83
 		KMessageBox::sorry(0, msg, i18n("Warning"), notifyOptions);
84 84
 	} else if (args->isSet("i")) {
85 85
 		TQString id = msg;
86
-		id.tqreplace(TQRegExp("[\\[\\]\\s=]"), "_");
86
+		id.replace(TQRegExp("[\\[\\]\\s=]"), "_");
87 87
 		KMessageBox::information(0, msg, i18n("Informational"), id, notifyOptions);
88 88
 	} else {
89 89
 		KMessageBox::error(0, msg, i18n("Error"), notifyOptions);

+ 2
- 2
common_texts.cpp View File

@@ -17,7 +17,7 @@
17 17
     Boston, MA 02110-1301, USA.
18 18
 */
19 19
 
20
-/* This file tqcontains several often used phrases to avoid double
20
+/* This file contains several often used phrases to avoid double
21 21
    work. If you think, that a phrase belongs here, contact me
22 22
 */
23 23
 
@@ -186,7 +186,7 @@ i18n( "&Tools");
186 186
 i18n( "&Spelling...");
187 187
 i18n( "Show &Menubar");
188 188
 i18n( "Show &Toolbar");
189
-i18n( "Show &tqStatusbar");
189
+i18n( "Show &Statusbar");
190 190
 i18n( "Configure &Key Bindings...");
191 191
 i18n( "&Preferences...");
192 192
 i18n( "&Settings");

+ 2
- 2
config.h.cmake View File

@@ -56,7 +56,7 @@
56 56
 /* You _must_ have bool */
57 57
 #undef HAVE_BOOL
58 58
 
59
-/* Define if getaddrinfo is broken and should be tqreplaced */
59
+/* Define if getaddrinfo is broken and should be replaced */
60 60
 #cmakedefine HAVE_BROKEN_GETADDRINFO 1
61 61
 
62 62
 /* Defines if bzip2 is compiled */
@@ -236,7 +236,7 @@
236 236
 /* Define if you have jasper */
237 237
 #cmakedefine HAVE_JASPER 1
238 238
 
239
-/* Define if your locale.h file tqcontains LC_MESSAGES */
239
+/* Define if your locale.h file contains LC_MESSAGES */
240 240
 #undef HAVE_LC_MESSAGES
241 241
 
242 242
 /* Defines if your system has the libart library */

+ 8
- 8
configure.in.bot View File

@@ -5,7 +5,7 @@ if test "x$have_ssl" != xyes; then
5 5
   echo "You're missing openSSL, or your version is too old (before 0.9.5a)."
6 6
   echo "KDE won't be able to access secure websites without it, so you should"
7 7
   echo "consider installing or upgrading it."
8
-  echo "Have a look at http://www.openssl.org, or tqfind a binary package for"
8
+  echo "Have a look at http://www.openssl.org, or find a binary package for"
9 9
   echo "your platform."
10 10
   echo ""
11 11
   all_tests=bad
@@ -17,7 +17,7 @@ if test -z "$LIBART_CONFIG"; then
17 17
   echo "KDE won't be able to render SVG icons without it, so you should"
18 18
   echo "consider installing or upgrading it."
19 19
   echo "Have a look at http://www.levien.com (official site) or"
20
-  echo "http://svg.kde.org/download.html for sources, or tqfind a binary"
20
+  echo "http://svg.kde.org/download.html for sources, or find a binary"
21 21
   echo "package for your platform."
22 22
   echo ""
23 23
   all_tests=bad
@@ -29,7 +29,7 @@ if test -z "$LIBPCRE"; then
29 29
   echo "Some web pages (using regular expressions in Javascript code) will not "
30 30
   echo "work correctly, the regexp support being limited without libpcre. "
31 31
   echo "If you plan to use Konqueror as a Web Browser, download libpcre from "
32
-  echo "http://www.pcre.org or tqfind a binary package for your platform."
32
+  echo "http://www.pcre.org or find a binary package for your platform."
33 33
   echo ""
34 34
   all_tests=bad
35 35
 fi
@@ -40,7 +40,7 @@ if test -z "$LIBBZ2"; then
40 40
   echo "KDE won't be able to provide a help ioslave (help://) without it,"
41 41
   echo "so if you want helpfiles you should consider installing it."
42 42
   echo "Have a look at http://sources.redhat.com/bzip2/ for sources, "
43
-  echo "or tqfind a binary package for your platform."
43
+  echo "or find a binary package for your platform."
44 44
   echo ""
45 45
   all_tests=bad
46 46
 fi
@@ -50,9 +50,9 @@ if test -z "$LIBXML_CFLAGS"; then
50 50
   echo "You're missing libxml2 2.4.8 or later."
51 51
   echo "KDE won't be able to provide a help ioslave (help://) without it,"
52 52
   echo "so if you want helpfiles you should consider installing it."
53
-  echo "Have a look at ftp://xmlsoft.org/ for sources, or tqfind a binary"
53
+  echo "Have a look at ftp://xmlsoft.org/ for sources, or find a binary"
54 54
   echo "package for your platform."
55
-  echo "You can tqfind a copy of libxml2 in the kdesupport module if you're using CVS."
55
+  echo "You can find a copy of libxml2 in the kdesupport module if you're using CVS."
56 56
   echo ""
57 57
   all_tests=bad
58 58
 fi
@@ -62,9 +62,9 @@ if test -z "$LIBXSLT_CFLAGS"; then
62 62
   echo "You're missing libxslt 1.0.7 or later."
63 63
   echo "KDE won't be able to provide a help ioslave (help://) without it,"
64 64
   echo "so if you want helpfiles you should consider installing it."
65
-  echo "Have a look at ftp://xmlsoft.org/ for sources, or tqfind a binary"
65
+  echo "Have a look at ftp://xmlsoft.org/ for sources, or find a binary"
66 66
   echo "package for your platform."
67
-  echo "You can tqfind a copy of libxslt in the kdesupport module if you're using CVS."
67
+  echo "You can find a copy of libxslt in the kdesupport module if you're using CVS."
68 68
   echo ""
69 69
   all_tests=bad
70 70
 fi

+ 1
- 1
configure.in.in View File

@@ -328,7 +328,7 @@ AC_DEFINE_UNQUOTED(X11_RGBFILE, "$rgb_file", [where rgb.txt is in])
328 328
 AC_MSG_CHECKING([for Compiler version])
329 329
 case "$CXX" in
330 330
 xlC*)
331
-  # The __IBMCPP__ macro tqcontains the C++ compiler version in decimal notation.
331
+  # The __IBMCPP__ macro contains the C++ compiler version in decimal notation.
332 332
   echo "__IBMCPP__" > conftest.C
333 333
 
334 334
   # Preprocess and at least make sure it's returned a number.

+ 5
- 5
dcop/HOWTO View File

@@ -190,7 +190,7 @@ Receiving Data via DCOP:
190 190
 
191 191
 Currently the only real way to receive data from DCOP is to multiply
192 192
 inherit from the normal class that you are inheriting (usually some
193
-sort of QWidget subclass or TQObject) as well as the DCOPObject class.
193
+sort of QWidget subclass or QObject) as well as the DCOPObject class.
194 194
 DCOPObject provides one very important method: DCOPObject::process().
195 195
 This is a pure virtual method that you must implement in order to
196 196
 process DCOP messages that you receive.  It takes a function
@@ -385,7 +385,7 @@ but virtual, not pure virtual.
385 385
 
386 386
 Example:
387 387
 
388
-class MyClass: public TQObject, virtual public MyInterface
388
+class MyClass: public QObject, virtual public MyInterface
389 389
 {
390 390
   Q_OBJECT
391 391
   
@@ -397,7 +397,7 @@ class MyClass: public TQObject, virtual public MyInterface
397 397
     QRect mySynchronousMethod();
398 398
 };
399 399
 
400
-Note: (Qt issue) Remember that if you are inheriting from TQObject, you must
400
+Note: (Qt issue) Remember that if you are inheriting from QObject, you must
401 401
 place it first in the list of inherited classes.
402 402
 
403 403
 In the implementation of your class' ctor, you must explicitly initialize
@@ -408,7 +408,7 @@ the interface which your are implementing.
408 408
 Example:
409 409
 
410 410
 MyClass::MyClass()
411
-  : TQObject(),
411
+  : QObject(),
412 412
     DCOPObject("MyInterface")
413 413
 {
414 414
   // whatever...
@@ -429,7 +429,7 @@ It is not necessary (though very clean) to define an interface as an
429 429
 abstract class of its own, like we did in the example above. We could
430 430
 just as well have defined a k_dcop section directly within MyClass:
431 431
 
432
-class MyClass: public TQObject, virtual public DCOPObject
432
+class MyClass: public QObject, virtual public DCOPObject
433 433
 {
434 434
   Q_OBJECT
435 435
   K_DCOP

+ 1
- 1
dcop/KDE-ICE/ICE-def.cpp View File

@@ -11,7 +11,7 @@ EXPORTS
11 11
  IceCloseConnection
12 12
  IceComposeNetworkIdList
13 13
  IceConnectionNumber
14
- IceConnectiontqStatus
14
+ IceConnectionStatus
15 15
  IceConnectionString
16 16
  IceFlush
17 17
  IceFreeAuthFileEntry

+ 3
- 3
dcop/KDE-ICE/ICEmsg.h View File

@@ -39,7 +39,7 @@ Author: Ralph Mor, X Consortium
39 39
 
40 40
 #define _IceRead _kde_IceRead
41 41
 
42
-extern tqStatus _IceRead (
42
+extern Status _IceRead (
43 43
 #if NeedFunctionPrototypes
44 44
     IceConn		/* iceConn */,
45 45
     unsigned long	/* nbytes */,
@@ -221,7 +221,7 @@ extern void _IceErrorBadValue (
221 221
 
222 222
 
223 223
 /*
224
- * Write pad bytes.  Used to force 32 or 64 bit tqalignment.
224
+ * Write pad bytes.  Used to force 32 or 64 bit alignment.
225 225
  * A maxium of 7 pad bytes can be specified.
226 226
  */
227 227
 
@@ -306,7 +306,7 @@ extern void _IceErrorBadValue (
306 306
 
307 307
 
308 308
 /*
309
- * Read pad bytes (for 32 or 64 bit tqalignment).
309
+ * Read pad bytes (for 32 or 64 bit alignment).
310 310
  * A maxium of 7 pad bytes can be specified.
311 311
  */
312 312
 

+ 1
- 1
dcop/KDE-ICE/ICEutil.h View File

@@ -119,7 +119,7 @@ extern void IceFreeAuthFileEntry (
119 119
 
120 120
 #define IceWriteAuthFileEntry KDE_IceWriteAuthFileEntry
121 121
 
122
-extern tqStatus KDE_IceWriteAuthFileEntry (
122
+extern Status KDE_IceWriteAuthFileEntry (
123 123
 #if NeedFunctionPrototypes
124 124
     FILE *		/* auth_file */,
125 125
     IceAuthFileEntry *	/* auth */

+ 4
- 4
dcop/KDE-ICE/Xtrans.c View File

@@ -54,7 +54,7 @@ extern char *strchr(const char *, int);
54 54
 #endif
55 55
 
56 56
 /*
57
- * The transport table tqcontains a definition for every transport (protocol)
57
+ * The transport table contains a definition for every transport (protocol)
58 58
  * family. All operations that can be made on the transport go through this
59 59
  * table.
60 60
  *
@@ -405,7 +405,7 @@ TRANS(Open) (int type, char *address)
405 405
 
406 406
     if ((thistrans = TRANS(SelectTransport) (protocol)) == NULL)
407 407
     {
408
-	PRMSG (1,"Open: Unable to tqfind transport for %s\n",
408
+	PRMSG (1,"Open: Unable to find transport for %s\n",
409 409
 	       protocol, 0, 0);
410 410
 
411 411
 	xfree (protocol);
@@ -495,7 +495,7 @@ TRANS(Reopen) (int type, int trans_id, int fd, char *port)
495 495
 
496 496
     if (thistrans == NULL)
497 497
     {
498
-	PRMSG (1,"Reopen: Unable to tqfind transport id %d\n",
498
+	PRMSG (1,"Reopen: Unable to find transport id %d\n",
499 499
 	       trans_id, 0, 0);
500 500
 
501 501
 	return NULL;
@@ -750,7 +750,7 @@ TRANS(NoListen) (char * protocol)
750 750
 
751 751
    if ((trans = TRANS(SelectTransport)(protocol)) == NULL)
752 752
    {
753
-	PRMSG (1,"TRANS(TransNoListen): unable to tqfind transport: %s\n",
753
+	PRMSG (1,"TRANS(TransNoListen): unable to find transport: %s\n",
754 754
 	       protocol, 0, 0);
755 755
 
756 756
 	return -1;

+ 10
- 10
dcop/KDE-ICE/Xtranssock.c View File

@@ -176,7 +176,7 @@ static int IBMsockInit = 0;
176 176
 /*
177 177
  * This is the Socket implementation of the X Transport service layer
178 178
  *
179
- * This file tqcontains the implementation for both the UNIX and INET domains,
179
+ * This file contains the implementation for both the UNIX and INET domains,
180 180
  * and can be built for either one, or both.
181 181
  *
182 182
  */
@@ -910,7 +910,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
910 910
 {
911 911
     struct sockaddr_un	sockname;
912 912
     int			namelen;
913
-    int			oldUtqmask;
913
+    int			oldUmask;
914 914
     int			status;
915 915
     unsigned int	mode;
916 916
 
@@ -919,7 +919,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
919 919
 
920 920
     /* Make sure the directory is created */
921 921
 
922
-    oldUtqmask = umask (0);
922
+    oldUmask = umask (0);
923 923
 
924 924
 #ifdef UNIX_DIR
925 925
 #ifdef HAS_STICKY_DIR_BIT
@@ -930,7 +930,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
930 930
     if (trans_mkdir((char*)UNIX_DIR, mode) == -1) {
931 931
 	PRMSG (1, "SocketUNIXCreateListener: mkdir(%s) failed, errno = %d\n",
932 932
 	       UNIX_DIR, errno, 0);
933
-	(void) umask (oldUtqmask);
933
+	(void) umask (oldUmask);
934 934
 	return TRANS_CREATE_LISTENER_FAILED;
935 935
     }
936 936
 #endif
@@ -952,7 +952,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
952 952
 #endif
953 953
 
954 954
     unlink (sockname.sun_path);
955
-    (void) umask (oldUtqmask);
955
+    (void) umask (oldUmask);
956 956
 
957 957
     if ((status = TRANS(SocketCreateListener) (ciptr,
958 958
 	(struct sockaddr *) &sockname, namelen)) < 0)
@@ -1011,7 +1011,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr)
1011 1011
 			S_IFSOCK))
1012 1012
 #endif
1013 1013
     {
1014
-	int oldUtqmask = umask (0);
1014
+	int oldUmask = umask (0);
1015 1015
 
1016 1016
 #ifdef UNIX_DIR
1017 1017
 #ifdef HAS_STICKY_DIR_BIT
@@ -1022,7 +1022,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr)
1022 1022
         if (trans_mkdir((char*)UNIX_DIR, mode) == -1) {
1023 1023
             PRMSG (1, "SocketUNIXResetListener: mkdir(%s) failed, errno = %d\n",
1024 1024
 	    UNIX_DIR, errno, 0);
1025
-	    (void) umask (oldUtqmask);
1025
+	    (void) umask (oldUmask);
1026 1026
 	    return TRANS_RESET_FAILURE;
1027 1027
         }
1028 1028
 #endif
@@ -1033,7 +1033,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr)
1033 1033
 	if ((ciptr->fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
1034 1034
 	{
1035 1035
 	    TRANS(FreeConnInfo) (ciptr);
1036
-	    (void) umask (oldUtqmask);
1036
+	    (void) umask (oldUmask);
1037 1037
 	    return TRANS_RESET_FAILURE;
1038 1038
 	}
1039 1039
 
@@ -1048,11 +1048,11 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr)
1048 1048
 	{
1049 1049
 	    close (ciptr->fd);
1050 1050
 	    TRANS(FreeConnInfo) (ciptr);
1051
-	    (void) umask (oldUtqmask);
1051
+	    (void) umask (oldUmask);
1052 1052
 	    return TRANS_RESET_FAILURE;
1053 1053
 	}
1054 1054
 
1055
-	umask (oldUtqmask);
1055
+	umask (oldUmask);
1056 1056
 
1057 1057
 	status = TRANS_RESET_NEW_FD;
1058 1058
     }

+ 13
- 13
dcop/KDE-ICE/authutil.c View File

@@ -62,12 +62,12 @@ extern unsigned sleep ();
62 62
 #endif
63 63
 #endif
64 64
 
65
-static tqStatus read_short (FILE *file, unsigned short *shortp);
66
-static tqStatus read_string (FILE *file, char **stringp);
67
-static tqStatus read_counted_string (FILE *file, unsigned short *countp, char **stringp);
68
-static tqStatus write_short (FILE *file, unsigned short s);
69
-static tqStatus write_string (FILE *file, char *string);
70
-static tqStatus write_counted_string (FILE *file, unsigned short count, char *string);
65
+static Status read_short (FILE *file, unsigned short *shortp);
66
+static Status read_string (FILE *file, char **stringp);
67
+static Status read_counted_string (FILE *file, unsigned short *countp, char **stringp);
68
+static Status write_short (FILE *file, unsigned short s);
69
+static Status write_string (FILE *file, char *string);
70
+static Status write_counted_string (FILE *file, unsigned short count, char *string);
71 71
 
72 72
 
73 73
 
@@ -322,7 +322,7 @@ IceAuthFileEntry	*auth;
322 322
 
323 323
 
324 324
 
325
-tqStatus
325
+Status
326 326
 IceWriteAuthFileEntry (auth_file, auth)
327 327
 
328 328
 FILE			*auth_file;
@@ -398,7 +398,7 @@ const char	*auth_name;
398 398
  * local routines
399 399
  */
400 400
 
401
-static tqStatus
401
+static Status
402 402
 read_short (FILE *file, unsigned short *shortp)
403 403
 {
404 404
     unsigned char   file_short[2];
@@ -411,7 +411,7 @@ read_short (FILE *file, unsigned short *shortp)
411 411
 }
412 412
 
413 413
 
414
-static tqStatus
414
+static Status
415 415
 read_string (FILE *file, char **stringp)
416 416
 {
417 417
     unsigned short  len;
@@ -447,7 +447,7 @@ read_string (FILE *file, char **stringp)
447 447
 }
448 448
 
449 449
 
450
-static tqStatus
450
+static Status
451 451
 read_counted_string (FILE *file, unsigned short *countp, char **stringp)
452 452
 {
453 453
     unsigned short  len;
@@ -481,7 +481,7 @@ read_counted_string (FILE *file, unsigned short *countp, char **stringp)
481 481
 }
482 482
 
483 483
 
484
-static tqStatus
484
+static Status
485 485
 write_short (FILE *file, unsigned short s)
486 486
 {
487 487
     unsigned char   file_short[2];
@@ -496,7 +496,7 @@ write_short (FILE *file, unsigned short s)
496 496
 }
497 497
 
498 498
 
499
-static tqStatus
499
+static Status
500 500
 write_string (FILE *file, char *string)
501 501
 {
502 502
     unsigned short count = strlen (string);
@@ -511,7 +511,7 @@ write_string (FILE *file, char *string)
511 511
 }
512 512
 
513 513
 
514
-static tqStatus
514
+static Status
515 515
 write_counted_string (FILE *file, unsigned short count, char *string)
516 516
 {
517 517
     if (!write_short (file, count))

+ 2
- 2
dcop/KDE-ICE/iceauth.c View File

@@ -135,7 +135,7 @@ char    	**errorStringRet;
135 135
 	if (!data)
136 136
 	{
137 137
 	    const char *tempstr =
138
-		"Could not tqfind correct MIT-MAGIC-COOKIE-1 authentication";
138
+		"Could not find correct MIT-MAGIC-COOKIE-1 authentication";
139 139
 
140 140
 	    *errorStringRet = (char *) malloc (strlen (tempstr) + 1);
141 141
 	    if (*errorStringRet)
@@ -243,7 +243,7 @@ char    	**errorStringRet;
243 243
 	    /*
244 244
 	     * We should never get here because in the ConnectionReply
245 245
 	     * we should have passed all the valid methods.  So we should
246
-	     * always tqfind a valid entry.
246
+	     * always find a valid entry.
247 247
 	     */
248 248
 
249 249
 	    const char *tempstr =

+ 2
- 2
dcop/KDE-ICE/listen.c View File

@@ -36,7 +36,7 @@ Author: Ralph Mor, X Consortium
36 36
 #include <string.h>
37 37
 
38 38
 
39
-tqStatus
39
+Status
40 40
 IceListenForConnections (countRet, listenObjsRet, errorLength, errorStringRet)
41 41
 
42 42
 int		*countRet;
@@ -50,7 +50,7 @@ char		*errorStringRet;
50 50
     int				transCount, partial, i, j;
51 51
     int                         result = -1;
52 52
     int                         count = 0;
53
-    tqStatus			status = 1;
53
+    Status			status = 1;
54 54
     XtransConnInfo		*transConns = NULL;
55 55
 
56 56
     while ((result < 0) && (count < 5))

+ 2
- 2
dcop/KDE-ICE/listenwk.c View File

@@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group.
33 33
 #include <string.h>
34 34
 
35 35
 
36
-tqStatus
36
+Status
37 37
 IceListenForWellKnownConnections (port, countRet, listenObjsRet, errorLength, errorStringRet)
38 38
 
39 39
 char		*port;
@@ -46,7 +46,7 @@ char		*errorStringRet;
46 46
     struct _IceListenObj	*listenObjs;
47 47
     char			*networkId;
48 48
     int				transCount, partial, i, j;
49
-    tqStatus			status = 1;
49
+    Status			status = 1;
50 50
     XtransConnInfo		*transConns = NULL;
51 51
 
52 52
 

+ 1
- 1
dcop/KDE-ICE/locking.c View File

@@ -32,7 +32,7 @@ Author: Ralph Mor, X Consortium
32 32
  */
33 33
 
34 34
 
35
-tqStatus
35
+Status
36 36
 IceInitThreads ()
37 37
 
38 38
 {

+ 1
- 1
dcop/KDE-ICE/ping.c View File

@@ -26,7 +26,7 @@ Author: Ralph Mor, X Consortium
26 26
 #include <KDE-ICE/ICElib.h>
27 27
 #include "KDE-ICE/ICElibint.h"
28 28
 
29
-tqStatus
29
+Status
30 30
 IcePing (iceConn, pingReplyProc, clientData)
31 31
 
32 32
 IceConn		 iceConn;

+ 1
- 1
dcop/KDE-ICE/watch.c View File

@@ -27,7 +27,7 @@ Author: Ralph Mor, X Consortium
27 27
 #include "KDE-ICE/ICElibint.h"
28 28
 #include "KDE-ICE/globals.h"
29 29
 
30
-tqStatus
30
+Status
31 31
 IceAddConnectionWatch (watchProc, clientData)
32 32
 
33 33
 IceWatchProc	watchProc;

+ 6
- 6
dcop/Mainpage.dox View File

@@ -148,7 +148,7 @@ else {
148 148
 
149 149
 Currently the only real way to receive data from DCOP is to multiply
150 150
 inherit from the normal class that you are inheriting (usually some
151
-sort of QWidget subclass or TQObject) as well as the DCOPObject class.
151
+sort of QWidget subclass or QObject) as well as the DCOPObject class.
152 152
 DCOPObject provides one very important method: DCOPObject::process().
153 153
 This is a pure virtual method that you must implement in order to
154 154
 process DCOP messages that you receive.  It takes a function
@@ -289,7 +289,7 @@ but virtual, not pure virtual.
289 289
 Example:
290 290
 
291 291
 \code
292
-class MyClass: public TQObject, virtual public MyInterface
292
+class MyClass: public QObject, virtual public MyInterface
293 293
 {
294 294
   Q_OBJECT
295 295
 
@@ -301,7 +301,7 @@ class MyClass: public TQObject, virtual public MyInterface
301 301
     QRect mySynchronousMethod();
302 302
 };
303 303
 \endcode
304
-\note (Qt issue) Remember that if you are inheriting from TQObject, you must
304
+\note (Qt issue) Remember that if you are inheriting from QObject, you must
305 305
 place it first in the list of inherited classes.
306 306
 
307 307
 In the implementation of your class' ctor, you must explicitly initialize
@@ -313,7 +313,7 @@ Example:
313 313
 
314 314
 \code
315 315
 MyClass::MyClass()
316
-  : TQObject(),
316
+  : QObject(),
317 317
     DCOPObject("MyInterface")
318 318
 {
319 319
   // whatever...
@@ -338,7 +338,7 @@ abstract class of its own, like we did in the example above. We could
338 338
 just as well have defined a k_dcop section directly within MyClass:
339 339
 
340 340
 \code
341
-class MyClass: public TQObject, virtual public DCOPObject
341
+class MyClass: public QObject, virtual public DCOPObject
342 342
 {
343 343
   Q_OBJECT
344 344
   K_DCOP
@@ -373,7 +373,7 @@ b) the authentication must be ensured
373 373
 For the first step, you simply pass the server address (as
374 374
 found in .DCOPserver) to the second process. For the authentication,
375 375
 you can use the ICEAUTHORITY environment variable to tell the
376
-second process where to tqfind the authentication information.
376
+second process where to find the authentication information.
377 377
 (Note that this implies that the second process is able to
378 378
 read the authentication file, so it will probably only work
379 379
 if the second process runs as root. If it should run as another

+ 4
- 4
dcop/client/README.dcop View File

@@ -21,7 +21,7 @@ exit-code of '0' means success. An exit-code of '1' means error, the error
21 21
 msg is printed to stderr and no data is printed to stdout.
22 22
 
23 23
 
24
-dcoptqfind [-l] [-a] <app-id> [<object-id> [<select_func> [args]]]
24
+dcopfind [-l] [-a] <app-id> [<object-id> [<select_func> [args]]]
25 25
 
26 26
 Finds an existing DCOP application/object. The select_func can be used to 
27 27
 select a specific single instance out of many based on some criteria. 
@@ -38,7 +38,7 @@ With the -a option it prints out "<app-id>" instead of a DCOPRef.
38 38
 
39 39
 With the -l option it calls "dcopstart <app-id>" if no object is found, 
40 40
 stripping off any wildcard from the <app-id>. If the dcopstart command is 
41
-successful the tqfind command is repeated, if the dcopstart command fails, an 
41
+successful the find command is repeated, if the dcopstart command fails, an 
42 42
 error message is printed to stderr and the command exits with exit-code '2'.
43 43
 
44 44
 The default selection criteria is "any". Applications can declare their own 
@@ -46,7 +46,7 @@ select_func as they see fit, e.g. konqueror could declare
46 46
 "isDoingProtocol(QString protocol)" and then the following command would 
47 47
 select a konqueror mainwindow that is currently handling the help-protocol:
48 48
 
49
-   "dcoptqfind 'konqueror*'  'konqueror-mainwindow*' 'isDoingProtocol(QString 
49
+   "dcopfind 'konqueror*'  'konqueror-mainwindow*' 'isDoingProtocol(QString 
50 50
 protocol)' help"
51 51
 
52 52
 
@@ -57,7 +57,7 @@ In addtion to the current syntax of
57 57
    dcop <appid> <object> <function> args
58 58
 
59 59
 you will now also be able to use <dcopref> to make calls with <dcopref> being 
60
-"DCOPRef(<appid>, <objectid>)" as returned by dcoptqfind.
60
+"DCOPRef(<appid>, <objectid>)" as returned by dcopfind.
61 61
 
62 62
 Additional utilities:
63 63
 

+ 22
- 22
dcop/client/dcop.cpp View File

@@ -158,9 +158,9 @@ void queryFunctions( const char* app, const char* obj )
158 158
 
159 159
 int callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
160 160
 {
161
-    TQString f = func; // Qt is better with tqunicode strings, so use one.
162
-    int left = f.tqfind( '(' );
163
-    int right = f.tqfind( ')' );
161
+    TQString f = func; // Qt is better with unicode strings, so use one.
162
+    int left = f.find( '(' );
163
+    int right = f.find( ')' );
164 164
 
165 165
     if ( right <  left )
166 166
     {
@@ -181,12 +181,12 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
181 181
 	    return( 1 );
182 182
 	}
183 183
 	for ( QCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) {
184
-	    int l = (*it).tqfind( '(' );
184
+	    int l = (*it).find( '(' );
185 185
 	    int s;
186 186
 	    if (l > 0)
187
-	        s = (*it).tqfindRev( ' ', l);
187
+	        s = (*it).findRev( ' ', l);
188 188
 	    else
189
-	        s = (*it).tqfind( ' ' );
189
+	        s = (*it).find( ' ' );
190 190
 
191 191
 	    if ( s < 0 )
192 192
 		s = 0;
@@ -195,8 +195,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
195 195
 
196 196
 	    if ( l > 0 && (*it).mid( s, l - s ) == func ) {
197 197
 		realfunc = (*it).mid( s );
198
-		const TQString arguments = (*it).mid(l+1,(*it).tqfind( ')' )-l-1);
199
-		uint a = arguments.tqcontains(',');
198
+		const TQString arguments = (*it).mid(l+1,(*it).find( ')' )-l-1);
199
+		uint a = arguments.contains(',');
200 200
 		if ( (a==0 && !arguments.isEmpty()) || a>0)
201 201
 			a++;
202 202
 		if ( a == args.count()  )
@@ -209,8 +209,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
209 209
 	    return( 1 );
210 210
 	}
211 211
 	f = realfunc;
212
-	left = f.tqfind( '(' );
213
-	right = f.tqfind( ')' );
212
+	left = f.find( '(' );
213
+	right = f.find( ')' );
214 214
     }
215 215
 
216 216
  doit:
@@ -230,7 +230,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
230 230
 	for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
231 231
 	    TQString lt = (*it).simplifyWhiteSpace();
232 232
 
233
-	    int s = lt.tqfind(' ');
233
+	    int s = lt.find(' ');
234 234
 
235 235
 	    // If there are spaces in the name, there may be two
236 236
 	    // reasons: the parameter name is still there, ie.
@@ -250,7 +250,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
250 250
 		//
251 251
 		s=1;
252 252
 
253
-		while (s < static_cast<int>(partl.count()) && intTypes.tqcontains(partl[s]))
253
+		while (s < static_cast<int>(partl.count()) && intTypes.contains(partl[s]))
254 254
 		{
255 255
 			s++;
256 256
 		}
@@ -345,7 +345,7 @@ void showHelp( int exitCode = 0 )
345 345
 	 << "                  in bash, but because no new dcop instance has to be started" << endl
346 346
 	 << "                  for each line this is generally much faster, especially for" << endl
347 347
 	 << "                  the slower GNU dynamic linkers." << endl
348
-	 << "                  The '%1' placeholder cannot be used to tqreplace e.g. the" << endl
348
+	 << "                  The '%1' placeholder cannot be used to replace e.g. the" << endl
349 349
 	 << "                  program, object or method name." << endl
350 350
 	 << "  --user <user>   Connect to the given user's DCOP server. This option will" << endl
351 351
 	 << "                  ignore the values of the environment vars $DCOPSERVER and" << endl
@@ -464,9 +464,9 @@ int runDCOP( QCStringList args, UserList users, Session session,
464 464
     QCStringList params;
465 465
     DCOPClient *client = 0L;
466 466
     int retval = 0;
467
-    if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 )
467
+    if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
468 468
     {
469
-	int delimPos = args[ 0 ].tqfindRev( ',' );
469
+	int delimPos = args[ 0 ].findRev( ',' );
470 470
 	if( delimPos == -1 )
471 471
         {
472 472
 	    cerr_ << "Error: '" << args[ 0 ]
@@ -569,7 +569,7 @@ int runDCOP( QCStringList args, UserList users, Session session,
569 569
 	    }
570 570
 	    else if( !sessionName.isEmpty() )
571 571
 	    {
572
-		if( sessions.tqcontains( sessionName ) )
572
+		if( sessions.contains( sessionName ) )
573 573
 		{
574 574
 		    sessions.clear();
575 575
 		    sessions.append( sessionName );
@@ -625,7 +625,7 @@ int runDCOP( QCStringList args, UserList users, Session session,
625 625
 		    continue;
626 626
 		else
627 627
 		{
628
-		    cerr_ << "WARNING: Cannot tqfind ICE authority file "
628
+		    cerr_ << "WARNING: Cannot find ICE authority file "
629 629
 		         << iceFile << "!" << endl
630 630
 			 << "Please check permissions or set the $ICEAUTHORITY"
631 631
 			 << " variable manually before" << endl
@@ -706,12 +706,12 @@ int runDCOP( QCStringList args, UserList users, Session session,
706 706
                     sendUserTime( app );
707 707
 		if( readStdin )
708 708
 		{
709
-		    QCStringList::Iterator tqreplaceArg = params.end();
709
+		    QCStringList::Iterator replaceArg = params.end();
710 710
 
711 711
 		    QCStringList::Iterator it = params.begin();
712 712
 		    for( ; it != params.end(); ++it )
713 713
 			if( *it == "%1" )
714
-			    tqreplaceArg = it;
714
+			    replaceArg = it;
715 715
 
716 716
 		    // Read from stdin until EOF and call function for each
717 717
 		    // read line
@@ -719,8 +719,8 @@ int runDCOP( QCStringList args, UserList users, Session session,
719 719
 		    {
720 720
 			TQString buf = cin_.readLine();
721 721
 
722
-			if( tqreplaceArg != params.end() )
723
-			    *tqreplaceArg = buf.local8Bit();
722
+			if( replaceArg != params.end() )
723
+			    *replaceArg = buf.local8Bit();
724 724
 
725 725
 			if( !buf.isNull() )
726 726
 			{
@@ -861,7 +861,7 @@ int main( int argc, char** argv )
861 861
           if (prog[prog.length()-1] != '*')
862 862
           {
863 863
              // Strip a trailing -<PID> part.
864
-             int i = prog.tqfindRev('-');
864
+             int i = prog.findRev('-');
865 865
              if ((i >= 0) && prog.mid(i+1).toLong())
866 866
              {
867 867
                 prog = prog.left(i);      

+ 10
- 10
dcop/client/dcopfind.cpp View File

@@ -38,11 +38,11 @@ static DCOPClient* dcop = 0;
38 38
 static bool bAppIdOnly = 0;
39 39
 static bool bLaunchApp = 0;
40 40
 
41
-bool tqfindObject( const char* app, const char* obj, const char* func, QCStringList args )
41
+bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
42 42
 {
43
-    TQString f = func; // Qt is better with tqunicode strings, so use one.
44
-    int left = f.tqfind( '(' );
45
-    int right = f.tqfind( ')' );
43
+    TQString f = func; // Qt is better with unicode strings, so use one.
44
+    int left = f.find( '(' );
45
+    int right = f.find( ')' );
46 46
 
47 47
     if ( right <  left )
48 48
     {
@@ -66,7 +66,7 @@ bool tqfindObject( const char* app, const char* obj, const char* func, QCStringL
66 66
 	for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
67 67
 	    TQString lt = (*it).simplifyWhiteSpace();
68 68
 
69
-	    int s = lt.tqfind(' ');
69
+	    int s = lt.find(' ');
70 70
 
71 71
 	    // If there are spaces in the name, there may be two
72 72
 	    // reasons: the parameter name is still there, ie.
@@ -86,7 +86,7 @@ bool tqfindObject( const char* app, const char* obj, const char* func, QCStringL
86 86
 		//
87 87
 	    	s=1;
88 88
 
89
-		while (s < (int)partl.count() && intTypes.tqcontains(partl[s]))
89
+		while (s < (int)partl.count() && intTypes.contains(partl[s]))
90 90
 		{
91 91
 			s++;
92 92
 		}
@@ -139,7 +139,7 @@ bool tqfindObject( const char* app, const char* obj, const char* func, QCStringL
139 139
 
140 140
     TQCString foundApp;
141 141
     TQCString foundObj;
142
-    if ( dcop->tqfindObject( app, obj, f.latin1(),  data, foundApp, foundObj) )
142
+    if ( dcop->findObject( app, obj, f.latin1(),  data, foundApp, foundObj) )
143 143
     {
144 144
        if (bAppIdOnly)
145 145
           puts(foundApp.data());
@@ -192,7 +192,7 @@ bool launchApp(TQString app)
192 192
 
193 193
 void usage()
194 194
 {
195
-   fprintf( stderr, "Usage: dcoptqfind [-l] [-a] application [object [function [arg1] [arg2] [arg3] ... ] ] ] \n" );
195
+   fprintf( stderr, "Usage: dcopfind [-l] [-a] application [object [function [arg1] [arg2] [arg3] ... ] ] ] \n" );
196 196
    exit(0);
197 197
 }
198 198
 
@@ -267,7 +267,7 @@ int main( int argc, char** argv )
267 267
     QCStringList params;
268 268
     for( int i = 0; i < argc; i++ )
269 269
         params.append( args[ i ] );
270
-    bool ok = tqfindObject( app, objid, function, params );
270
+    bool ok = findObject( app, objid, function, params );
271 271
     if (ok)
272 272
        return 0;
273 273
     if (bLaunchApp)
@@ -275,7 +275,7 @@ int main( int argc, char** argv )
275 275
        ok = launchApp(app);
276 276
        if (!ok)
277 277
           return 2;
278
-       ok = tqfindObject( app, objid, function, params );
278
+       ok = findObject( app, objid, function, params );
279 279
     }
280 280
 
281 281
     return 1;

+ 1
- 1
dcop/client/dcopstart.cpp View File

@@ -33,7 +33,7 @@ static DCOPClient* dcop = 0;
33 33
 void startApp(const char *_app, int argc, const char **args)
34 34
 {
35 35
     const char *function = 0;
36
-    TQString app = TQString::tqfromLatin1(_app);
36
+    TQString app = TQString::fromLatin1(_app);
37 37
     if (app.endsWith(".desktop"))
38 38
        function = "start_service_by_desktop_path(TQString,TQStringList)";
39 39
     else

+ 19
- 19
dcop/client/marshall.cpp View File

@@ -102,12 +102,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
102 102
 {
103 103
     TQCString result;
104 104
 
105
-    if ( type == "int" || type == "TQ_INT32" )
105
+    if ( type == "int" || type == "Q_INT32" )
106 106
     {
107 107
         int i;
108 108
         stream >> i;
109 109
         result.setNum( i );
110
-    } else if ( type == "uint" || type == "TQ_UINT32" || type == "unsigned int" )
110
+    } else if ( type == "uint" || type == "Q_UINT32" || type == "unsigned int" )
111 111
     {
112 112
         uint i;
113 113
         stream >> i;
@@ -132,12 +132,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
132 132
         double d;
133 133
         stream >> d;
134 134
         result.setNum( d, 'f' );
135
-    } else if ( type == "TQ_INT64" ) {
136
-        TQ_INT64 i;
135
+    } else if ( type == "Q_INT64" ) {
136
+        Q_INT64 i;
137 137
         stream >> i;
138 138
         result.sprintf( "%lld", i );
139
-    } else if ( type == "TQ_UINT64" ) {
140
-        TQ_UINT64 i;
139
+    } else if ( type == "Q_UINT64" ) {
140
+        Q_UINT64 i;
141 141
         stream >> i;
142 142
         result.sprintf( "%llu", i );
143 143
     } else if ( type == "bool" )
@@ -190,7 +190,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
190 190
         result.sprintf( "%dx%d+%d+%d", r.width(), r.height(), r.x(), r.y() );
191 191
     } else if ( type == "TQVariant" )
192 192
     {
193
-        TQ_INT32 type;
193
+        Q_INT32 type;
194 194
         stream >> type;
195 195
         return demarshal( stream, TQVariant::typeToName( (TQVariant::Type)type ) );
196 196
     } else if ( type == "DCOPRef" )
@@ -205,7 +205,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
205 205
         result = r.url().local8Bit();
206 206
     } else if ( type.left( 11 ) == "TQValueList<" )
207 207
     {
208
-        if ( (uint)type.tqfind( '>', 11 ) != type.length() - 1 )
208
+        if ( (uint)type.find( '>', 11 ) != type.length() - 1 )
209 209
             return result;
210 210
 
211 211
         TQString nestedType = type.mid( 11, type.length() - 12 );
@@ -213,10 +213,10 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
213 213
         if ( nestedType.isEmpty() )
214 214
             return result;
215 215
 
216
-        TQ_UINT32 count;
216
+        Q_UINT32 count;
217 217
         stream >> count;
218 218
 
219
-        TQ_UINT32 i = 0;
219
+        Q_UINT32 i = 0;
220 220
         for (; i < count; ++i )
221 221
         {
222 222
             TQCString arg = demarshal( stream, nestedType );
@@ -227,21 +227,21 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
227 227
         }
228 228
     } else if ( type.left( 5 ) == "TQMap<" )
229 229
     {
230
-        int commaPos = type.tqfind( ',', 5 );
230
+        int commaPos = type.find( ',', 5 );
231 231
 
232 232
         if ( commaPos == -1 )
233 233
             return result;
234 234
 
235
-        if ( (uint)type.tqfind( '>', commaPos ) != type.length() - 1 )
235
+        if ( (uint)type.find( '>', commaPos ) != type.length() - 1 )
236 236
             return result;
237 237
 
238 238
         TQString keyType = type.mid( 5, commaPos - 5 );
239 239
         TQString valueType = type.mid( commaPos + 1, type.length() - commaPos - 2 );
240 240
 
241
-        TQ_UINT32 count;
241
+        Q_UINT32 count;
242 242
         stream >> count;
243 243
 
244
-        TQ_UINT32 i = 0;
244
+        Q_UINT32 i = 0;
245 245
         for (; i < count; ++i )
246 246
         {
247 247
             TQCString key = demarshal( stream, keyType );
@@ -291,15 +291,15 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
291 291
 	arg << s.toUInt();
292 292
     else if ( type == "unsigned int" )
293 293
 	arg << s.toUInt();
294
-    else if ( type == "TQ_INT32" )
294
+    else if ( type == "Q_INT32" )
295 295
 	arg << s.toInt();
296
-    else if ( type == "TQ_INT64" ) {
296
+    else if ( type == "Q_INT64" ) {
297 297
 	TQVariant qv = TQVariant( s );
298 298
 	arg << qv.toLongLong();
299 299
     }
300
-    else if ( type == "TQ_UINT32" )
300
+    else if ( type == "Q_UINT32" )
301 301
 	arg << s.toUInt();
302
-    else if ( type == "TQ_UINT64" ) {
302
+    else if ( type == "Q_UINT64" ) {
303 303
 	TQVariant qv = TQVariant( s );
304 304
 	arg << qv.toULongLong();
305 305
     }
@@ -376,7 +376,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
376 376
 	    marshall( dummy_arg, args, j, type );
377 377
 	    count++;
378 378
 	}
379
-	arg << (TQ_UINT32) count;
379
+	arg << (Q_UINT32) count;
380 380
 	// Parse the list for real
381 381
 	while (true) {
382 382
 	    if( i > args.count() )

+ 10
- 10
dcop/dcopc.c View File

@@ -182,7 +182,7 @@ dcop_process_message(
182 182
 )
183 183
 {
184 184
   struct DCOPMsg * pMsg = 0L;
185
-  tqStatus status = False;
185
+  Status status = False;
186 186
 
187 187
   char  * buf         = 0L;
188 188
   char  * senderId    = 0L;
@@ -390,7 +390,7 @@ dcop_send_signal(
390 390
 
391 391
   free(header);
392 392
 
393
-  if (IceConnectiontqStatus(dcop_ice_conn) != IceConnectAccepted)
393
+  if (IceConnectionStatus(dcop_ice_conn) != IceConnectAccepted)
394 394
     return False;
395 395
 	
396 396
   return True;
@@ -412,7 +412,7 @@ dcop_call(
412 412
 )
413 413
 {
414 414
   IceReplyWaitInfo          waitInfo;
415
-  IceProcessMessagestqStatus  status;
415
+  IceProcessMessagesStatus  status;
416 416
   struct dcop_reply_struct  replyStruct;
417 417
 
418 418
   char  * pos               = 0L;
@@ -472,7 +472,7 @@ dcop_call(
472 472
   free(outputData);
473 473
   outputData = NULL;
474 474
 
475
-  if (IceConnectiontqStatus(dcop_ice_conn) != IceConnectAccepted) {
475
+  if (IceConnectionStatus(dcop_ice_conn) != IceConnectAccepted) {
476 476
       fprintf(stderr, "dcop_call(): Connection not accepted\n");
477 477
       return False;
478 478
   }
@@ -544,7 +544,7 @@ dcop_register(const char * app_name, Bool add_pid)
544 544
   char * data       = 0L;
545 545
   char * pos        = 0L;
546 546
   int    dataLength = 0;
547
-  Bool   calltqStatus = False;
547
+  Bool   callStatus = False;
548 548
 
549 549
   fprintf(stderr, "dcop_register(`%s')\n", app_name);
550 550
 
@@ -558,9 +558,9 @@ dcop_register(const char * app_name, Bool add_pid)
558 558
 
559 559
     fprintf(stderr, "dcop_init(): Reregistering as `%s'\n", app_name);
560 560
 
561
-    calltqStatus = dcop_detach();
561
+    callStatus = dcop_detach();
562 562
 
563
-    if (False == calltqStatus) {
563
+    if (False == callStatus) {
564 564
       fprintf(stderr, "dcop_init(): Could not detach before reregistering\n");
565 565
       return 0L;
566 566
     }
@@ -584,7 +584,7 @@ dcop_register(const char * app_name, Bool add_pid)
584 584
   pos = dcop_write_string(pos, dcop_requested_name);
585 585
   dataLength = pos - data;
586 586
 
587
-  calltqStatus =
587
+  callStatus =
588 588
     dcop_call(
589 589
       dcop_requested_name,
590 590
       "DCOPServer",
@@ -600,7 +600,7 @@ dcop_register(const char * app_name, Bool add_pid)
600 600
   free(dcop_requested_name);
601 601
   free(data);
602 602
 
603
-  if (False == calltqStatus) {
603
+  if (False == callStatus) {
604 604
     fprintf(stderr, "dcop_register(): dcop_call() failed\n");
605 605
     return 0L;
606 606
   }
@@ -769,7 +769,7 @@ dcop_protocol_setup()
769 769
 
770 770
   return (
771 771
     (status == IceProtocolSetupSuccess) &&
772
-    (IceConnectiontqStatus(dcop_ice_conn) == IceConnectAccepted)
772
+    (IceConnectionStatus(dcop_ice_conn) == IceConnectAccepted)
773 773
   );
774 774
 }
775 775
 

+ 91
- 91
dcop/dcopclient.cpp View File

@@ -95,15 +95,15 @@ client_map_t *cliMap()
95 95
     return DCOPClient_CliMap;
96 96
 }
97 97
 
98
-DCOPClient *DCOPClient::tqfindLocalClient( const TQCString &_appId )
98
+DCOPClient *DCOPClient::findLocalClient( const TQCString &_appId )
99 99
 {
100
-    return cliMap()->tqfind(_appId.data());
100
+    return cliMap()->find(_appId.data());
101 101
 }
102 102
 
103 103
 static
104 104
 void registerLocalClient( const TQCString &_appId, DCOPClient *client )
105 105
 {
106
-    cliMap()->tqreplace(_appId.data(), client);
106
+    cliMap()->replace(_appId.data(), client);
107 107
 }
108 108
 
109 109
 static
@@ -141,7 +141,7 @@ public:
141 141
     TQCString* replyType;
142 142
     TQByteArray* replyData;
143 143
     int replyId;
144
-    TQ_INT32 transactionId;
144
+    Q_INT32 transactionId;
145 145
     TQCString calledApp;
146 146
     TQGuardedPtr<TQObject> replyObject;
147 147
     TQCString replySlot;
@@ -173,7 +173,7 @@ public:
173 173
     TQCString defaultObject;
174 174
     TQPtrList<DCOPClientTransaction> *transactionList;
175 175
     bool transaction;
176
-    TQ_INT32 transactionId;
176
+    Q_INT32 transactionId;
177 177
     int opcode;
178 178
 
179 179
     // Special key values:
@@ -205,7 +205,7 @@ public:
205 205
 class DCOPClientTransaction
206 206
 {
207 207
 public:
208
-    TQ_INT32 id;
208
+    Q_INT32 id;
209 209
     CARD32 key;
210 210
     TQCString senderId;
211 211
 };
@@ -263,12 +263,12 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old)
263 263
         disp = "NODISPLAY";
264 264
 
265 265
     int i;
266
-    if((i = disp.tqfindRev('.')) > disp.tqfindRev(KPATH_SEPARATOR) && i >= 0)
266
+    if((i = disp.findRev('.')) > disp.findRev(KPATH_SEPARATOR) && i >= 0)
267 267
         disp.truncate(i);
268 268
 
269 269
     if (!old)
270 270
     {
271
-        while( (i = disp.tqfind(KPATH_SEPARATOR)) >= 0)
271
+        while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
272 272
             disp[i] = '_';
273 273
     }
274 274
 
@@ -382,7 +382,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject,
382 382
     case DCOPReplyWait:
383 383
         if ( replyStruct ) {
384 384
             TQCString calledApp, app;
385
-            TQ_INT32 id;
385
+            Q_INT32 id;
386 386
             TQDataStream ds( dataReceived, IO_ReadOnly );
387 387
             ds >> calledApp >> app >> id;
388 388
             replyStruct->transactionId = id;
@@ -398,7 +398,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject,
398 398
         {
399 399
             TQDataStream ds( dataReceived, IO_ReadOnly );
400 400
             TQCString calledApp, app;
401
-            TQ_INT32 id;
401
+            Q_INT32 id;
402 402
 
403 403
             ds >> calledApp >> app >> id;
404 404
             if (replyStruct && (id == replyStruct->transactionId) && (calledApp == replyStruct->calledApp))
@@ -517,7 +517,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ
517 517
         d->currentKey = key;
518 518
 
519 519
     if ( opcode == DCOPFind )
520
-        b = c->tqfind(app, objId, fun, data, replyType, replyData );
520
+        b = c->find(app, objId, fun, data, replyType, replyData );
521 521
     else
522 522
         b = c->receive( app, objId, fun, data, replyType, replyData );
523 523
     // set notifier back to previous state
@@ -531,7 +531,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ
531 531
     TQByteArray reply;
532 532
     TQDataStream replyStream( reply, IO_WriteOnly );
533 533
 
534
-    TQ_INT32 id = c->transactionId();
534
+    Q_INT32 id = c->transactionId();
535 535
     if (id) {
536 536
         // Call delayed. Send back the transaction ID.
537 537
         replyStream << d->appId << fromApp << id;
@@ -672,9 +672,9 @@ bool DCOPClient::attach()
672 672
 
673 673
 void DCOPClient::bindToApp()
674 674
 {
675
-    // check if we have a tqApp instantiated.  If we do,
675
+    // check if we have a qApp instantiated.  If we do,
676 676
     // we can create a TQSocketNotifier and use it for receiving data.
677
-    if (tqApp) {
677
+    if (qApp) {
678 678
         if ( d->notifier )
679 679
             delete d->notifier;
680 680
         d->notifier = new TQSocketNotifier(socket(),
@@ -690,7 +690,7 @@ void DCOPClient::suspend()
690 690
     if (!d->notifier)
691 691
         return;
692 692
 #endif
693
-    assert(d->notifier); // Suspending makes no sense if we didn't had a tqApp yet
693
+    assert(d->notifier); // Suspending makes no sense if we didn't had a qApp yet
694 694
     d->notifier->setEnabled(false);
695 695
 }
696 696
 
@@ -764,7 +764,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
764 764
                                                       DCOPAuthCount,
765 765
                                                       const_cast<char **>(DCOPAuthNames),
766 766
                                                       DCOPClientAuthProcs, 0L)) < 0) {
767
-        emit attachFailed(TQString::tqfromLatin1( "Communications could not be established." ));
767
+        emit attachFailed(TQString::fromLatin1( "Communications could not be established." ));
768 768
         return false;
769 769
     }
770 770
 
@@ -779,7 +779,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
779 779
             TQCString fName = dcopServerFile();
780 780
             TQFile f(TQFile::decodeName(fName));
781 781
             if (!f.open(IO_ReadOnly)) {
782
-                emit attachFailed(TQString::tqfromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
782
+                emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
783 783
                 return false;
784 784
             }
785 785
             int size = QMIN( (qint64)1024, f.size() ); // protection against a huge file
@@ -790,7 +790,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
790 790
                // Should we abort ?
791 791
             }
792 792
             contents[size] = '\0';
793
-            int pos = contents.tqfind('\n');
793
+            int pos = contents.find('\n');
794 794
             if ( pos == -1 ) // Shouldn't happen
795 795
             {
796 796
                 qDebug("Only one line in dcopserver file !: %s", contents.data());
@@ -819,7 +819,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
819 819
            delete [] d->serverAddr;
820 820
            d->serverAddr = 0;
821 821
         }
822
-        emit attachFailed(TQString::tqfromLatin1( errBuf ));
822
+        emit attachFailed(TQString::fromLatin1( errBuf ));
823 823
         return false;
824 824
     }
825 825
     fcntl(socket(), F_SETFL, FD_CLOEXEC);
@@ -845,7 +845,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
845 845
             delete [] d->serverAddr;
846 846
             d->serverAddr = 0;
847 847
         }
848
-        emit attachFailed(TQString::tqfromLatin1( errBuf ));
848
+        emit attachFailed(TQString::fromLatin1( errBuf ));
849 849
         return false;
850 850
     } else if (setupstat == IceProtocolAlreadyActive) {
851 851
         if (bC