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-ecb5cbfe19da
tags/v3.5.13
tpearson 9 years ago
parent
commit
10308be19e
100 changed files with 586 additions and 587 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. +3
    -3
      doc/common/gpl-license.html

+ 1
- 1
COMPILING.html View File

@@ -79,7 +79,7 @@ gmake
gmake install </pre>

<p>(On Linux, GNU make is the default make, and gmake in the above commands
can be tqreplaced with make).
can be replaced with make).

<p>For Qt the magic sequence is:


+ 3
- 3
COPYING View File

@@ -65,7 +65,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License applies to any program or other work which tqcontains
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
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:
stating that you changed the files and the date of any change.

b) You must cause any work that you distribute or publish, that in
whole or in part tqcontains or is derived from the Program or any
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.

@@ -160,7 +160,7 @@ Sections 1 and 2 above provided that you also do one of the following:

The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it tqcontains, plus any
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
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.
1. APPLICABILITY AND DEFINITIONS

This License applies to any manual or other work, in any medium, that
tqcontains a notice placed by the copyright holder saying it can be
contains a notice placed by the copyright holder saying it can be
distributed under the terms of this License. Such a notice grants a
world-wide, royalty-free license, unlimited in duration, to use that
work under the conditions stated herein. The "Document", below,
@@ -51,7 +51,7 @@ modifications and/or translated into another language.
A "Secondary Section" is a named appendix or a front-matter section of
the Document that deals exclusively with the relationship of the
publishers or authors of the Document to the Document's overall subject
(or to related matters) and tqcontains nothing that could fall directly
(or to related matters) and contains nothing that could fall directly
within that overall subject. (Thus, if the Document is in part a
textbook of mathematics, a Secondary Section may not explain any
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,
preceding the beginning of the body of the text.

A section "Entitled XYZ" means a named subunit of the Document whose
title either is precisely XYZ or tqcontains XYZ in parentheses following
title either is precisely XYZ or contains XYZ in parentheses following
text that translates XYZ in another language. (Here XYZ stands for a
specific section name mentioned below, such as "Acknowledgements",
"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
list of Invariant Sections in the Modified Version's license notice.
These titles must be distinct from any other section titles.

You may add a section Entitled "Endorsements", provided it tqcontains
You may add a section Entitled "Endorsements", provided it contains
nothing but endorsements of your Modified Version by various
parties--for example, statements of peer review or that the text has
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
through arrangements made by) any one entity. If the Document already
includes a cover text for the same cover, previously added by you or
by arrangement made by the same entity you are acting on behalf of,
you may not add another; but you may tqreplace the old one, on explicit
you may not add another; but you may replace the old one, on explicit
permission from the previous publisher that added the old one.

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
license notice, and that you preserve all their Warranty Disclaimers.

The combined work need only contain one copy of this License, and
multiple identical Invariant Sections may be tqreplaced with a single
multiple identical Invariant Sections may be replaced with a single
copy. If there are multiple Invariant Sections with the same name but
different contents, make the title of each such section unique by
adding at the end of it, in parentheses, the name of the original
@@ -286,7 +286,7 @@ Entitled "Endorsements".
6. COLLECTIONS OF DOCUMENTS

You may make a collection consisting of the Document and other documents
released under this License, and tqreplace the individual copies of this
released under this License, and replace the individual copies of this
License in the various documents with a single copy that is included in
the collection, provided that you follow the rules of this License for
verbatim copying of each of the documents in all other respects.
@@ -382,7 +382,7 @@ license notices just after the title page:
Free Documentation License".

If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
tqreplace the "with...Texts." line with this:
replace the "with...Texts." line with this:

with the Invariant Sections being LIST THEIR TITLES, with the
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
combination of the three, merge those two alternatives to suit the
situation.

If your document tqcontains nontrivial examples of program code, we
If your document contains nontrivial examples of program code, we
recommend releasing these examples in parallel under your choice of
free software license, such as the GNU General Public License,
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.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former tqcontains code derived from the library, while the latter only
former contains code derived from the library, while the latter only
works together with the library.

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.
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License Agreement applies to any software library which
tqcontains a notice placed by the copyright holder or other authorized
contains a notice placed by the copyright holder or other authorized
party saying it may be distributed under the terms of this Library
General Public License (also called "this License"). Each licensee is
addressed as "you".
@@ -128,7 +128,7 @@ included without limitation in the term "modification".)

"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it tqcontains, plus any associated
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

@@ -230,7 +230,7 @@ source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

5. A program that tqcontains no derivative of any portion of the
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
@@ -238,7 +238,7 @@ therefore falls outside the scope of this License.

However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
tqcontains portions of the Library), rather than a "work that uses the
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

@@ -250,7 +250,7 @@ linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.

If such an object file uses only numerical parameters, data
structure tqlayouts and accessors, and small macros and small inline
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
@@ -329,7 +329,7 @@ permitted, and provided that you do these two things:

b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to tqfind the accompanying uncombined form of the same work.
where to find the accompanying uncombined form of the same work.

8. You may not copy, modify, sublicense, link with, or distribute
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.

First lets attach gdb to an application that hasn't crashed (yet).

You start with tqfinding the process of the application with e.g. "ps -aux":
You start with finding the process of the application with e.g. "ps -aux":

> ps -aux | grep kedit
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
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If at some point `config.cache'
tqcontains results you don't want to keep, you may remove or edit it.
contains results you don't want to keep, you may remove or edit it.

The file `configure.in' is used to create `configure' by a program
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
package recognizes.

For packages that use the X Window System, `configure' can usually
tqfind the X include and library files automatically, but if it doesn't,
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.


+ 32
- 32
KDE2PORTING.html View File

@@ -7,7 +7,7 @@

<H2>Porting Applications to KDE 2.0</H2>
<H3>Last Modified on November 28, 2000</H3>
This document tqcontains the changes you have to apply to programs written for
This document contains the changes you have to apply to programs written for
KDE1.1 when you want to port them to KDE2.0.<P>

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>
<UL>
<LI><A HREF="#gettingstarted">Getting Started</A></LI>
<LI><A HREF="#general">Global changes</A></LI>
<LI><A HREF="#autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></LI>
<LI><A HREF="#automoc">automoc/am_edit, Makefile.am tags</A></LI>
<LI><A HREF="#KApplication">KApplication</A></LI>
<LI><A HREF="#KCmdLineArgs">KCmdLineArgs</A></LI>
<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>

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

<H3><A NAME="autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></H3>
<H3><A NAME="automoc">automoc/am_edit, Makefile.am tags</A></H3>

On the subject of the compilation framework, autotqmoc has been removed from
the admin directory. It has been tqreplaced by am_edit which provides a lot of
On the subject of the compilation framework, automoc has been removed from
the admin directory. It has been replaced by am_edit which provides a lot of
additional features.<P>
METASOURCES=AUTO still does the job of generating the appropriate tqmoc files,
METASOURCES=AUTO still does the job of generating the appropriate moc files,
but in addition, you should use KDE_ICON for the icons representing the application
(and naming those icons conforming to lo16-app-&lt;appname&gt;.png), and install
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>
<H3><A NAME="KApplication">KApplication</A></H3>

doesn't hold any longer a KLocale instance. With this getLocale()
and isLocaleInstantiated are now tqreplaced by KGlobal::locale()<P>
and isLocaleInstantiated are now replaced by KGlobal::locale()<P>

it also doesn't hold a KiconLoader instance. As this also getIconLoader()
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>

kde_*dir() have been removed as they require a unique top level directory
for all applications (KDEDIR). This concept doesn't exist in KDE 2.0
any more, it has been tqreplaced with "multiple levels of directories",
any more, it has been replaced with "multiple levels of directories",
set in KDEDIRS, so that it's possible to have global settings and
group settings, applied before user settings.<P>

@@ -174,7 +174,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
In return for this information you can query KCmdLineArgs whether an
certain option was specified on the command line and your application
now automatically supports --help and --version. It aborts with a
useful error message when the command line tqcontains a syntax error.
useful error message when the command line contains a syntax error.
See kdelibs/kdecore/kcmdlineargs.h for more info.<P>

<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>

KApplication::getApplication()-&gt;getLocale()-&gt;translate<P>

but a function on its own. klocale is obsolete and tqreplace every call
but a function on its own. klocale is obsolete and replace every call
to klocale-&gt;translate with i18n.<P>

The return value of i18n is also no longer a const char*,
but a tqunicode TQString.<P>
but a unicode TQString.<P>

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

@@ -230,7 +230,7 @@ must have created a KApplication object before the methods can be used.<P>
<H3><A NAME="KIconLoader">KIconLoader</A></H3>

KIconLoader in 1.1 used to mix icons for applications and for toolbars.
This has changed, so you may notice that your application doesn't tqfind
This has changed, so you may notice that your application doesn't find
the right icons. loadIcon (used by BarIcon) returns only toolbar icons.<P>
If you need icons for applications, use loadApplicationIcon.<P>
loadMiniIcon and loadApplicationMiniIcon have been removed, instead
@@ -248,12 +248,12 @@ in stripping off the .xpm part<P>

<H3><A NAME="KTMainWindow">KTMainWindow</A></H3>

KTMainWindow has been tqreplaced with KMainWindow.<p>
KTMainWindow has been replaced with KMainWindow.<p>

The KMainWindow constructor needs a parent widget as first argument.
You can use 0 for this.<p>
setView() has been tqreplaced with setCentralWidget().<p>
view() has been tqreplaced with centralWidget().<p>
setView() has been replaced with setCentralWidget().<p>
view() has been replaced with centralWidget().<p>
addToolBar() has been removed, it is not needed any more.<p>
setMenu(...) has been removed, it is not needed any more.<p>
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.

<H3><A NAME="khtmlw">khtmlw</A></H3>

khtmlw has been tqreplaced with khtml.<BR>
khtmlw has been replaced with khtml.<BR>
<UL>
<LI>KHTMLView has vanished. Just use KHTMLWidget, which does scrollbar
managing for free.
@@ -371,11 +371,11 @@ khtmlw has been tqreplaced with khtml.<BR>
also exist in a const char * version.<P>


<LI>you won't need the getKHTMLWiget function anymore. Just tqreplace
<LI>you won't need the getKHTMLWiget function anymore. Just replace
getKHTMLWidget-&gt;xxx() with xxx()<P>
<LI>xxx(TQString) -&gt; xxx(const TQString &amp;)<P>
<LI>consistent naming. All getXyz() functions are renamed to xyz()<P>
<LI>tqreplaced/changed functions:<P>
<LI>replaced/changed functions:<P>
<TABLE BORDER="1">
<TR>
<TD>KHTMLWidget::setDefaultFontBase()</TD>
@@ -390,7 +390,7 @@ khtmlw has been tqreplaced with khtml.<BR>
<TD>-&gt; TQString selectedText()</TD>
</TR>
<TR>
<TD COLSPAN="2" ROWSPAN="0">tqfindTextEnd() has vanished. just remove the call from your code</TD>
<TD COLSPAN="2" ROWSPAN="0">findTextEnd() has vanished. just remove the call from your code</TD>
</TR>
<TR>
<TD>gotoXY(x, y)</TD>
@@ -413,7 +413,7 @@ khtmlw has been tqreplaced with khtml.<BR>

<H3><A NAME="KIntegerLine">KIntegerLine, KIntLineEdit</A></H3>

KIntegerLine and KIntLineEdit have been tqreplaced by KIntNumInput.
KIntegerLine and KIntLineEdit have been replaced by KIntNumInput.
The new header file is called knuminput.h.<P>

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>
These classes have been largely re-implemented. The external API
remains mostly the same, with the single notable change that
the groupIterator and entryIterator methods have been removed and
instead tqreplaced by groupList (which returns a TQStringList of groups)
instead replaced by groupList (which returns a TQStringList of groups)
and entryMap(const TQString &amp;group) (which returns a TQMap of entries
in the specified group). This is due to internal changes in KConfig
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
The kcharsets class has been completely rewritten, and most of it has
vanished, since support for it moved to Qt.<P>

Most applications will only need to tqreplace kapp-&gt;getKCharsets() with
Most applications will only need to replace kapp-&gt;getKCharsets() with
KGlobal::charsets().<P>

For conversion of various input formats to QStrings, please have a
@@ -544,7 +544,7 @@ changed from convertTag to fromEntity and toEntity.<P>

To get a font, which can display a certain charset (if such a font
exists), you can use the KCharsets::setQFont methods. Input is a font and
a charset. Kcharsets tries to tqfind an output font, which matches the
a charset. Kcharsets tries to find an output font, which matches the
input font most closely, but can display the given charset.<P>

<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
documentation and kdelibs/kdetest/kwizardtest.cpp for an example use.<P>
KNoteBook (deeply entwined with the former KWizard) has been removed until
someone is willing to port it to work with the new wizard. If you want to
use it you'll tqfind the necessary files in kdegraphics/kiconedit.<P>
use it you'll find the necessary files in kdegraphics/kiconedit.<P>

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

<H3><A NAME="KSpinBox">KSpinBox, KNumericSpinBox</A></H3>

These classes have been tqreplaced by TQSpinBox. API is almost the same
These classes have been replaced by TQSpinBox. API is almost the same
HINTS:<P>
<UL>
<LI>valueincreased()/valuedecreased -&gt; valueChanged()
@@ -607,7 +607,7 @@ KListView has no addChild(), insertItem() and removeItem() calls. Inserting
a root item is done by constructing a TQListViewItem with the KListView
passed as the parent widget. adding a child item is done by constructing
a TQListViewItem with the parent item as parameter. removeItem() should
be tqreplaced by delete &lt;pointer to item&gt;.<P>
be replaced by delete &lt;pointer to item&gt;.<P>

The root items are not shown in a tree fashion by default. to get this,
use KListView::setDecorativeRoot(true).<P>
@@ -642,7 +642,7 @@ KComboBox::setEditText.<P>

<H3><A NAME="KQuickHelp">KQuickHelp</A></H3>

KQuickHelp, the "super-tooltip" widget, has been tqreplaced by TQWhatsThis.
KQuickHelp, the "super-tooltip" widget, has been replaced by TQWhatsThis.
It provides a compatible API and almost the same look and feel, in addition
to some new functionality.<P>

@@ -685,7 +685,7 @@ unbalancedGradient(), hash(), desaturate(), pattern(), fade(), blend() etc.<P>

<H3><A NAME="KTabListBox">KTabListBox</A></H3>

This widget has been tqreplaced by the almighty KListView. Everything said
This widget has been replaced by the almighty KListView. Everything said
about KTreeList could be repeated here. The good thing is, that you now
can combine TreeView's and normal Tablists without problems.<P>

@@ -716,7 +716,7 @@ The file has been removed completely, use TQString instead. (<A HREF="mailto:mir

<H3><A NAME="ktopwidget">ktopwidget.h / KTopWidget</A></H3>

KMainWindow tqreplaces this class completely. ktopwidget.h does not
KMainWindow replaces this class completely. ktopwidget.h does not
exist in KDE 2. (<A HREF="mailto:mirko@kde.org">mirko@kde.org</A>)<P>

<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>
Since Qt 2.0, the class TQToolButton provides the functionality of
buttons that raise when the mouse is moved over them, so there is no
reason to have a class providing the same feature in KDE libs. All
occurrences of KButton in the KDE CVS have been tqreplaced by QToolButtons,
occurrences of KButton in the KDE CVS have been replaced by QToolButtons,
but for applications not in the CVS it has to be done by the respective
developer. (<A HREF="mailto:mirko@kde.org">mirko@kde.org</A>)<P>

@@ -836,7 +836,7 @@ in this class. This slot is called each time the selected file/dir changes.
In this slot you have to react appropriate (i.e. show the preview :). The
easiest way this can be done is to derive your class from TQWidgetStack and
add a Object (derived from TQWidget) for each file type. In the showPreview
method you just raise the matching widget. If you can't tqfind an appropriate
method you just raise the matching widget. If you can't find an appropriate
widget just hide() the widget stack.<P>
If you need some "inspiration" on how that could be done, please have a look
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
exists, you need to link against LIB_KSYCOCA instead.
</p>
<p>
kimgioRegister() has been tqreplaced by KImageIO::registerFormats().
kimgioRegister() has been replaced by KImageIO::registerFormats().
</p>

<p>

+ 30
- 30
KDE3PORTING.html View File

@@ -6,7 +6,7 @@
<BODY>

<H2>Porting Applications to KDE 3.0</H2>
This document tqcontains the changes you have to apply to programs written for
This document contains the changes you have to apply to programs written for
KDE 2.x when you want to port them to KDE 3.0.<P>

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.
<LI>kdualcolorbtn.h is now kdualcolorbutton.h</LI>

</UL>
This is to help tqfinding out header files from class names and the other
This is to help finding out header files from class names and the other
way round. Compatibility headers have been created. You can use them as
long as you don't compile with KDE_NO_COMPAT.

@@ -90,13 +90,13 @@ long as you don't compile with KDE_NO_COMPAT.
The file with the DCOP connection information has been renamed. The new
name is $HOME/.DCOPserver_<hostname>_<display>. The screen part has been
stripped from <display> and the ':' character that separates host and
display-number has been tqreplaced with a '_'. If you access DCOP via
display-number has been replaced with a '_'. If you access DCOP via
DCOPClient you do not need to change anything.
<p>
It is no longer possible to make calls to an application registered as
"<appid>-<pid>" with "<appid>" only. The full name can be obtained by using
either KApplication::startServiceBy...() or DCOPClient::tqfindObject() or
their command line equivalents "dcopstart" and "dcoptqfind".
either KApplication::startServiceBy...() or DCOPClient::findObject() or
their command line equivalents "dcopstart" and "dcopfind".

<H4>KLibFactory</H4>
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.

<H4>KMD5</H4>
HASHHEX and HASH has been removed to make this class namespace clean.
They have been tqreplaced by TQCString and KMD5::Digest. <br>
They have been replaced by TQCString and KMD5::Digest. <br>
The API has been cleaned up, it is no longer necessary to call finalize().
Simply remove any calls to it.

@@ -143,9 +143,9 @@ setEncoding(int) instead.
<li>formatNumber(const TQString &amp;) has been removed.
<li>languages() has been removed. Use languageList() instead.
<li>All references to monthName(), monthNamePossessive(), and weekDayName()
should be tqreplaced with methods from KLocale::calendar().
should be replaced with methods from KLocale::calendar().
<li>Hard coded date handling or date handling with TQDate should in most
cases be tqreplaced by methods in KLocale::calendar().
cases be replaced by methods in KLocale::calendar().

<H4>Accelerators Keys</H4>
<h5>KAccel</h5>
@@ -160,12 +160,12 @@ not be available.
Key_Up, this, TQT_SLOT(scrollUp()) );
</pre>
Note that a What's This parameter is now a part of the insert function.
You might tqreplace the TQString::null parameter with
You might replace the TQString::null parameter with
<pre> i18n("Scroll the current document's contents up by one line.") </pre>
for example.</li>
<li> KAccel::changeMenuAccel() has been deprecated because it was
never used in cvs. If you've used it in your application, the following
can tqreplace it. Note, however, that this would be handled automatically
can replace it. Note, however, that this would be handled automatically
by using KAction instead.
<pre>
- 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>.
<li><i>StdAccel::Insert</i> and the corresponding <i>insert()</i>
have been removed. (Nobody on the list knew what its function was
supposed to be.) Calls to <i>insert()</i> and the equivalent
<i>key(KStdAccel::Insert)</i> can be tqreplaced with the former default
<i>key(KStdAccel::Insert)</i> can be replaced with the former default
of <i>Qt::CTRL+Qt::Key_Insert</i>.</li>
<li>The following functions have been deprecated and will need to be changed if KDE_NO_COMPAT is defined:
<table border=1>
@@ -206,7 +206,7 @@ The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
<tr><td>bool isEqual(const TQKeyEvent* pEvent, int keyQt)</td>
<td>The best method for replacing this varies. One possibility is to use
<i>KKey(const TQKeyEvent*) == KKey(int)</i>. Another is to use
<i>KShortcut::tqcontains( const KKey&/KKeySequence& )</i>.</td></tr>
<i>KShortcut::contains( const KKey&/KKeySequence& )</i>.</td></tr>
<tr><td>int key(StdAccel)</td><td>const KShortcut& shortcut(StdAccel)</td></tr>
</table></li-->
</ul>
@@ -228,7 +228,7 @@ Use QPopupMenu/KPopupMenu or the XML-UI method for building menus.
<H4>KAction</H4>
<ul>
<li>The following methods have been deprecated and will need to be
tqreplaced if KDE_NO_COMPAT is defined.
replaced if KDE_NO_COMPAT is defined.
<table border=1>
<tr><th>Old</th><th>New</th></tr>
<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.
See kdelibs/pics/hicolor/kde for an example of its use.

<H4>KContainerLayout</H4>
This class has been removed, use Qt tqlayouts instead.
This class has been removed, use Qt layouts instead.

<H4>KCommand</H4>
This class has been made lighter: the name isn't stored into the command anymore,
but must be provided by the inherited class, as the result of the virtual name() function.
This saves storing a TQString into each command in memory.
The former behavior is available in the class KNamedCommand, so for a quick port
simply tqreplace KCommand with KNamedCommand.
simply replace KCommand with KNamedCommand.

<H4>KDialogBase</H4>
The deprecated getMainWidget() method has been removed. Use mainWidget() instead.
@@ -361,12 +361,12 @@ TQString&) is not a slot anymore.
<li>KTarGz is now KTar (#define for source compatibility)</li>
<li>A base class KArchive has been written, to support other archive formats in the future</li>
<li>KTarEntry is now KArchiveEntry, KTarDirectory is now KArchiveDirectory, and KTarFile is now KArchiveFile.</li>
<li>The classes ProgressBase, tqStatusbarProgress and DefaultProgress have been moved to the KIO namespace.</li>
<li>The classes ProgressBase, StatusbarProgress and DefaultProgress have been moved to the KIO namespace.</li>
<li>The signal KDirLister::started(const TQString &amp;url) has changed to KDirLister::started(const KURL &amp;url).<li>
<li>KServiceTypeProfile::preferredService( const TQString &amp; serviceType, bool needApp ) has been removed, use
KServiceTypeProfile::preferredService( ..., "Application") if needApp was true, or
KServiceTypeProfile::preferredService( ..., TQString::null) if needApp was false.
<li>The following functions in KProtocolManager have been tqreplaced:
<li>The following functions in KProtocolManager have been replaced:
<ul>
<li>ftpProxy(), use proxyFor("ftp") instead.
<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
<H3><A NAME="khtmlpart">API-cleanups in KHTML</A></H3>

There were a few relatively minor API-adjustements in KHTMLPart. In particular:
<ul><li>enableJScript(bool) has been tqreplaced by setJScriptEnabled(bool)
<li>enableJava(bool) has been tqreplaced by setJavaEnabled(bool)
<li>enablePlugins(bool) has been tqreplaced by setPluginsEnabled(bool)
<li>autoloadImages(bool) has been tqreplaced by setAutoloadImages(bool)
<li>enableMetaRefresh(bool) has been tqreplaced by setMetaRefreshEnabled(bool)
<ul><li>enableJScript(bool) has been replaced by setJScriptEnabled(bool)
<li>enableJava(bool) has been replaced by setJavaEnabled(bool)
<li>enablePlugins(bool) has been replaced by setPluginsEnabled(bool)
<li>autoloadImages(bool) has been replaced by setAutoloadImages(bool)
<li>enableMetaRefresh(bool) has been replaced by setMetaRefreshEnabled(bool)
<li>setBaseURL and setBaseTarget have been removed. baseURL(), baseTarget() and
completeURL() are remained for compatibility reasons, but they're deprecated now. use the variants in DOM::HTMLDocument() instead.
<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
disable this use a #define KDE_NO_COMPAT.
<p>In KHTMLView, the following changes were done:
<ul>
<li>gotoNextLink has been tqreplaced by gotoLink(true);
<li>gotoPrevLink has been tqreplaced by gotoLink(false);
<li>gotoNextLink has been replaced by gotoLink(true);
<li>gotoPrevLink has been replaced by gotoLink(false);
</ul>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

@@ -531,7 +531,7 @@ parts are rarely used outside of kfile.
<p>
The changes are:
<H4>KFileItem</H4>
The KFileViewItem class is completely tqreplaced with KFileItem from kio. All its functionality has
The KFileViewItem class is completely replaced with KFileItem from kio. All its functionality has
been merged with its former base class KFileItem. Additionally, some of its methods have been
modified:
<table>
@@ -647,13 +647,13 @@ For more details please consult the HOWTO file in the kcontrol directory.

<p>The API for Kicker panel applets and extensions has changed. Panels can now be
left/top, center, or right/bottom aligned, and applets and extensions may receive
notification about a change in tqalignment.
notification about a change in alignment.

<H4>KPanelApplet</H4>

<p>The virtual methods orientationChange() and popupDirectionChange() are deprecated.
Instead you should reimplement positionChange() and tqalignmentChange() to be
notified of changes in the position and tqalignment of the panel on which your applet
Instead you should reimplement positionChange() and alignmentChange() to be
notified of changes in the position and alignment of the panel on which your applet
resides. In addition, the popupDirection() method and the Direction enum are
deprecated. Instead you should use the position() method and Position enum. Applets that use
the deprecated methods will still work with KDE 3, but may not compile or work with
@@ -661,8 +661,8 @@ a future version.

<H4>KPanelExtension</H4>

<p>There is a new method tqalignmentChange() that your extension should reimplement if
it needs to know about changes in tqalignment.
<p>There is a new method alignmentChange() that your extension should reimplement if
it needs to know about changes in alignment.

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
<p>

+ 2
- 2
Mainpage.dox View File

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

+ 7
- 7
Makefile.am.in View File

@@ -40,8 +40,8 @@ pot_DATA = kde.pot

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

+ 3
- 3
README View File

@@ -20,7 +20,7 @@ Here is an alphabetical list:
* arts
ARTS (analog realtime synthesizer) is a environment of small modules
that one can plug together to process multimedia data. This directory
tqcontains KDE wrapper and KDE user interface elements for ARTS.
contains KDE wrapper and KDE user interface elements for ARTS.

* dcop
The desktop communication program allows even shell scripts to
@@ -86,7 +86,7 @@ Here is an alphabetical list:

* kio
Classes that fetch and decode URLs are contained here. This library also
tqcontains "ksycoca", the system configure cache containing services,
contains "ksycoca", the system configure cache containing services,
applications, servicetypes and mimetypes.

* kioslave
@@ -236,7 +236,7 @@ So, here are some tips on bug reporting:
older, deprecated versions usually don't get that much attention :-)

* Also the chance is high that another one experienced your problem. The
bug report wizard at http://bugs.kde.org will help you to tqfind out if your
bug report wizard at http://bugs.kde.org will help you to find out if your
problem has already been reported.

* 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.

- Check for forked classes in kde pim and other modules

- There is no reason why KConfigBase should inherit from TQObject, get rid of that.
- There is no reason why KConfigBase should inherit from QObject, get rid of that.

- Change all FooPrivate *d; -> Private * const d; and place initialization
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.
- Remove all KDE_NO_COMPAT from the KDE2 -> KDE3 port before adding new ones for KDE4.

- Remove the smart-to-dumb-pointer conversion operator from KSharedPtr
and tqreplace it with a T* Get() member function. An implict conversion is
and replace it with a T* Get() member function. An implict conversion is
far too dangerous.
See: http://groups.google.com/groups?selm=4ognb0%243cd%40linda.teleport.com&oe=UTF-8&output=gplain
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.

- Manually, properly clean up the includes in all of the headers. Remove
unnecessary ones and change pointers to use class foo; decorations and move the
headers into the cpp files. When finished fixkdeincludes shouldn't tqfind
headers into the cpp files. When finished fixkdeincludes shouldn't find
anything (but don't rely on fixkdeinclude, it should be done manually first!)

- Use of the C++ keyword "explicit". Make all ctors explicit which can be used
@@ -199,7 +199,7 @@ an alternative help->contents action)
- Make sure all GUI classes adopt well to palette changes.

- Rework KPanelExtension and KPanelApplet to have a sane set of global position
enums, make the tqgeometry handling less spaghetti like and extend the API so
enums, make the geometry handling less spaghetti like and extend the API so
requests for things like re-reading the config of a KPanelExtension can be
done by its parent.

@@ -212,7 +212,7 @@ an alternative help->contents action)
- KListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
"dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). Unless Qt4 does it all :)

- Move KIO::findDeviceMountPoint, tqfindPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
- Move KIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
to merge that code.

- 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
* }
* \endcode
*/
class KDE_EXPORT KArtsDispatcher : public TQObject
class KDE_EXPORT KArtsDispatcher : public QObject
{
Q_OBJECT
public:

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

@@ -77,12 +77,12 @@ Arts::SoundServerV2 KArtsServer::server(void)

X11CommConfig.sync();
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper")));
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper")));

if(rt)
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper")));
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper")));
else
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artsd")));
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd")));

proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );


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

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


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

@@ -29,7 +29,7 @@
class KURL;
class TQString;

class KAudioConverter : public TQObject
class KAudioConverter : public QObject
{
Q_OBJECT
public:

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

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


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

@@ -24,7 +24,7 @@

#include <tqobject.h>

class KConvertTest : public TQObject
class KConvertTest : public QObject
{
Q_OBJECT
public:

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

@@ -78,7 +78,7 @@ void KIOInputStream_impl::streamStart()
m_job = KIO::get(m_url, false, false);

m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(ARTS_VERSION));
m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));

TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));

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

@@ -65,7 +65,7 @@ void KPlayObject::halt()

TQString KPlayObject::description()
{
return TQString::tqfromLatin1(object().description().c_str());
return TQString::fromLatin1(object().description().c_str());
}

Arts::poTime KPlayObject::currentTime()
@@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities()

TQString KPlayObject::mediaName()
{
return TQString::tqfromLatin1(object().mediaName().c_str());
return TQString::fromLatin1(object().mediaName().c_str());
}

Arts::poState KPlayObject::state()
@@ -243,7 +243,7 @@ TQString KDE::PlayObject::description()
{
if ( object().isNull() )
return TQString();
return TQString::tqfromLatin1(object().description().c_str());
return TQString::fromLatin1(object().description().c_str());
}

Arts::poTime KDE::PlayObject::currentTime()
@@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName()
{
if ( object().isNull() )
return TQString();
return TQString::tqfromLatin1(object().mediaName().c_str());
return TQString::fromLatin1(object().mediaName().c_str());
}

Arts::poState KDE::PlayObject::state()

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

@@ -27,7 +27,7 @@
#include <kurl.h>
#include <tqobject.h>

class KDE_EXPORT KPlayObject : public TQObject
class KDE_EXPORT KPlayObject : public QObject
{
Q_OBJECT
public:
@@ -185,7 +185,7 @@ class PlayObjectFactory;
* internal state until the real Arts::PlayObject got created, afterwards
* the state of the Arts::PlayObject will be returned.
*/
class KDE_EXPORT PlayObject : public TQObject
class KDE_EXPORT PlayObject : public QObject
{
Q_OBJECT
public:

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

@@ -29,7 +29,7 @@

namespace KDE {

class PlayObjectCreator : public TQObject
class PlayObjectCreator : public QObject
{
Q_OBJECT
public:

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

@@ -155,7 +155,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
}

// decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over kio_audiocd
if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().tqcontains( "application/x-cda" ) ) )
if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) )
{
// we rely on the delivered mimetype if it's a local file
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
/**
* @internal
*/
class POFHelper : public TQObject
class POFHelper : public QObject
{
friend class PlayObjectFactory;
Q_OBJECT

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

@@ -92,7 +92,7 @@ KVideoWidget::KVideoWidget( TQWidget *parent, const char *name, WFlags f )
void KVideoWidget::init(void)
{
setMinimumSize(0, 0);
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
setFocusPolicy( ClickFocus );

fullscreenWidget = 0;
@@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo )
}

setBackgroundMode( PaletteBackground );
tqrepaint();
repaint();

// Resize GUI
videoWidth = 0;
@@ -286,7 +286,7 @@ void KVideoWidget::setDoubleSize()
doubleSizeActivated();
}

TQSize KVideoWidget::tqsizeHint() const
TQSize KVideoWidget::sizeHint() const
{
return TQSize( videoWidth, videoHeight );
}

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

@@ -36,7 +36,7 @@ public:
bool isNormalSize();
bool isDoubleSize();

TQSize tqsizeHint() const;
TQSize sizeHint() const;

virtual int heightForWidth ( int w ) const;


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

@@ -351,13 +351,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
if ( !event.isEmpty() ) {

// get config file
if ( d->events.tqcontains( fromApp ) ) {
if ( d->events.contains( fromApp ) ) {
eventsFile = d->events[fromApp];
} else {
eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false);
d->events.insert( fromApp, eventsFile );
}
if ( d->configs.tqcontains( fromApp) ) {
if ( d->configs.contains( fromApp) ) {
configFile = d->configs[fromApp];
} else {
configFile=new KConfig(fromApp+".eventsrc",true,false);
@@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)

// append msg
TQTextStream strm( &logFile );
strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
strm << text << endl;

// close file
@@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text)
TQTextStream strm( stderr, IO_WriteOnly );

// output msg
strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": ";
strm << text << endl;

return true;
@@ -695,7 +695,7 @@ void KNotify::playTimeout()
++it;
if ( (*current)->state() != Arts::posPlaying )
{
TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.tqfind( *current );
TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.find( *current );
if ( eit != d->playObjectEventMap.end() )
{
soundFinished( *eit, PlayedOK );
@@ -730,7 +730,7 @@ void KNotify::slotPlayerProcessExited( KProcess *proc )
void KNotify::abortFirstPlayObject()
{
#ifndef WITHOUT_ARTS
TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.tqfind( d->playObjects.getFirst() );
TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() );
if ( it != d->playObjectEventMap.end() )
{
soundFinished( it.data(), Aborted );
@@ -740,7 +740,7 @@ void KNotify::abortFirstPlayObject()
#endif
}

void KNotify::soundFinished( int eventId, PlayingFinishedtqStatus reason )
void KNotify::soundFinished( int eventId, PlayingFinishedStatus reason )
{
TQByteArray data;
TQDataStream stream( data, IO_WriteOnly );

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

@@ -37,7 +37,7 @@ public:
KNotify( bool useArts );
~KNotify();

enum PlayingFinishedtqStatus
enum PlayingFinishedStatus
{
PlayedOK = 0, // success, all following mean failure
NoSoundFile,
@@ -86,7 +86,7 @@ private:
bool isPlaying( const TQString& soundFile ) const;

void soundFinished( int eventId, PlayingFinishedtqStatus reason );
void soundFinished( int eventId, PlayingFinishedStatus reason );
void abortFirstPlayObject();
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) {
KMessageBox::sorry(0, msg, i18n("Warning"), notifyOptions);
} else if (args->isSet("i")) {
TQString id = msg;
id.tqreplace(TQRegExp("[\\[\\]\\s=]"), "_");
id.replace(TQRegExp("[\\[\\]\\s=]"), "_");
KMessageBox::information(0, msg, i18n("Informational"), id, notifyOptions);
} else {
KMessageBox::error(0, msg, i18n("Error"), notifyOptions);

+ 2
- 2
common_texts.cpp View File

@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/

/* This file tqcontains several often used phrases to avoid double
/* This file contains several often used phrases to avoid double
work. If you think, that a phrase belongs here, contact me
*/

@@ -186,7 +186,7 @@ i18n( "&Tools");
i18n( "&Spelling...");
i18n( "Show &Menubar");
i18n( "Show &Toolbar");
i18n( "Show &tqStatusbar");
i18n( "Show &Statusbar");
i18n( "Configure &Key Bindings...");
i18n( "&Preferences...");
i18n( "&Settings");

+ 2
- 2
config.h.cmake View File

@@ -56,7 +56,7 @@
/* You _must_ have bool */
#undef HAVE_BOOL

/* Define if getaddrinfo is broken and should be tqreplaced */
/* Define if getaddrinfo is broken and should be replaced */
#cmakedefine HAVE_BROKEN_GETADDRINFO 1

/* Defines if bzip2 is compiled */
@@ -236,7 +236,7 @@
/* Define if you have jasper */
#cmakedefine HAVE_JASPER 1

/* Define if your locale.h file tqcontains LC_MESSAGES */
/* Define if your locale.h file contains LC_MESSAGES */
#undef HAVE_LC_MESSAGES

/* 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
echo "You're missing openSSL, or your version is too old (before 0.9.5a)."
echo "KDE won't be able to access secure websites without it, so you should"
echo "consider installing or upgrading it."
echo "Have a look at http://www.openssl.org, or tqfind a binary package for"
echo "Have a look at http://www.openssl.org, or find a binary package for"
echo "your platform."
echo ""
all_tests=bad
@@ -17,7 +17,7 @@ if test -z "$LIBART_CONFIG"; then
echo "KDE won't be able to render SVG icons without it, so you should"
echo "consider installing or upgrading it."
echo "Have a look at http://www.levien.com (official site) or"
echo "http://svg.kde.org/download.html for sources, or tqfind a binary"
echo "http://svg.kde.org/download.html for sources, or find a binary"
echo "package for your platform."
echo ""
all_tests=bad
@@ -29,7 +29,7 @@ if test -z "$LIBPCRE"; then
echo "Some web pages (using regular expressions in Javascript code) will not "
echo "work correctly, the regexp support being limited without libpcre. "
echo "If you plan to use Konqueror as a Web Browser, download libpcre from "
echo "http://www.pcre.org or tqfind a binary package for your platform."
echo "http://www.pcre.org or find a binary package for your platform."
echo ""
all_tests=bad
fi
@@ -40,7 +40,7 @@ if test -z "$LIBBZ2"; then
echo "KDE won't be able to provide a help ioslave (help://) without it,"
echo "so if you want helpfiles you should consider installing it."
echo "Have a look at http://sources.redhat.com/bzip2/ for sources, "
echo "or tqfind a binary package for your platform."
echo "or find a binary package for your platform."
echo ""
all_tests=bad
fi
@@ -50,9 +50,9 @@ if test -z "$LIBXML_CFLAGS"; then
echo "You're missing libxml2 2.4.8 or later."
echo "KDE won't be able to provide a help ioslave (help://) without it,"
echo "so if you want helpfiles you should consider installing it."
echo "Have a look at ftp://xmlsoft.org/ for sources, or tqfind a binary"
echo "Have a look at ftp://xmlsoft.org/ for sources, or find a binary"
echo "package for your platform."
echo "You can tqfind a copy of libxml2 in the kdesupport module if you're using CVS."
echo "You can find a copy of libxml2 in the kdesupport module if you're using CVS."
echo ""
all_tests=bad
fi
@@ -62,9 +62,9 @@ if test -z "$LIBXSLT_CFLAGS"; then
echo "You're missing libxslt 1.0.7 or later."
echo "KDE won't be able to provide a help ioslave (help://) without it,"
echo "so if you want helpfiles you should consider installing it."
echo "Have a look at ftp://xmlsoft.org/ for sources, or tqfind a binary"
echo "Have a look at ftp://xmlsoft.org/ for sources, or find a binary"
echo "package for your platform."
echo "You can tqfind a copy of libxslt in the kdesupport module if you're using CVS."
echo "You can find a copy of libxslt in the kdesupport module if you're using CVS."
echo ""
all_tests=bad
fi

+ 1
- 1
configure.in.in View File

@@ -328,7 +328,7 @@ AC_DEFINE_UNQUOTED(X11_RGBFILE, "$rgb_file", [where rgb.txt is in])
AC_MSG_CHECKING([for Compiler version])
case "$CXX" in
xlC*)
# The __IBMCPP__ macro tqcontains the C++ compiler version in decimal notation.
# The __IBMCPP__ macro contains the C++ compiler version in decimal notation.
echo "__IBMCPP__" > conftest.C

# 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:

Currently the only real way to receive data from DCOP is to multiply
inherit from the normal class that you are inheriting (usually some
sort of QWidget subclass or TQObject) as well as the DCOPObject class.
sort of QWidget subclass or QObject) as well as the DCOPObject class.
DCOPObject provides one very important method: DCOPObject::process().
This is a pure virtual method that you must implement in order to
process DCOP messages that you receive. It takes a function
@@ -385,7 +385,7 @@ but virtual, not pure virtual.

Example:

class MyClass: public TQObject, virtual public MyInterface
class MyClass: public QObject, virtual public MyInterface
{
Q_OBJECT
@@ -397,7 +397,7 @@ class MyClass: public TQObject, virtual public MyInterface
QRect mySynchronousMethod();
};

Note: (Qt issue) Remember that if you are inheriting from TQObject, you must
Note: (Qt issue) Remember that if you are inheriting from QObject, you must
place it first in the list of inherited classes.

In the implementation of your class' ctor, you must explicitly initialize
@@ -408,7 +408,7 @@ the interface which your are implementing.
Example:

MyClass::MyClass()
: TQObject(),
: QObject(),
DCOPObject("MyInterface")
{
// whatever...
@@ -429,7 +429,7 @@ It is not necessary (though very clean) to define an interface as an
abstract class of its own, like we did in the example above. We could
just as well have defined a k_dcop section directly within MyClass:

class MyClass: public TQObject, virtual public DCOPObject
class MyClass: public QObject, virtual public DCOPObject
{
Q_OBJECT
K_DCOP

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

@@ -11,7 +11,7 @@ EXPORTS
IceCloseConnection
IceComposeNetworkIdList
IceConnectionNumber
IceConnectiontqStatus
IceConnectionStatus
IceConnectionString
IceFlush
IceFreeAuthFileEntry

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

@@ -39,7 +39,7 @@ Author: Ralph Mor, X Consortium

#define _IceRead _kde_IceRead

extern tqStatus _IceRead (
extern Status _IceRead (
#if NeedFunctionPrototypes
IceConn /* iceConn */,
unsigned long /* nbytes */,
@@ -221,7 +221,7 @@ extern void _IceErrorBadValue (


/*
* Write pad bytes. Used to force 32 or 64 bit tqalignment.
* Write pad bytes. Used to force 32 or 64 bit alignment.
* A maxium of 7 pad bytes can be specified.
*/

@@ -306,7 +306,7 @@ extern void _IceErrorBadValue (


/*
* Read pad bytes (for 32 or 64 bit tqalignment).
* Read pad bytes (for 32 or 64 bit alignment).
* A maxium of 7 pad bytes can be specified.
*/


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

@@ -119,7 +119,7 @@ extern void IceFreeAuthFileEntry (

#define IceWriteAuthFileEntry KDE_IceWriteAuthFileEntry

extern tqStatus KDE_IceWriteAuthFileEntry (
extern Status KDE_IceWriteAuthFileEntry (
#if NeedFunctionPrototypes
FILE * /* auth_file */,
IceAuthFileEntry * /* auth */

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

@@ -54,7 +54,7 @@ extern char *strchr(const char *, int);
#endif

/*
* The transport table tqcontains a definition for every transport (protocol)
* The transport table contains a definition for every transport (protocol)
* family. All operations that can be made on the transport go through this
* table.
*
@@ -405,7 +405,7 @@ TRANS(Open) (int type, char *address)

if ((thistrans = TRANS(SelectTransport) (protocol)) == NULL)
{
PRMSG (1,"Open: Unable to tqfind transport for %s\n",
PRMSG (1,"Open: Unable to find transport for %s\n",
protocol, 0, 0);

xfree (protocol);
@@ -495,7 +495,7 @@ TRANS(Reopen) (int type, int trans_id, int fd, char *port)

if (thistrans == NULL)
{
PRMSG (1,"Reopen: Unable to tqfind transport id %d\n",
PRMSG (1,"Reopen: Unable to find transport id %d\n",
trans_id, 0, 0);

return NULL;
@@ -750,7 +750,7 @@ TRANS(NoListen) (char * protocol)

if ((trans = TRANS(SelectTransport)(protocol)) == NULL)
{
PRMSG (1,"TRANS(TransNoListen): unable to tqfind transport: %s\n",
PRMSG (1,"TRANS(TransNoListen): unable to find transport: %s\n",
protocol, 0, 0);

return -1;

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

@@ -176,7 +176,7 @@ static int IBMsockInit = 0;
/*
* This is the Socket implementation of the X Transport service layer
*
* This file tqcontains the implementation for both the UNIX and INET domains,
* This file contains the implementation for both the UNIX and INET domains,
* and can be built for either one, or both.
*
*/
@@ -910,7 +910,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
{
struct sockaddr_un sockname;
int namelen;
int oldUtqmask;
int oldUmask;
int status;
unsigned int mode;

@@ -919,7 +919,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)

/* Make sure the directory is created */

oldUtqmask = umask (0);
oldUmask = umask (0);

#ifdef UNIX_DIR
#ifdef HAS_STICKY_DIR_BIT
@@ -930,7 +930,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
if (trans_mkdir((char*)UNIX_DIR, mode) == -1) {
PRMSG (1, "SocketUNIXCreateListener: mkdir(%s) failed, errno = %d\n",
UNIX_DIR, errno, 0);
(void) umask (oldUtqmask);
(void) umask (oldUmask);
return TRANS_CREATE_LISTENER_FAILED;
}
#endif
@@ -952,7 +952,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
#endif

unlink (sockname.sun_path);
(void) umask (oldUtqmask);
(void) umask (oldUmask);

if ((status = TRANS(SocketCreateListener) (ciptr,
(struct sockaddr *) &sockname, namelen)) < 0)
@@ -1011,7 +1011,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr)
S_IFSOCK))
#endif
{
int oldUtqmask = umask (0);
int oldUmask = umask (0);

#ifdef UNIX_DIR
#ifdef HAS_STICKY_DIR_BIT
@@ -1022,7 +1022,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr)
if (trans_mkdir((char*)UNIX_DIR, mode) == -1) {
PRMSG (1, "SocketUNIXResetListener: mkdir(%s) failed, errno = %d\n",
UNIX_DIR, errno, 0);
(void) umask (oldUtqmask);
(void) umask (oldUmask);
return TRANS_RESET_FAILURE;
}
#endif
@@ -1033,7 +1033,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr)
if ((ciptr->fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
{
TRANS(FreeConnInfo) (ciptr);
(void) umask (oldUtqmask);
(void) umask (oldUmask);
return TRANS_RESET_FAILURE;
}

@@ -1048,11 +1048,11 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr)
{
close (ciptr->fd);
TRANS(FreeConnInfo) (ciptr);
(void) umask (oldUtqmask);
(void) umask (oldUmask);
return TRANS_RESET_FAILURE;
}

umask (oldUtqmask);
umask (oldUmask);

status = TRANS_RESET_NEW_FD;
}

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

@@ -62,12 +62,12 @@ extern unsigned sleep ();
#endif
#endif

static tqStatus read_short (FILE *file, unsigned short *shortp);
static tqStatus read_string (FILE *file, char **stringp);
static tqStatus read_counted_string (FILE *file, unsigned short *countp, char **stringp);
static tqStatus write_short (FILE *file, unsigned short s);
static tqStatus write_string (FILE *file, char *string);
static tqStatus write_counted_string (FILE *file, unsigned short count, char *string);
static Status read_short (FILE *file, unsigned short *shortp);
static Status read_string (FILE *file, char **stringp);
static Status read_counted_string (FILE *file, unsigned short *countp, char **stringp);
static Status write_short (FILE *file, unsigned short s);
static Status write_string (FILE *file, char *string);
static Status write_counted_string (FILE *file, unsigned short count, char *string);



@@ -322,7 +322,7 @@ IceAuthFileEntry *auth;



tqStatus
Status
IceWriteAuthFileEntry (auth_file, auth)

FILE *auth_file;
@@ -398,7 +398,7 @@ const char *auth_name;
* local routines
*/

static tqStatus
static Status
read_short (FILE *file, unsigned short *shortp)
{
unsigned char file_short[2];
@@ -411,7 +411,7 @@ read_short (FILE *file, unsigned short *shortp)
}


static tqStatus
static Status
read_string (FILE *file, char **stringp)
{
unsigned short len;
@@ -447,7 +447,7 @@ read_string (FILE *file, char **stringp)
}


static tqStatus
static Status
read_counted_string (FILE *file, unsigned short *countp, char **stringp)
{
unsigned short len;
@@ -481,7 +481,7 @@ read_counted_string (FILE *file, unsigned short *countp, char **stringp)
}


static tqStatus
static Status
write_short (FILE *file, unsigned short s)
{
unsigned char file_short[2];
@@ -496,7 +496,7 @@ write_short (FILE *file, unsigned short s)
}


static tqStatus
static Status
write_string (FILE *file, char *string)
{
unsigned short count = strlen (string);
@@ -511,7 +511,7 @@ write_string (FILE *file, char *string)
}


static tqStatus
static Status
write_counted_string (FILE *file, unsigned short count, char *string)
{
if (!write_short (file, count))

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

@@ -135,7 +135,7 @@ char **errorStringRet;
if (!data)
{
const char *tempstr =
"Could not tqfind correct MIT-MAGIC-COOKIE-1 authentication";
"Could not find correct MIT-MAGIC-COOKIE-1 authentication";

*errorStringRet = (char *) malloc (strlen (tempstr) + 1);
if (*errorStringRet)
@@ -243,7 +243,7 @@ char **errorStringRet;
/*
* We should never get here because in the ConnectionReply
* we should have passed all the valid methods. So we should
* always tqfind a valid entry.
* always find a valid entry.
*/

const char *tempstr =

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

@@ -36,7 +36,7 @@ Author: Ralph Mor, X Consortium
#include <string.h>

tqStatus
Status
IceListenForConnections (countRet, listenObjsRet, errorLength, errorStringRet)

int *countRet;
@@ -50,7 +50,7 @@ char *errorStringRet;
int transCount, partial, i, j;
int result = -1;
int count = 0;
tqStatus status = 1;
Status status = 1;
XtransConnInfo *transConns = NULL;

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.
#include <string.h>

tqStatus
Status
IceListenForWellKnownConnections (port, countRet, listenObjsRet, errorLength, errorStringRet)

char *port;
@@ -46,7 +46,7 @@ char *errorStringRet;
struct _IceListenObj *listenObjs;
char *networkId;
int transCount, partial, i, j;
tqStatus status = 1;
Status status = 1;
XtransConnInfo *transConns = NULL;



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

@@ -32,7 +32,7 @@ Author: Ralph Mor, X Consortium
*/


tqStatus
Status
IceInitThreads ()

{

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

@@ -26,7 +26,7 @@ Author: Ralph Mor, X Consortium
#include <KDE-ICE/ICElib.h>
#include "KDE-ICE/ICElibint.h"

tqStatus
Status
IcePing (iceConn, pingReplyProc, clientData)

IceConn iceConn;

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

@@ -27,7 +27,7 @@ Author: Ralph Mor, X Consortium
#include "KDE-ICE/ICElibint.h"
#include "KDE-ICE/globals.h"

tqStatus
Status
IceAddConnectionWatch (watchProc, clientData)

IceWatchProc watchProc;

+ 6
- 6
dcop/Mainpage.dox View File

@@ -148,7 +148,7 @@ else {

Currently the only real way to receive data from DCOP is to multiply
inherit from the normal class that you are inheriting (usually some
sort of QWidget subclass or TQObject) as well as the DCOPObject class.
sort of QWidget subclass or QObject) as well as the DCOPObject class.
DCOPObject provides one very important method: DCOPObject::process().
This is a pure virtual method that you must implement in order to
process DCOP messages that you receive. It takes a function
@@ -289,7 +289,7 @@ but virtual, not pure virtual.
Example:

\code
class MyClass: public TQObject, virtual public MyInterface
class MyClass: public QObject, virtual public MyInterface
{
Q_OBJECT

@@ -301,7 +301,7 @@ class MyClass: public TQObject, virtual public MyInterface
QRect mySynchronousMethod();
};
\endcode
\note (Qt issue) Remember that if you are inheriting from TQObject, you must
\note (Qt issue) Remember that if you are inheriting from QObject, you must
place it first in the list of inherited classes.

In the implementation of your class' ctor, you must explicitly initialize
@@ -313,7 +313,7 @@ Example:

\code
MyClass::MyClass()
: TQObject(),
: QObject(),
DCOPObject("MyInterface")
{
// whatever...
@@ -338,7 +338,7 @@ abstract class of its own, like we did in the example above. We could
just as well have defined a k_dcop section directly within MyClass:

\code
class MyClass: public TQObject, virtual public DCOPObject
class MyClass: public QObject, virtual public DCOPObject
{
Q_OBJECT
K_DCOP
@@ -373,7 +373,7 @@ b) the authentication must be ensured
For the first step, you simply pass the server address (as
found in .DCOPserver) to the second process. For the authentication,
you can use the ICEAUTHORITY environment variable to tell the
second process where to tqfind the authentication information.
second process where to find the authentication information.
(Note that this implies that the second process is able to
read the authentication file, so it will probably only work
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
msg is printed to stderr and no data is printed to stdout.


dcoptqfind [-l] [-a] <app-id> [<object-id> [<select_func> [args]]]
dcopfind [-l] [-a] <app-id> [<object-id> [<select_func> [args]]]

Finds an existing DCOP application/object. The select_func can be used to
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.

With the -l option it calls "dcopstart <app-id>" if no object is found,
stripping off any wildcard from the <app-id>. If the dcopstart command is
successful the tqfind command is repeated, if the dcopstart command fails, an
successful the find command is repeated, if the dcopstart command fails, an
error message is printed to stderr and the command exits with exit-code '2'.

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
"isDoingProtocol(QString protocol)" and then the following command would
select a konqueror mainwindow that is currently handling the help-protocol:

"dcoptqfind 'konqueror*' 'konqueror-mainwindow*' 'isDoingProtocol(QString
"dcopfind 'konqueror*' 'konqueror-mainwindow*' 'isDoingProtocol(QString
protocol)' help"


@@ -57,7 +57,7 @@ In addtion to the current syntax of
dcop <appid> <object> <function> args

you will now also be able to use <dcopref> to make calls with <dcopref> being
"DCOPRef(<appid>, <objectid>)" as returned by dcoptqfind.
"DCOPRef(<appid>, <objectid>)" as returned by dcopfind.

Additional utilities:


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

@@ -158,9 +158,9 @@ void queryFunctions( const char* app, const char* obj )

int callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
{
TQString f = func; // Qt is better with tqunicode strings, so use one.
int left = f.tqfind( '(' );
int right = f.tqfind( ')' );
TQString f = func; // Qt is better with unicode strings, so use one.
int left = f.find( '(' );
int right = f.find( ')' );

if ( right < left )
{
@@ -181,12 +181,12 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
return( 1 );
}
for ( QCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) {
int l = (*it).tqfind( '(' );
int l = (*it).find( '(' );
int s;
if (l > 0)
s = (*it).tqfindRev( ' ', l);
s = (*it).findRev( ' ', l);
else
s = (*it).tqfind( ' ' );
s = (*it).find( ' ' );

if ( s < 0 )
s = 0;
@@ -195,8 +195,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt

if ( l > 0 && (*it).mid( s, l - s ) == func ) {
realfunc = (*it).mid( s );
const TQString arguments = (*it).mid(l+1,(*it).tqfind( ')' )-l-1);
uint a = arguments.tqcontains(',');
const TQString arguments = (*it).mid(l+1,(*it).find( ')' )-l-1);
uint a = arguments.contains(',');
if ( (a==0 && !arguments.isEmpty()) || a>0)
a++;
if ( a == args.count() )
@@ -209,8 +209,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
return( 1 );
}
f = realfunc;
left = f.tqfind( '(' );
right = f.tqfind( ')' );
left = f.find( '(' );
right = f.find( ')' );
}

doit:
@@ -230,7 +230,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
TQString lt = (*it).simplifyWhiteSpace();

int s = lt.tqfind(' ');
int s = lt.find(' ');

// If there are spaces in the name, there may be two
// 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
//
s=1;

while (s < static_cast<int>(partl.count()) && intTypes.tqcontains(partl[s]))
while (s < static_cast<int>(partl.count()) && intTypes.contains(partl[s]))
{
s++;
}
@@ -345,7 +345,7 @@ void showHelp( int exitCode = 0 )
<< " in bash, but because no new dcop instance has to be started" << endl
<< " for each line this is generally much faster, especially for" << endl
<< " the slower GNU dynamic linkers." << endl
<< " The '%1' placeholder cannot be used to tqreplace e.g. the" << endl
<< " The '%1' placeholder cannot be used to replace e.g. the" << endl
<< " program, object or method name." << endl
<< " --user <user> Connect to the given user's DCOP server. This option will" << endl
<< " ignore the values of the environment vars $DCOPSERVER and" << endl
@@ -464,9 +464,9 @@ int runDCOP( QCStringList args, UserList users, Session session,
QCStringList params;
DCOPClient *client = 0L;
int retval = 0;
if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 )
if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
{
int delimPos = args[ 0 ].tqfindRev( ',' );
int delimPos = args[ 0 ].findRev( ',' );
if( delimPos == -1 )
{
cerr_ << "Error: '" << args[ 0 ]
@@ -569,7 +569,7 @@ int runDCOP( QCStringList args, UserList users, Session session,
}
else if( !sessionName.isEmpty() )
{
if( sessions.tqcontains( sessionName ) )
if( sessions.contains( sessionName ) )
{
sessions.clear();
sessions.append( sessionName );
@@ -625,7 +625,7 @@ int runDCOP( QCStringList args, UserList users, Session session,
continue;
else
{
cerr_ << "WARNING: Cannot tqfind ICE authority file "
cerr_ << "WARNING: Cannot find ICE authority file "
<< iceFile << "!" << endl
<< "Please check permissions or set the $ICEAUTHORITY"
<< " variable manually before" << endl
@@ -706,12 +706,12 @@ int runDCOP( QCStringList args, UserList users, Session session,
sendUserTime( app );
if( readStdin )
{
QCStringList::Iterator tqreplaceArg = params.end();
QCStringList::Iterator replaceArg = params.end();

QCStringList::Iterator it = params.begin();
for( ; it != params.end(); ++it )
if( *it == "%1" )
tqreplaceArg = it;
replaceArg = it;

// Read from stdin until EOF and call function for each
// read line
@@ -719,8 +719,8 @@ int runDCOP( QCStringList args, UserList users, Session session,
{
TQString buf = cin_.readLine();

if( tqreplaceArg != params.end() )
*tqreplaceArg = buf.local8Bit();
if( replaceArg != params.end() )
*replaceArg = buf.local8Bit();

if( !buf.isNull() )
{
@@ -861,7 +861,7 @@ int main( int argc, char** argv )
if (prog[prog.length()-1] != '*')
{
// Strip a trailing -<PID> part.
int i = prog.tqfindRev('-');
int i = prog.findRev('-');
if ((i >= 0) && prog.mid(i+1).toLong())
{
prog = prog.left(i);

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

@@ -38,11 +38,11 @@ static DCOPClient* dcop = 0;
static bool bAppIdOnly = 0;
static bool bLaunchApp = 0;

bool tqfindObject( const char* app, const char* obj, const char* func, QCStringList args )
bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
{
TQString f = func; // Qt is better with tqunicode strings, so use one.
int left = f.tqfind( '(' );
int right = f.tqfind( ')' );
TQString f = func; // Qt is better with unicode strings, so use one.
int left = f.find( '(' );
int right = f.find( ')' );

if ( right < left )
{
@@ -66,7 +66,7 @@ bool tqfindObject( const char* app, const char* obj, const char* func, QCStringL
for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
TQString lt = (*it).simplifyWhiteSpace();

int s = lt.tqfind(' ');
int s = lt.find(' ');

// If there are spaces in the name, there may be two
// reasons: the parameter name is still there, ie.
@@ -86,7 +86,7 @@ bool tqfindObject( const char* app, const char* obj, const char* func, QCStringL
//
s=1;

while (s < (int)partl.count() && intTypes.tqcontains(partl[s]))
while (s < (int)partl.count() && intTypes.contains(partl[s]))
{
s++;
}
@@ -139,7 +139,7 @@ bool tqfindObject( const char* app, const char* obj, const char* func, QCStringL

TQCString foundApp;
TQCString foundObj;
if ( dcop->tqfindObject( app, obj, f.latin1(), data, foundApp, foundObj) )
if ( dcop->findObject( app, obj, f.latin1(), data, foundApp, foundObj) )
{
if (bAppIdOnly)
puts(foundApp.data());
@@ -192,7 +192,7 @@ bool launchApp(TQString app)

void usage()
{
fprintf( stderr, "Usage: dcoptqfind [-l] [-a] application [object [function [arg1] [arg2] [arg3] ... ] ] ] \n" );
fprintf( stderr, "Usage: dcopfind [-l] [-a] application [object [function [arg1] [arg2] [arg3] ... ] ] ] \n" );
exit(0);
}

@@ -267,7 +267,7 @@ int main( int argc, char** argv )
QCStringList params;
for( int i = 0; i < argc; i++ )
params.append( args[ i ] );
bool ok = tqfindObject( app, objid, function, params );
bool ok = findObject( app, objid, function, params );
if (ok)
return 0;
if (bLaunchApp)
@@ -275,7 +275,7 @@ int main( int argc, char** argv )
ok = launchApp(app);
if (!ok)
return 2;
ok = tqfindObject( app, objid, function, params );
ok = findObject( app, objid, function, params );
}

return 1;

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

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

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

@@ -102,12 +102,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
{
TQCString result;

if ( type == "int" || type == "TQ_INT32" )
if ( type == "int" || type == "Q_INT32" )
{